diff options
author | Théo Zimmermann <theo.zimmermann@inria.fr> | 2022-10-01 16:42:29 +0200 |
---|---|---|
committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-10-02 14:42:28 +0200 |
commit | 2dc3552aa1435ed556b7b9f92779a2310e7fcb31 (patch) | |
tree | 5eb549a32b914b6a3ad4f2d0aac6fe395c0c2605 /pkgs/development/coq-modules | |
parent | faacb60b6ed9a63cef1461e594e7a708448fd5bf (diff) | |
download | nixlib-2dc3552aa1435ed556b7b9f92779a2310e7fcb31.tar nixlib-2dc3552aa1435ed556b7b9f92779a2310e7fcb31.tar.gz nixlib-2dc3552aa1435ed556b7b9f92779a2310e7fcb31.tar.bz2 nixlib-2dc3552aa1435ed556b7b9f92779a2310e7fcb31.tar.lz nixlib-2dc3552aa1435ed556b7b9f92779a2310e7fcb31.tar.xz nixlib-2dc3552aa1435ed556b7b9f92779a2310e7fcb31.tar.zst nixlib-2dc3552aa1435ed556b7b9f92779a2310e7fcb31.zip |
coqPackages.mkCoqDerivation: upgrade to Dune 3
And remove the version number from the corresponding attributes.
Diffstat (limited to 'pkgs/development/coq-modules')
9 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/development/coq-modules/addition-chains/default.nix b/pkgs/development/coq-modules/addition-chains/default.nix index 8de9a8e411cd..63ba0e805072 100644 --- a/pkgs/development/coq-modules/addition-chains/default.nix +++ b/pkgs/development/coq-modules/addition-chains/default.nix @@ -19,7 +19,7 @@ mkCoqDerivation { propagatedBuildInputs = [ mathcomp-ssreflect mathcomp-algebra mathcomp-fingroup paramcoq ]; - useDune2 = true; + useDune = true; meta = { description = "Exponentiation algorithms following addition chains"; diff --git a/pkgs/development/coq-modules/coqide/default.nix b/pkgs/development/coq-modules/coqide/default.nix index a827057a118b..4e1f9e5f6662 100644 --- a/pkgs/development/coq-modules/coqide/default.nix +++ b/pkgs/development/coq-modules/coqide/default.nix @@ -22,7 +22,7 @@ with lib; mkCoqDerivation rec { ''; prefixKey = "-prefix "; - useDune2 = true; + useDune = true; buildInputs = [ copyDesktopItems diff --git a/pkgs/development/coq-modules/gaia-hydras/default.nix b/pkgs/development/coq-modules/gaia-hydras/default.nix index ce254aff78bb..5377600caba4 100644 --- a/pkgs/development/coq-modules/gaia-hydras/default.nix +++ b/pkgs/development/coq-modules/gaia-hydras/default.nix @@ -21,7 +21,7 @@ with lib; mkCoqDerivation rec { mathcomp-zify ]; - useDune2 = true; + useDune = true; meta = { description = "Comparison between ordinals in Gaia and Hydra battles"; diff --git a/pkgs/development/coq-modules/hydra-battles/default.nix b/pkgs/development/coq-modules/hydra-battles/default.nix index d59afa53ac31..2729f7c21391 100644 --- a/pkgs/development/coq-modules/hydra-battles/default.nix +++ b/pkgs/development/coq-modules/hydra-battles/default.nix @@ -16,7 +16,7 @@ with lib; { case = range "8.11" "8.12"; out = "0.4"; } ] null; - useDune2 = true; + useDune = true; meta = { description = "Exploration of some properties of Kirby and Paris' hydra battles, with the help of Coq"; diff --git a/pkgs/development/coq-modules/mathcomp-word/default.nix b/pkgs/development/coq-modules/mathcomp-word/default.nix index f39fbe0ac6a6..69735c801edd 100644 --- a/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -6,7 +6,7 @@ mkCoqDerivation { pname = "word"; owner = "jasmin-lang"; repo = "coqword"; - useDune2 = true; + useDune = true; releaseRev = v: "v${v}"; diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index 8144d87b9fbf..57f4a381b204 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -1,5 +1,5 @@ { coq, mkCoqDerivation, mathcomp, mathcomp-finmap, mathcomp-bigenough, - lib, version ? null, useDune2 ? false }@args: + lib, version ? null, useDune ? false }@args: with lib; mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; @@ -31,7 +31,7 @@ with lib; mkCoqDerivation { "1.0".sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; }; - useDune2ifVersion = v: versions.isGe "1.5.3" v || v == "dev"; + useDuneifVersion = v: versions.isGe "1.5.3" v || v == "dev"; preConfigure = '' patchShebangs configure || true @@ -45,4 +45,4 @@ with lib; mkCoqDerivation { license = licenses.cecill-c; }; } -// optionalAttrs (args?useDune2) { inherit useDune2; } +// optionalAttrs (args?useDune) { inherit useDune; } diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index 7c3b656da913..e3ec9bfdc39a 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -27,7 +27,7 @@ in { case = isEq "8.10"; out = "8.10.0+0.7.2"; } ] null; - useDune2 = true; + useDune = true; patches = [ ./janestreet-0.15.patch ]; diff --git a/pkgs/development/coq-modules/topology/default.nix b/pkgs/development/coq-modules/topology/default.nix index 37585eea8c79..eb94912307a7 100644 --- a/pkgs/development/coq-modules/topology/default.nix +++ b/pkgs/development/coq-modules/topology/default.nix @@ -25,7 +25,7 @@ mkCoqDerivation rec { propagatedBuildInputs = [ zorns-lemma ]; - useDune2ifVersion = versions.isGe "9.0"; + useDuneifVersion = versions.isGe "9.0"; meta = { description = "General topology in Coq"; diff --git a/pkgs/development/coq-modules/zorns-lemma/default.nix b/pkgs/development/coq-modules/zorns-lemma/default.nix index b003e15891d4..10f238ae6c11 100644 --- a/pkgs/development/coq-modules/zorns-lemma/default.nix +++ b/pkgs/development/coq-modules/zorns-lemma/default.nix @@ -25,7 +25,7 @@ with lib; { case = "8.5"; out = "8.5.0"; } ] null; - useDune2ifVersion = versions.isGe "9.0"; + useDuneifVersion = versions.isGe "9.0"; meta = { description = "Development of basic set theory"; |