From d77d8f69f716dc5397234d795d7b3109910c2e04 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Tue, 19 Dec 2023 13:54:37 +0100 Subject: [PATCH] coq_8_19: init at 8.19+rc1 --- pkgs/applications/science/logic/coq/default.nix | 1 + pkgs/development/coq-modules/mathcomp/default.nix | 2 +- pkgs/development/coq-modules/pocklington/default.nix | 2 +- pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/coq-packages.nix | 2 ++ 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 9717e69e9c26..039a5334969e 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -56,6 +56,7 @@ let "8.17.0".sha256 = "sha256-TGwm7S6+vkeZ8cidvp8pkiAd9tk008jvvPvYgfEOXhM="; "8.17.1".sha256 = "sha256-x+RwkbxMg9aR0L3WSCtpIz8jwA5cJA4tXAtHMZb20y4="; "8.18.0".sha256 = "sha256-WhiBs4nzPHQ0R24xAdM49kmxSCPOxiOVMA1iiMYunz4="; + "8.19+rc1".sha256 = "sha256-hQ57tLj8lXTbMrW+F0skPtzpHJnXbqPIc/EzocRV5qo="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index f95f1d425ea8..43bee68e7b5e 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -19,7 +19,7 @@ let owner = "math-comp"; withDoc = single && (args.withDoc or false); defaultVersion = with versions; lib.switch coq.coq-version [ - { case = isGe "8.17"; out = "1.18.0"; } + { case = range "8.17" "8.18"; out = "1.18.0"; } { case = range "8.15" "8.18"; out = "1.17.0"; } { case = range "8.16" "8.18"; out = "2.1.0"; } { case = range "8.16" "8.18"; out = "2.0.0"; } diff --git a/pkgs/development/coq-modules/pocklington/default.nix b/pkgs/development/coq-modules/pocklington/default.nix index a9e0d43a5a7a..1ee80e9a4b6e 100644 --- a/pkgs/development/coq-modules/pocklington/default.nix +++ b/pkgs/development/coq-modules/pocklington/default.nix @@ -9,7 +9,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = isGe "8.7"; out = "8.12.0"; } + { case = range "8.7" "8.18"; out = "8.12.0"; } ] null; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d1b7bf80480..560767e41ea2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39503,6 +39503,7 @@ with pkgs; coqPackages_8_16 coq_8_16 coqPackages_8_17 coq_8_17 coqPackages_8_18 coq_8_18 + coqPackages_8_19 coq_8_19 coqPackages coq ; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 64cbe925b518..64d4bef12132 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -189,6 +189,7 @@ in rec { coq_8_16 = mkCoq "8.16"; coq_8_17 = mkCoq "8.17"; coq_8_18 = mkCoq "8.18"; + coq_8_19 = mkCoq "8.19"; coqPackages_8_5 = mkCoqPackages coq_8_5 // { __attrsFailEvaluation = true; }; coqPackages_8_6 = mkCoqPackages coq_8_6 // { __attrsFailEvaluation = true; }; @@ -204,6 +205,7 @@ in rec { coqPackages_8_16 = mkCoqPackages coq_8_16 // { __attrsFailEvaluation = true; }; coqPackages_8_17 = mkCoqPackages coq_8_17 // { __attrsFailEvaluation = true; }; coqPackages_8_18 = mkCoqPackages coq_8_18 // { __attrsFailEvaluation = true; }; + coqPackages_8_19 = mkCoqPackages coq_8_19 // { __attrsFailEvaluation = true; }; coqPackages = let cp = recurseIntoAttrs coqPackages_8_18; in cp // { coqPackages = cp.coqPackages // { __attrsFailEvaluation = true; }; } // { __recurseIntoDerivationForReleaseJobs = true; };