diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-14 09:25:16 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-14 09:25:25 +0200 |
commit | 92a26320e7b9bbfe781e222a17c518443f63316a (patch) | |
tree | db6e4fe7706ec8c065d7efe10e93b38ea1b149ba /pkgs/top-level/ocaml-packages.nix | |
parent | 2006fd4fc5a20c72ab2166b2b4039307f4f54bcb (diff) | |
parent | 85a05878846b75254f97b8690c18a470cfe982f0 (diff) | |
download | nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.gz nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.bz2 nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.lz nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.xz nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.zst nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/ocaml-packages.nix')
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index aadd51e6294e..071d1612b6c4 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -267,6 +267,8 @@ let farfadet = callPackage ../development/ocaml-modules/farfadet { }; + fiat-p256 = callPackage ../development/ocaml-modules/fiat-p256 { }; + fieldslib_p4 = callPackage ../development/ocaml-modules/fieldslib { }; fileutils = callPackage ../development/ocaml-modules/fileutils { }; @@ -295,10 +297,14 @@ let inherit (pkgs) gnuplot; }; + hacl_x25519 = callPackage ../development/ocaml-modules/hacl_x25519 { }; + herelib = callPackage ../development/ocaml-modules/herelib { }; higlo = callPackage ../development/ocaml-modules/higlo { }; + hkdf = callPackage ../development/ocaml-modules/hkdf { }; + hmap = callPackage ../development/ocaml-modules/hmap { }; imagelib = callPackage ../development/ocaml-modules/imagelib { }; @@ -732,8 +738,6 @@ let ptime = callPackage ../development/ocaml-modules/ptime { }; - re2_p4 = callPackage ../development/ocaml-modules/re2 { }; - resource-pooling = callPackage ../development/ocaml-modules/resource-pooling { }; result = callPackage ../development/ocaml-modules/ocaml-result { }; @@ -1168,13 +1172,6 @@ let then callPackage ../development/ocaml-modules/janestreet/core.nix {} else core_p4; - re2 = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.re2 - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/re2.nix {} - else re2_p4; - textutils = if lib.versionOlder "4.03" ocaml.version then janeStreet.textutils |