diff options
| author | Ricardo M. Correia <rcorreia@wizy.org> | 2016-10-31 18:36:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-31 18:36:37 +0100 |
| commit | 3c6e0f1207193c4395183350d0ef878167da89bd (patch) | |
| tree | 31dcf50b1dc50a74cb54e026b9e72ced1f688bdc /pkgs | |
| parent | f6c61ebe3d2750e84deb589e18d26561b5d82012 (diff) | |
| parent | 0336a06d0e759bd6bad1db25c665b23433ad2450 (diff) | |
| download | nixlib-3c6e0f1207193c4395183350d0ef878167da89bd.tar nixlib-3c6e0f1207193c4395183350d0ef878167da89bd.tar.gz nixlib-3c6e0f1207193c4395183350d0ef878167da89bd.tar.bz2 nixlib-3c6e0f1207193c4395183350d0ef878167da89bd.tar.lz nixlib-3c6e0f1207193c4395183350d0ef878167da89bd.tar.xz nixlib-3c6e0f1207193c4395183350d0ef878167da89bd.tar.zst nixlib-3c6e0f1207193c4395183350d0ef878167da89bd.zip | |
Merge pull request #19901 from vbgl/ocaml-containers-20
Update ocamlPackages.{gen,sequence,containers}Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/ocaml-modules/containers/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/gen/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/sequence/default.nix | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index 4719cd300c19..19d91e44dcde 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -4,10 +4,9 @@ let mkpath = p: - let v = stdenv.lib.getVersion ocaml; in - "${p}/lib/ocaml/${v}/site-lib"; + "${p}/lib/ocaml/${ocaml.version}/site-lib"; - version = "0.18"; + version = "0.20"; in @@ -18,7 +17,7 @@ stdenv.mkDerivation { owner = "c-cube"; repo = "ocaml-containers"; rev = "${version}"; - sha256 = "169j8vqg8h70wbldjg610jqikfk23ggw8zypmpzv3piym5p1dfiw"; + sha256 = "1gwflgdbvj293cwi434aafrsgpdgj2sv7r1ghm4l4k5xn17l0qzg"; }; buildInputs = [ ocaml findlib ocamlbuild cppo gen sequence qtest ounit ocaml_oasis qcheck ]; diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index c023b590f7a7..6cbbd4adc1b5 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }: -let version = "0.3"; in +let version = "0.4"; in stdenv.mkDerivation { name = "ocaml-gen-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { owner = "c-cube"; repo = "gen"; rev = "${version}"; - sha256 = "0xrnkcfa5q86ammf49j5hynw5563x5sa2mk7vqf7g097j1szif72"; + sha256 = "041dga300fh1y6fi8y0fkri2qda406lf2dmbrgllazw3rp07zkzj"; }; buildInputs = [ ocaml findlib ocamlbuild qtest ounit ]; diff --git a/pkgs/development/ocaml-modules/sequence/default.nix b/pkgs/development/ocaml-modules/sequence/default.nix index a87a13fd3960..ae973178d137 100644 --- a/pkgs/development/ocaml-modules/sequence/default.nix +++ b/pkgs/development/ocaml-modules/sequence/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }: -let version = "0.6"; in +let version = "0.8"; in stdenv.mkDerivation { name = "ocaml-sequence-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { owner = "c-cube"; repo = "sequence"; rev = "${version}"; - sha256 = "0mky5qas3br2x4y14dzcky212z624ydqnx8mw8w00x0c1xjpafkb"; + sha256 = "1y9nkz6g4plnbk1pcdbvs7f719r48zxrp3gsaxyq1vg98i9h8qr3"; }; buildInputs = [ ocaml findlib ocamlbuild qtest ounit ]; |