diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-23 10:24:52 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-23 10:24:52 +0200 |
| commit | b34551384a0b96ee59ddf5b9290da59ad8987473 (patch) | |
| tree | 4b4389ee28fa029543c6fa61e87da9194fcea28d /pkgs/top-level/ocaml-packages.nix | |
| parent | 5c2b59d63afe75d6735790ca9232a1445091bf53 (diff) | |
| parent | f7a398c481306f007dfaa050a6f597c0bf37a2ac (diff) | |
| download | nixlib-b34551384a0b96ee59ddf5b9290da59ad8987473.tar nixlib-b34551384a0b96ee59ddf5b9290da59ad8987473.tar.gz nixlib-b34551384a0b96ee59ddf5b9290da59ad8987473.tar.bz2 nixlib-b34551384a0b96ee59ddf5b9290da59ad8987473.tar.lz nixlib-b34551384a0b96ee59ddf5b9290da59ad8987473.tar.xz nixlib-b34551384a0b96ee59ddf5b9290da59ad8987473.tar.zst nixlib-b34551384a0b96ee59ddf5b9290da59ad8987473.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/ocaml-packages.nix')
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 2ab0e100adab..76082efda8f5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -38,8 +38,6 @@ let async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { }; - async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { }; - atd = callPackage ../development/ocaml-modules/atd { }; atdgen = callPackage ../development/ocaml-modules/atdgen { }; @@ -290,6 +288,8 @@ let functoria = callPackage ../development/ocaml-modules/functoria { }; + functoria-runtime = callPackage ../development/ocaml-modules/functoria/runtime.nix { }; + functory = callPackage ../development/ocaml-modules/functory { }; gen = callPackage ../development/ocaml-modules/gen { }; @@ -320,6 +320,8 @@ let io-page = callPackage ../development/ocaml-modules/io-page { }; + io-page-unix = callPackage ../development/ocaml-modules/io-page/unix.nix { }; + ipaddr = callPackage ../development/ocaml-modules/ipaddr { }; irmin_1 = callPackage ../development/ocaml-modules/irmin/1.4.nix { }; @@ -543,12 +545,16 @@ let mirage-random = callPackage ../development/ocaml-modules/mirage-random { }; + mirage-runtime = callPackage ../development/ocaml-modules/mirage/runtime.nix { }; + mirage-stack = callPackage ../development/ocaml-modules/mirage-stack { }; mirage-time = callPackage ../development/ocaml-modules/mirage-time { }; mirage-time-unix = callPackage ../development/ocaml-modules/mirage-time/unix.nix { }; + mirage-unix = callPackage ../development/ocaml-modules/mirage-unix { }; + mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; mlgmpidl = callPackage ../development/ocaml-modules/mlgmpidl { }; @@ -748,8 +754,6 @@ let ulex = callPackage ../development/ocaml-modules/ulex { }; - textutils_p4 = callPackage ../development/ocaml-modules/textutils { }; - tls = callPackage ../development/ocaml-modules/tls { }; type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { }; @@ -1164,13 +1168,6 @@ let then callPackage ../development/ocaml-modules/janestreet/core.nix {} else core_p4; - textutils = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.textutils - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/textutils.nix {} - else textutils_p4; - async_kernel = if lib.versionOlder "4.03" ocaml.version then janeStreet.async_kernel @@ -1183,13 +1180,6 @@ let then janeStreet.async_rpc_kernel else callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {}; - async_unix = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.async_unix - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {} - else async_unix_p4; - # Apps / from all-packages ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { }; |