diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2019-12-23 09:19:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-23 09:19:21 -0500 |
| commit | 8d3199b549b9e5fa734d9f6c5f47a0c975bfce59 (patch) | |
| tree | a5e8c3b644c156ac76e815993700c599f7a4bb5a /pkgs/top-level/ocaml-packages.nix | |
| parent | 73a2107bc0b12e60157d7b9debcde3aa4cf9f31e (diff) | |
| parent | 5eb4a2352ef8907913d62555c290e97c67726f08 (diff) | |
| download | nixpkgs-8d3199b549b9e5fa734d9f6c5f47a0c975bfce59.tar nixpkgs-8d3199b549b9e5fa734d9f6c5f47a0c975bfce59.tar.gz nixpkgs-8d3199b549b9e5fa734d9f6c5f47a0c975bfce59.tar.bz2 nixpkgs-8d3199b549b9e5fa734d9f6c5f47a0c975bfce59.tar.lz nixpkgs-8d3199b549b9e5fa734d9f6c5f47a0c975bfce59.tar.xz nixpkgs-8d3199b549b9e5fa734d9f6c5f47a0c975bfce59.tar.zst nixpkgs-8d3199b549b9e5fa734d9f6c5f47a0c975bfce59.zip | |
Merge pull request #74261 from marsam/update-dune
dune: init at 2.1.0
Diffstat (limited to 'pkgs/top-level/ocaml-packages.nix')
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4d5dfbc162c..b74aa793a84 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -16,6 +16,8 @@ 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 {}; @@ -239,6 +241,12 @@ let dune = callPackage ../development/tools/ocaml/dune { }; + dune_2 = callPackage ../development/tools/ocaml/dune/2.nix { }; + + dune-configurator = callPackage ../development/ocaml-modules/dune-configurator { buildDunePackage = buildDune2Package; }; + + dune-private-libs = callPackage ../development/ocaml-modules/dune-private-libs { buildDunePackage = buildDune2Package; }; + earley = callPackage ../development/ocaml-modules/earley { }; earlybird = callPackage ../development/ocaml-modules/earlybird { }; |