diff options
Diffstat (limited to 'pkgs/top-level/ocaml-packages.nix')
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 66 |
1 files changed, 30 insertions, 36 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index fe284a62718df..8fb8986dd9b08 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -92,7 +92,7 @@ let biocaml = janeStreet_0_15.biocaml; - biotk = janeStreet_0_15.biotk; + biotk = callPackage ../development/ocaml-modules/biotk { }; bisect_ppx = callPackage ../development/ocaml-modules/bisect_ppx { }; @@ -225,8 +225,6 @@ let cohttp-lwt-unix = callPackage ../development/ocaml-modules/cohttp/lwt-unix.nix { }; - cohttp-mirage = callPackage ../development/ocaml-modules/cohttp/mirage.nix { }; - cohttp-top = callPackage ../development/ocaml-modules/cohttp/top.nix { }; coin = callPackage ../development/ocaml-modules/coin { }; @@ -585,6 +583,10 @@ let genspio = callPackage ../development/ocaml-modules/genspio { }; + get-activity = callPackage ../development/ocaml-modules/get-activity { }; + + get-activity-lib = callPackage ../development/ocaml-modules/get-activity/lib.nix { }; + getopt = callPackage ../development/ocaml-modules/getopt { }; gettext-camomile = callPackage ../development/ocaml-modules/ocaml-gettext/camomile.nix { }; @@ -610,6 +612,10 @@ let github-jsoo = callPackage ../development/ocaml-modules/github/jsoo.nix { }; github-unix = callPackage ../development/ocaml-modules/github/unix.nix { }; + gitlab = callPackage ../development/ocaml-modules/gitlab { }; + gitlab-jsoo = callPackage ../development/ocaml-modules/gitlab/jsoo.nix { }; + gitlab-unix = callPackage ../development/ocaml-modules/gitlab/unix.nix { }; + gluon = callPackage ../development/ocaml-modules/gluon { }; gluten = callPackage ../development/ocaml-modules/gluten { }; @@ -743,7 +749,9 @@ let # Jane Street janePackage = - if lib.versionOlder "4.13.1" ocaml.version + if lib.versionOlder "5.1" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/janePackage_0_17.nix {} + else if lib.versionOlder "4.13.1" ocaml.version then callPackage ../development/ocaml-modules/janestreet/janePackage_0_16.nix {} else if lib.versionOlder "4.10.2" ocaml.version then callPackage ../development/ocaml-modules/janestreet/janePackage_0_15.nix {} @@ -754,7 +762,13 @@ let else null; janeStreet = - if lib.versionOlder "4.13.1" ocaml.version + if lib.versionOlder "5.1" ocaml.version + then import ../development/ocaml-modules/janestreet/0.17.nix + { + inherit self; + inherit (pkgs) bash fzf lib openssl zstd; + } + else if lib.versionOlder "4.13.1" ocaml.version then import ../development/ocaml-modules/janestreet/0.16.nix { inherit self; inherit (pkgs) bash fetchpatch fzf lib openssl zstd krb5; @@ -836,22 +850,6 @@ let cfstream = self.cfstream.override { inherit core_kernel; }; }; - biotk = let - angstrom = self.angstrom.override { inherit ppx_let; }; - in callPackage ../development/ocaml-modules/biotk { - angstrom-unix = self.angstrom-unix.override { inherit angstrom; }; - ppx_deriving = self.ppx_deriving.override { inherit (jsDeps) ppxlib; }; - uri = self.uri.override { inherit angstrom; }; - vg = self.vg.override { htmlcBackend = false; }; - }; - - phylogenetics = let - angstrom = self.angstrom.override { inherit ppx_let; }; - in callPackage ../development/ocaml-modules/phylogenetics { - ppx_deriving = self.ppx_deriving.override { inherit (jsDeps) ppxlib; }; - angstrom-unix = self.angstrom-unix.override { inherit angstrom; }; - }; - ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { }; })).overrideScope liftJaneStreet; @@ -1117,8 +1115,6 @@ let mirage-bootvar-xen = callPackage ../development/ocaml-modules/mirage-bootvar-xen { }; - mirage-channel = callPackage ../development/ocaml-modules/mirage-channel { }; - mirage-clock = callPackage ../development/ocaml-modules/mirage-clock { }; mirage-clock-solo5 = callPackage ../development/ocaml-modules/mirage-clock/solo5.nix { }; @@ -1127,8 +1123,6 @@ let mirage-console = callPackage ../development/ocaml-modules/mirage-console { }; - mirage-console-unix = callPackage ../development/ocaml-modules/mirage-console/unix.nix { }; - mirage-crypto = callPackage ../development/ocaml-modules/mirage-crypto { }; mirage-crypto-ec = callPackage ../development/ocaml-modules/mirage-crypto/ec.nix { }; @@ -1189,6 +1183,8 @@ let mmap = callPackage ../development/ocaml-modules/mmap { }; + mopsa = callPackage ../development/ocaml-modules/mopsa { }; + morbig = callPackage ../development/ocaml-modules/morbig { }; mparser = callPackage ../development/ocaml-modules/mparser { }; @@ -1387,22 +1383,16 @@ let omd = callPackage ../development/ocaml-modules/omd { }; opam-core = callPackage ../development/ocaml-modules/opam-core { - inherit (pkgs) opam unzip; + inherit (pkgs) opam; }; opam-file-format = callPackage ../development/ocaml-modules/opam-file-format { }; - opam-format = callPackage ../development/ocaml-modules/opam-format { - inherit (pkgs) unzip; - }; + opam-format = callPackage ../development/ocaml-modules/opam-format { }; - opam-repository = callPackage ../development/ocaml-modules/opam-repository { - inherit (pkgs) unzip; - }; + opam-repository = callPackage ../development/ocaml-modules/opam-repository { }; - opam-state = callPackage ../development/ocaml-modules/opam-state { - inherit (pkgs) unzip; - }; + opam-state = callPackage ../development/ocaml-modules/opam-state { }; opium = callPackage ../development/ocaml-modules/opium { }; @@ -1462,7 +1452,7 @@ let pgsolver = callPackage ../development/ocaml-modules/pgsolver { }; - phylogenetics = janeStreet_0_15.phylogenetics; + phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { }; piaf = callPackage ../development/ocaml-modules/piaf { }; @@ -1724,6 +1714,8 @@ let inherit (pkgs) soundtouch; }; + spdx_licenses = callPackage ../development/ocaml-modules/spdx_licenses { }; + speex = callPackage ../development/ocaml-modules/speex { inherit (pkgs) speex; }; @@ -1754,6 +1746,8 @@ let stringext = callPackage ../development/ocaml-modules/stringext { }; + swhid_core = callPackage ../development/ocaml-modules/swhid_core { }; + syslog = callPackage ../development/ocaml-modules/syslog { }; syslog-message = callPackage ../development/ocaml-modules/syslog-message { }; |