diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-02 17:45:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-02 17:45:43 +0000 |
| commit | 0ae3aa5345b2840a7490e9f17a7d1c5cf1b2f6ad (patch) | |
| tree | 95192e22f190544123158498760d92b83d1b8416 /pkgs/build-support | |
| parent | fc393d5731026ad533167bce923152c82d10b064 (diff) | |
| parent | 6221ec58af5b7b1b9a71d6ceacf1135285a10263 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/coq/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix index 0dc5c999ea357..e0ba7b3e08c8c 100644 --- a/pkgs/build-support/coq/default.nix +++ b/pkgs/build-support/coq/default.nix @@ -30,8 +30,8 @@ in dropAttrs ? [], keepAttrs ? [], dropDerivationAttrs ? [], - useDune2ifVersion ? (x: false), - useDune2 ? false, + useDuneifVersion ? (x: false), + useDune ? false, opam-name ? (concatStringsSep "-" (namePrefix ++ [ pname ])), ... }@args: @@ -44,7 +44,7 @@ let "extraBuildInputs" "extraNativeBuildInputs" "overrideBuildInputs" "overrideNativeBuildInputs" "namePrefix" - "meta" "useDune2ifVersion" "useDune2" "opam-name" + "meta" "useDuneifVersion" "useDune" "opam-name" "extraInstallFlags" "setCOQBIN" "mlPlugin" "dropAttrs" "dropDerivationAttrs" "keepAttrs" ] ++ dropAttrs) keepAttrs; fetch = import ../coq/meta-fetch/default.nix @@ -65,7 +65,7 @@ let ] "") + optionalString (v == null) "-broken"; append-version = p: n: p + display-pkg n "" coqPackages.${n}.version + "-"; prefix-name = foldl append-version "" namePrefix; - useDune2 = args.useDune2 or (useDune2ifVersion fetched.version); + useDune = args.useDune or (useDuneifVersion fetched.version); coqlib-flags = switch coq.coq-version [ { case = v: versions.isLe "8.6" v && v != "dev" ; out = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; } @@ -85,8 +85,8 @@ stdenv.mkDerivation (removeAttrs ({ nativeBuildInputs = args.overrideNativeBuildInputs or ([ which coq.ocamlPackages.findlib ] - ++ optional useDune2 coq.ocamlPackages.dune_2 - ++ optional (useDune2 || mlPlugin) coq.ocamlPackages.ocaml + ++ optional useDune coq.ocamlPackages.dune_3 + ++ optional (useDune || mlPlugin) coq.ocamlPackages.ocaml ++ (args.nativeBuildInputs or []) ++ extraNativeBuildInputs); buildInputs = args.overrideBuildInputs or ([ coq ] ++ (args.buildInputs or []) ++ extraBuildInputs); @@ -107,7 +107,7 @@ stdenv.mkDerivation (removeAttrs ({ coqlib-flags ++ docdir-flags ++ extraInstallFlags; }) -// (optionalAttrs useDune2 { +// (optionalAttrs useDune { buildPhase = '' runHook preBuild dune build -p ${opam-name} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} |