Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 53c14c4e65cc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3e7a2b9147fe
Choose a head ref
  • 4 commits
  • 9 files changed
  • 1 contributor

Commits on Apr 20, 2020

  1. ocamlPackages.rpclib: 6.0.0 → 7.0.0

    @vbgl
    vbgl committed Apr 20, 2020
    Copy the full SHA
    f397129 View commit details

  2. ocamlPackages.async_ssl: remove at 113.33.07 

    This is the legacy version for OCaml ≤ 4.02
    @vbgl
    vbgl committed Apr 20, 2020
    Copy the full SHA
    75971d0 View commit details

  3. satysfi: use OCaml 4.07

    @vbgl
    vbgl committed Apr 20, 2020
    Copy the full SHA
    71c405e View commit details

  4. ocamlPackages.janeStreet: 0.12 → 0.13 

    ocamlPackages.bistro: fix for core-0.13
ocamlPackages.phylogenetics: 2020-01-05 → 2020-01-25
    @vbgl
    vbgl committed Apr 20, 2020
    Copy the full SHA
    3e7a2b9 View commit details
8 changes: 7 additions & 1 deletion pkgs/development/ocaml-modules/bistro/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildDunePackage
{ lib, fetchFromGitHub, fetchpatch, buildDunePackage
, base64, bos, core, lwt_react, ocamlgraph, rresult, tyxml
}:

@@ -12,6 +12,12 @@ buildDunePackage rec {
sha256 = "114gq48cpj2mvycypa9lfyqqb26wa2gkdfwkcqhnx7m6sdwv9a38";
};

# The following patch adds support for core.v0.13
patches = [(fetchpatch {
url = "https://github.com/pveber/bistro/commit/0931db43a146ad7829dff5120161a775f732a878.patch";
sha256 = "06y0sxbbab1mssc1xfjjv12lpv4rny5iqv9qkdqyzrvzpl1bdvnd";
})];

propagatedBuildInputs = [ base64 bos core lwt_react ocamlgraph rresult tyxml ];

minimumOCamlVersion = "4.07";
Loading