Merge pull request #171950 from vbgl/coq-default-8.15

authored by Ben Siraphob and committed by GitHub 9067c62e cd887840

+17 -9
+1 -1
pkgs/development/coq-modules/category-theory/default.nix
··· 16 17 inherit version; 18 defaultVersion = with versions; switch coq.coq-version [ 19 - { case = range "8.10" "8.14"; out = "20211213"; } 20 { case = range "8.8" "8.9"; out = "20190414"; } 21 { case = range "8.6" "8.7"; out = "20180709"; } 22 ] null;
··· 16 17 inherit version; 18 defaultVersion = with versions; switch coq.coq-version [ 19 + { case = range "8.10" "8.15"; out = "20211213"; } 20 { case = range "8.8" "8.9"; out = "20190414"; } 21 { case = range "8.6" "8.7"; out = "20180709"; } 22 ] null;
+1 -1
pkgs/development/coq-modules/goedel/default.nix
··· 12 13 inherit version; 14 defaultVersion = with versions; switch coq.coq-version [ 15 - { case = range "8.11" "8.14"; out = "8.13.0"; } 16 ] null; 17 18 propagatedBuildInputs = [ hydra-battles pocklington ];
··· 12 13 inherit version; 14 defaultVersion = with versions; switch coq.coq-version [ 15 + { case = range "8.11" "8.15"; out = "8.13.0"; } 16 ] null; 17 18 propagatedBuildInputs = [ hydra-battles pocklington ];
+1 -1
pkgs/development/coq-modules/graph-theory/default.nix
··· 12 13 inherit version; 14 defaultVersion = with versions; switch coq.coq-version [ 15 - { case = range "8.13" "8.14"; out = "0.9"; } 16 ] null; 17 18 propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup hierarchy-builder ];
··· 12 13 inherit version; 14 defaultVersion = with versions; switch coq.coq-version [ 15 + { case = range "8.13" "8.15"; out = "0.9"; } 16 ] null; 17 18 propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup hierarchy-builder ];
+4
pkgs/development/coq-modules/itauto/default.nix
··· 6 owner = "fbesson"; 7 domain = "gitlab.inria.fr"; 8 9 release."8.13+no".sha256 = "sha256-gXoxtLcHPoyjJkt7WqvzfCMCQlh6kL2KtCGe3N6RC/A="; 10 inherit version; 11 defaultVersion = with versions; switch coq.coq-version [ 12 { case = isEq "8.13"; out = "8.13+no"; } 13 ] null; 14
··· 6 owner = "fbesson"; 7 domain = "gitlab.inria.fr"; 8 9 + release."8.15.0".sha256 = "sha256:10qpv4nx1p0wm9sas47yzsg9z22dhvizszfa21yff08a8fr0igya"; 10 + release."8.14.0".sha256 = "sha256:1k6pqhv4dwpkwg81f2rlfg40wh070ks1gy9r0ravm2zhsbxqcfc9"; 11 release."8.13+no".sha256 = "sha256-gXoxtLcHPoyjJkt7WqvzfCMCQlh6kL2KtCGe3N6RC/A="; 12 inherit version; 13 defaultVersion = with versions; switch coq.coq-version [ 14 + { case = isEq "8.15"; out = "8.15.0"; } 15 + { case = isEq "8.14"; out = "8.14.0"; } 16 { case = isEq "8.13"; out = "8.13+no"; } 17 ] null; 18
+1 -1
pkgs/development/coq-modules/mathcomp-tarjan/default.nix
··· 9 inherit version; 10 defaultVersion = with versions; 11 switch [ coq.version mathcomp-ssreflect.version ] [{ 12 - cases = [ (range "8.10" "8.14") (isGe "1.12.0") ]; out = "1.0.0"; 13 }] null; 14 release."1.0.0".sha256 = "sha256:0r459r0makshzwlygw6kd4lpvdjc43b3x5y9aa8x77f2z5gymjq1"; 15
··· 9 inherit version; 10 defaultVersion = with versions; 11 switch [ coq.version mathcomp-ssreflect.version ] [{ 12 + cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.0.0"; 13 }] null; 14 release."1.0.0".sha256 = "sha256:0r459r0makshzwlygw6kd4lpvdjc43b3x5y9aa8x77f2z5gymjq1"; 15
+1 -1
pkgs/development/coq-modules/semantics/default.nix
··· 16 17 inherit version; 18 defaultVersion = with versions; switch coq.coq-version [ 19 - { case = range "8.10" "8.14"; out = "8.14.0"; } 20 { case = "8.9"; out = "8.9.0"; } 21 { case = "8.8"; out = "8.8.0"; } 22 { case = "8.7"; out = "8.7.0"; }
··· 16 17 inherit version; 18 defaultVersion = with versions; switch coq.coq-version [ 19 + { case = range "8.10" "8.15"; out = "8.14.0"; } 20 { case = "8.9"; out = "8.9.0"; } 21 { case = "8.8"; out = "8.8.0"; } 22 { case = "8.7"; out = "8.7.0"; }
+4
pkgs/development/coq-modules/smpl/default.nix
··· 8 release."8.10.2".sha256 = "sha256-TUfTZKBgrSOT6piXRViHSGPE9NSj3bGx2XBIw6YCcEs="; 9 release."8.12".sha256 = "sha256-UQbDHLVBKYk++o+Y2B6ARYRYGglytsnXhguwMatjOHg="; 10 release."8.13".sha256 = "sha256-HxQBaIE2CjyfG4GoIXprfehqjsr/Z74YdodxMmrbzSg="; 11 releaseRev = v: "v${v}"; 12 13 inherit version; 14 defaultVersion = with versions; switch coq.version [ 15 { case = "8.13.2"; out = "8.13"; } 16 { case = "8.12.2"; out = "8.12"; } 17 { case = "8.10.2"; out = "8.10.2"; }
··· 8 release."8.10.2".sha256 = "sha256-TUfTZKBgrSOT6piXRViHSGPE9NSj3bGx2XBIw6YCcEs="; 9 release."8.12".sha256 = "sha256-UQbDHLVBKYk++o+Y2B6ARYRYGglytsnXhguwMatjOHg="; 10 release."8.13".sha256 = "sha256-HxQBaIE2CjyfG4GoIXprfehqjsr/Z74YdodxMmrbzSg="; 11 + release."8.14".sha256 = "sha256:0wmrc741j67ch4rkygjkrz5i9afi01diyyj69i24cmasvx4wad38"; 12 + release."8.15".sha256 = "sha256:0m9xlkdhilvqb0v4q9c4hzfwffbccd6029ks39xg7qbiq6zklpvp"; 13 releaseRev = v: "v${v}"; 14 15 inherit version; 16 defaultVersion = with versions; switch coq.version [ 17 + { case = isEq "8.15"; out = "8.15"; } 18 + { case = isEq "8.14"; out = "8.14"; } 19 { case = "8.13.2"; out = "8.13"; } 20 { case = "8.12.2"; out = "8.12"; } 21 { case = "8.10.2"; out = "8.10.2"; }
+2 -2
pkgs/development/coq-modules/smtcoq/default.nix
··· 9 release."itp22".sha256 = "sha256-CdPfgDfeJy8Q6ZlQeVCSR/x8ZlJ2kSEF6F5UnAespnQ="; 10 11 inherit version; 12 - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ 13 - { cases = [ (isGe "8.13") ]; out = "itp22"; } 14 ] null; 15 16 propagatedBuildInputs = [ trakt cvc4 ] ++ lib.optionals (!stdenv.isDarwin) [ veriT ];
··· 9 release."itp22".sha256 = "sha256-CdPfgDfeJy8Q6ZlQeVCSR/x8ZlJ2kSEF6F5UnAespnQ="; 10 11 inherit version; 12 + defaultVersion = with versions; switch coq.version [ 13 + { case = isEq "8.13"; out = "itp22"; } 14 ] null; 15 16 propagatedBuildInputs = [ trakt cvc4 ] ++ lib.optionals (!stdenv.isDarwin) [ veriT ];
+1 -1
pkgs/top-level/all-packages.nix
··· 12373 12374 comby = callPackage ../development/tools/comby { }; 12375 12376 - compcert = coqPackages.compcert.override { version = "3.9"; }; 12377 12378 computecpp-unwrapped = callPackage ../development/compilers/computecpp {}; 12379 computecpp = wrapCCWith rec {
··· 12373 12374 comby = callPackage ../development/tools/comby { }; 12375 12376 + inherit (coqPackages) compcert; 12377 12378 computecpp-unwrapped = callPackage ../development/compilers/computecpp {}; 12379 computecpp = wrapCCWith rec {
+1 -1
pkgs/top-level/coq-packages.nix
··· 160 coqPackages_8_13 = mkCoqPackages coq_8_13; 161 coqPackages_8_14 = mkCoqPackages coq_8_14; 162 coqPackages_8_15 = mkCoqPackages coq_8_15; 163 - coqPackages = recurseIntoAttrs coqPackages_8_13; 164 coq = coqPackages.coq; 165 166 }
··· 160 coqPackages_8_13 = mkCoqPackages coq_8_13; 161 coqPackages_8_14 = mkCoqPackages coq_8_14; 162 coqPackages_8_15 = mkCoqPackages coq_8_15; 163 + coqPackages = recurseIntoAttrs coqPackages_8_15; 164 coq = coqPackages.coq; 165 166 }