diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-05-06 12:01:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-06 12:01:05 +0000 |
| commit | 805ffdeca73b272eb0ec2e9daed7e62419eb85a1 (patch) | |
| tree | 06cc6fa2976098f29486d9fe09ae363b18d4a00f /pkgs/build-support | |
| parent | 94b421f6260c06fdc2ccc8ed30b8e1bd498f6d57 (diff) | |
| parent | 0ef7eafdb1cc834ecdcb2b9065413f79bb0145e1 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/ocaml/dune.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index 7b602e2507d51..2dfba9e740503 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -3,7 +3,7 @@ { pname, version, nativeBuildInputs ? [], enableParallelBuilding ? true, ... }@args: let Dune = - let dune-version = args . duneVersion or (if args.useDune2 or true then "2" else "1"); in + let dune-version = args.duneVersion or "2"; in { "1" = dune_1; "2" = dune_2; "3" = dune_3; }."${dune-version}" ; in @@ -39,7 +39,7 @@ stdenv.mkDerivation ({ strictDeps = true; -} // (builtins.removeAttrs args [ "minimalOCamlVersion" "duneVersion" ]) // { +} // (builtins.removeAttrs args [ "minimalOCamlVersion" "duneVersion" ]) // { name = "ocaml${ocaml.version}-${pname}-${version}"; |