diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index f9f59b21510..56fe8a60484 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, ocaml, findlib, dune, dune_2 }: +{ lib, stdenv, ocaml, findlib, dune_1, dune_2 }: { pname, version, buildInputs ? [], enableParallelBuilding ? true, ... }@args: -let Dune = if args.useDune2 or false then dune_2 else dune; in +let Dune = if args.useDune2 or false then dune_2 else dune_1; in if args ? minimumOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/1.nix similarity index 100% rename from pkgs/development/tools/ocaml/dune/default.nix rename to pkgs/development/tools/ocaml/dune/1.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f767f22c1f6..cd6418e1e81 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -293,7 +293,7 @@ mapAliases ({ i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21 jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21 jasper = throw "jasper has been removed: abandoned upstream with many vulnerabilities"; - jbuilder = dune; # added 2018-09-09 + jbuilder = dune_1; # added 2018-09-09 jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream"; joseki = apache-jena-fuseki; # added 2016-02-28 json_glib = json-glib; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f53245544e8..b726c4f87ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2220,7 +2220,7 @@ in duf = callPackage ../tools/misc/duf { }; - inherit (ocamlPackages) dune dune_2 dune-release; + inherit (ocamlPackages) dune_1 dune_2 dune-release; duperemove = callPackage ../tools/filesystems/duperemove { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 51dd6c257b2..f31125ef82f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -276,7 +276,7 @@ let dum = callPackage ../development/ocaml-modules/dum { }; - dune = callPackage ../development/tools/ocaml/dune { }; + dune_1 = callPackage ../development/tools/ocaml/dune/1.nix { }; dune_2 = if lib.versionAtLeast ocaml.version "4.08"