diff options
Diffstat (limited to 'nixpkgs/pkgs/top-level/ocaml-packages.nix')
-rw-r--r-- | nixpkgs/pkgs/top-level/ocaml-packages.nix | 57 |
1 files changed, 52 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/top-level/ocaml-packages.nix b/nixpkgs/pkgs/top-level/ocaml-packages.nix index e8a6bc21035..b976d36c730 100644 --- a/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -16,8 +16,6 @@ let buildDunePackage = callPackage ../build-support/ocaml/dune.nix {}; - buildDune2Package = buildDunePackage.override { dune = dune_2; }; - alcotest = callPackage ../development/ocaml-modules/alcotest {}; alcotest-lwt = callPackage ../development/ocaml-modules/alcotest/lwt.nix {}; @@ -216,6 +214,10 @@ let dispatch = callPackage ../development/ocaml-modules/dispatch { }; + dns = callPackage ../development/ocaml-modules/dns { }; + + dns-client = callPackage ../development/ocaml-modules/dns/client.nix { }; + dolmen = callPackage ../development/ocaml-modules/dolmen { }; dolog = callPackage ../development/ocaml-modules/dolog { }; @@ -232,9 +234,11 @@ let dune_2 = callPackage ../development/tools/ocaml/dune/2.nix { }; - dune-configurator = callPackage ../development/ocaml-modules/dune-configurator { buildDunePackage = buildDune2Package; }; + dune-configurator = callPackage ../development/ocaml-modules/dune-configurator { }; + + dune-private-libs = callPackage ../development/ocaml-modules/dune-private-libs { }; - dune-private-libs = callPackage ../development/ocaml-modules/dune-private-libs { buildDunePackage = buildDune2Package; }; + duration = callPackage ../development/ocaml-modules/duration { }; earley = callPackage ../development/ocaml-modules/earley { }; @@ -349,6 +353,11 @@ let gmetadom = callPackage ../development/ocaml-modules/gmetadom { }; + graphics = + if lib.versionOlder "4.09" ocaml.version + then callPackage ../development/ocaml-modules/graphics { } + else null; + graphql = callPackage ../development/ocaml-modules/graphql { }; graphql-cohttp = callPackage ../development/ocaml-modules/graphql/cohttp.nix { }; @@ -527,6 +536,30 @@ let minisat = callPackage ../development/ocaml-modules/minisat { }; + mirage-clock = callPackage ../development/ocaml-modules/mirage-clock { }; + + mirage-clock-unix = callPackage ../development/ocaml-modules/mirage-clock/unix.nix { }; + + mirage-crypto = callPackage ../development/ocaml-modules/mirage-crypto { }; + + mirage-crypto-pk = callPackage ../development/ocaml-modules/mirage-crypto/pk.nix { }; + + mirage-crypto-rng = callPackage ../development/ocaml-modules/mirage-crypto/rng.nix { }; + + mirage-device = callPackage ../development/ocaml-modules/mirage-device { }; + + mirage-flow = callPackage ../development/ocaml-modules/mirage-flow { }; + + mirage-flow-combinators = callPackage ../development/ocaml-modules/mirage-flow/combinators.nix { }; + + mirage-flow-unix = callPackage ../development/ocaml-modules/mirage-flow/unix.nix { }; + + mirage-protocols = callPackage ../development/ocaml-modules/mirage-protocols { }; + + mirage-random = callPackage ../development/ocaml-modules/mirage-random { }; + + mirage-stack = callPackage ../development/ocaml-modules/mirage-stack { }; + mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; mlgmpidl = callPackage ../development/ocaml-modules/mlgmpidl { }; @@ -584,6 +617,8 @@ let ocaml_gettext = callPackage ../development/ocaml-modules/ocaml-gettext { }; + gettext-stub = callPackage ../development/ocaml-modules/ocaml-gettext/stub.nix { }; + ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { }; ocaml_http = callPackage ../development/ocaml-modules/http { }; @@ -612,6 +647,8 @@ let pgocaml_ppx = callPackage ../development/ocaml-modules/pgocaml/ppx.nix {}; + ocaml-r = callPackage ../development/ocaml-modules/ocaml-r { }; + ocaml-sat-solvers = callPackage ../development/ocaml-modules/ocaml-sat-solvers { }; ocamlscript = callPackage ../development/tools/ocaml/ocamlscript { }; @@ -620,6 +657,8 @@ let ocaml_sqlite3 = callPackage ../development/ocaml-modules/sqlite3 { }; + ocaml-syntax-shims = callPackage ../development/ocaml-modules/ocaml-syntax-shims { }; + syslog = callPackage ../development/ocaml-modules/syslog { }; ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { }; @@ -680,6 +719,8 @@ let ounit = callPackage ../development/ocaml-modules/ounit { }; + ounit2 = callPackage ../development/ocaml-modules/ounit2 { }; + pgsolver = callPackage ../development/ocaml-modules/pgsolver { }; phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { }; @@ -797,6 +838,10 @@ let ppx_import = callPackage ../development/ocaml-modules/ppx_import {}; + ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix { + ppxlib = ppxlib.override { version = "0.12.0"; }; + }; + ppx_sqlexpr = callPackage ../development/ocaml-modules/sqlexpr/ppx.nix {}; ppx_tools = @@ -818,6 +863,8 @@ let qtest = callPackage ../development/ocaml-modules/qtest { }; + randomconv = callPackage ../development/ocaml-modules/randomconv { }; + re = callPackage ../development/ocaml-modules/re { }; react = callPackage ../development/ocaml-modules/react { }; @@ -1229,5 +1276,5 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_latest = ocamlPackages_4_10; - ocamlPackages = ocamlPackages_4_08; + ocamlPackages = ocamlPackages_4_09; } |