diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-04-30 17:06:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-30 17:06:09 +0200 |
| commit | 144871c638c370b336fcf743c1f8baafcbe8f6ef (patch) | |
| tree | 69653fa5f97a601bf2d4bd8e8d20a2e45d421f6d | |
| parent | 7fd0e9b4456feebd79becd28aaa967343e49e74b (diff) | |
| parent | 0a379ae698e088e423432e06dcc0e3bf30185043 (diff) | |
Merge pull request #307816 from vbgl/coq-default-8.19
coq: default to version 8.19
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/coq-packages.nix | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73696c137fb4f..628cbadf9136f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38797,7 +38797,9 @@ with pkgs; stdenv = gccStdenv; }; - why3 = callPackage ../applications/science/logic/why3 { }; + why3 = callPackage ../applications/science/logic/why3 { + coqPackages = coqPackages_8_18; + }; wayback-machine-archiver = callPackage ../tools/misc/wayback-machine-archiver { }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 256652f07b0cc..1964f666a86ba 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -214,7 +214,7 @@ in rec { 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; + let cp = recurseIntoAttrs coqPackages_8_19; in cp // { coqPackages = cp.coqPackages // { __attrsFailEvaluation = true; }; } // { __recurseIntoDerivationForReleaseJobs = true; }; coq = coqPackages.coq; |