From 0a379ae698e088e423432e06dcc0e3bf30185043 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 29 Apr 2024 20:45:03 +0200 Subject: coq: default to version 8.19 --- pkgs/top-level/all-packages.nix | 4 +++- 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 ca9d31b364806..c007d913cb381 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38807,7 +38807,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; -- cgit 1.4.1