diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-11-27 19:08:40 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-11-27 20:49:18 +0000 |
| commit | bfc0959511519af01c9f04ff171fd188f81d731d (patch) | |
| tree | 98f0202acacf6f6e8841e483df51e09c4fcf7091 /pkgs/top-level/ocaml-packages.nix | |
| parent | e7f4979270fc5a1ca02c398eece1d88c36758e04 (diff) | |
| download | nixpkgs-bfc0959511519af01c9f04ff171fd188f81d731d.tar nixpkgs-bfc0959511519af01c9f04ff171fd188f81d731d.tar.gz nixpkgs-bfc0959511519af01c9f04ff171fd188f81d731d.tar.bz2 nixpkgs-bfc0959511519af01c9f04ff171fd188f81d731d.tar.lz nixpkgs-bfc0959511519af01c9f04ff171fd188f81d731d.tar.xz nixpkgs-bfc0959511519af01c9f04ff171fd188f81d731d.tar.zst nixpkgs-bfc0959511519af01c9f04ff171fd188f81d731d.zip | |
ocamlPackages.cstruct: 2.3.2 -> 3.0.2
Diffstat (limited to 'pkgs/top-level/ocaml-packages.nix')
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 36c2669d29c..04e7b16e56b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -176,10 +176,17 @@ let cryptokit = callPackage ../development/ocaml-modules/cryptokit { }; - cstruct = callPackage ../development/ocaml-modules/cstruct { + cstruct = + if lib.versionAtLeast ocaml.version "4.2" + then callPackage ../development/ocaml-modules/cstruct {} + else callPackage ../development/ocaml-modules/cstruct/1.9.0.nix { lwt = ocaml_lwt; }; + + cstruct-lwt = callPackage ../development/ocaml-modules/cstruct/lwt.nix { lwt = ocaml_lwt; }; + cstruct-unix = callPackage ../development/ocaml-modules/cstruct/unix.nix {}; + csv = if lib.versionAtLeast ocaml.version "4.2" then callPackage ../development/ocaml-modules/csv { } @@ -380,9 +387,7 @@ let mtime = callPackage ../development/ocaml-modules/mtime { }; - nocrypto = callPackage ../development/ocaml-modules/nocrypto { - lwt = ocaml_lwt; - }; + nocrypto = callPackage ../development/ocaml-modules/nocrypto { }; notty = callPackage ../development/ocaml-modules/notty { lwt = ocaml_lwt; @@ -570,6 +575,8 @@ let then callPackage ../development/ocaml-modules/ppx_blob {} else null; + ppx_cstruct = callPackage ../development/ocaml-modules/cstruct/ppx.nix {}; + ppx_derivers = callPackage ../development/ocaml-modules/ppx_derivers {}; ppx_deriving = |