diff options
Diffstat (limited to 'nixpkgs/pkgs/development/coq-modules')
17 files changed, 36 insertions, 24 deletions
diff --git a/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix b/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix index d68f0e2f0586..5250a8f9b8b2 100644 --- a/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix @@ -6,7 +6,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in owner = "QuickChick"; inherit version; defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.version ] [ - { cases = [ (range "8.15" "8.18") pred.true ]; out = "2.0.1"; } + { cases = [ (range "8.15" "8.18") pred.true ]; out = "2.0.2"; } { cases = [ (range "8.13" "8.17") pred.true ]; out = "1.6.5"; } { cases = [ "8.13" pred.true ]; out = "1.5.0"; } { cases = [ "8.12" pred.true ]; out = "1.4.0"; } @@ -18,6 +18,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in { cases = [ "8.6" pred.true ]; out = "20171102"; } { cases = [ "8.5" pred.true ]; out = "20170512"; } ] null; + release."2.0.2".sha256 = "sha256-xxKkwDRjB8nUiXNhein1Ppn0DP5FZ13J90xUPAnQBbs="; release."2.0.1".sha256 = "sha256-gJc+9Or6tbqE00920Il4pnEvokRoiADX6CxP/Q0QZaY="; release."1.6.5".sha256 = "sha256-rcFyRDH8UbB9KVk10P5qjtPkWs04p78VNHkCq4mXr3U="; release."1.6.4".sha256 = "sha256-C1060wPSU33yZAFLxGmZlAMXASnx98qz3oSLO8DO+mM="; diff --git a/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix b/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix index cffd58620566..db82458f4a20 100644 --- a/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix @@ -9,7 +9,7 @@ with builtins; with lib; let { case = "8.15"; out = { version = "1.15.0"; };} { case = "8.16"; out = { version = "1.17.0"; };} { case = "8.17"; out = { version = "1.17.0"; };} - { case = "8.18"; out = { version = "1.17.0"; };} + { case = "8.18"; out = { version = "1.18.1"; };} { case = "8.19"; out = { version = "1.18.1"; };} ] {} ); in mkCoqDerivation { @@ -19,7 +19,7 @@ in mkCoqDerivation { inherit version; defaultVersion = lib.switch coq.coq-version [ { case = "8.19"; out = "2.0.1"; } - { case = "8.18"; out = "1.19.0"; } + { case = "8.18"; out = "2.0.0"; } { case = "8.17"; out = "1.18.0"; } { case = "8.16"; out = "1.15.6"; } { case = "8.15"; out = "1.14.0"; } @@ -29,6 +29,7 @@ in mkCoqDerivation { { case = "8.11"; out = "1.6.3_8.11"; } ] null; release."2.0.1".sha256 = "sha256-cuoPsEJ+JRLVc9Golt2rJj4P7lKltTrrmQijjoViooc="; + release."2.0.0".sha256 = "sha256-A/cH324M21k3SZ7+YWXtaYEbu6dZQq3K0cb1RMKjbsM="; release."1.19.0".sha256 = "sha256-kGoo61nJxeG/BqV+iQaV3iinwPStND+7+fYMxFkiKrQ="; release."1.18.0".sha256 = "sha256-2fCOlhqi4YkiL5n8SYHuc3pLH+DArf9zuMH7IhpBc2Y="; release."1.17.0".sha256 = "sha256-J8GatRKFU0ekNCG3V5dBI+FXypeHcLgC5QJYGYzFiEM="; diff --git a/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix b/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix index a6ef9e0b8a32..89e3411bc332 100644 --- a/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix @@ -8,10 +8,10 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.16" "8.18") (isGe "2.0.0") ]; out = "2.0.0"; } - { cases = [ (range "8.15" "8.18") (isGe "1.15.0") ]; out = "1.1.3"; } - { cases = [ (range "8.13" "8.17") (isGe "1.13.0") ]; out = "1.1.1"; } - { cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.1.0"; } + { cases = [ (range "8.16" "8.17") (isGe "2.0.0") ]; out = "2.0.0"; } + { cases = [ (range "8.15" "8.18") (range "1.15.0" "1.18.0") ]; out = "1.1.3"; } + { cases = [ (range "8.13" "8.17") (range "1.13.0" "1.18.0") ]; out = "1.1.1"; } + { cases = [ (range "8.10" "8.15") (range "1.12.0" "1.18.0") ]; out = "1.1.0"; } { cases = [ (isGe "8.10") (range "1.11.0" "1.12.0") ]; out = "1.0.5"; } { cases = [ (isGe "8.7") "1.11.0" ]; out = "1.0.4"; } { cases = [ (isGe "8.7") "1.10.0" ]; out = "1.0.3"; } diff --git a/nixpkgs/pkgs/development/coq-modules/deriving/default.nix b/nixpkgs/pkgs/development/coq-modules/deriving/default.nix index 9addbedb3643..b55715213c9a 100644 --- a/nixpkgs/pkgs/development/coq-modules/deriving/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/deriving/default.nix @@ -8,7 +8,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ - { cases = [(range "8.17" "8.18") (isGe "2.0.0")] ; out = "0.2.0"; } + { cases = [(range "8.17" "8.19") (isGe "2.0.0")] ; out = "0.2.0"; } { cases = [(range "8.11" "8.18") (isLe "2.0.0")] ; out = "0.1.1"; } ] null; diff --git a/nixpkgs/pkgs/development/coq-modules/extructures/default.nix b/nixpkgs/pkgs/development/coq-modules/extructures/default.nix index 15dd62fb7552..09b41f2cbc60 100644 --- a/nixpkgs/pkgs/development/coq-modules/extructures/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/extructures/default.nix @@ -9,7 +9,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ - { cases = [(range "8.17" "8.18") (isGe "2.0.0") ]; out = "0.4.0"; } + { cases = [(range "8.17" "8.19") (isGe "2.0.0") ]; out = "0.4.0"; } { cases = [(range "8.11" "8.18") (range "1.12.0" "1.18.0") ]; out = "0.3.1"; } { cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; } { cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; } diff --git a/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix b/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix index 53f98c13861f..94994fb85735 100644 --- a/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix @@ -16,7 +16,7 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.16") (isGe "2.0") ]; out = "1.3.1"; } { cases = [ (isGe "8.16") "2.0.0" ]; out = "1.3.0"; } - { cases = [ (isGe "8.11") (range "1.12" "1.18") ]; out = "1.2.5"; } + { cases = [ (isGe "8.11") (range "1.12" "1.19") ]; out = "1.2.5"; } { cases = [ (isGe "8.11") (range "1.11" "1.14") ]; out = "1.2.4"; } { cases = [ (isLe "8.13") (lib.pred.inter (isGe "1.11.0") (isLt "1.13")) ]; out = "1.2.3"; } ] null; diff --git a/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix b/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix index 725f7654de9b..d229f89875b4 100644 --- a/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -5,12 +5,16 @@ let hb = mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.18" "8.19"; out = "1.7.0"; } + { case = range "8.16" "8.18"; out = "1.6.0"; } { case = range "8.15" "8.18"; out = "1.5.0"; } { case = range "8.15" "8.17"; out = "1.4.0"; } { case = range "8.13" "8.14"; out = "1.2.0"; } { case = range "8.12" "8.13"; out = "1.1.0"; } { case = isEq "8.11"; out = "0.10.0"; } ] null; + release."1.7.0".sha256 = "sha256-WqSeuJhmqicJgXw/xGjGvbRzfyOK7rmkVRb6tPDTAZg="; + release."1.6.0".sha256 = "sha256-E8s20veOuK96knVQ7rEDSt8VmbtYfPgItD0dTY/mckg="; release."1.5.0".sha256 = "sha256-Lia3o156Pbe8rDHOA1IniGYsG5/qzZkzDKdHecfmS+c="; release."1.4.0".sha256 = "sha256-tOed9UU3kMw6KWHJ5LVLUFEmzHx1ImutXQvZ0ldW9rw="; release."1.3.0".sha256 = "17k7rlxdx43qda6i1yafpgc64na8br285cb0mbxy5wryafcdrkrc"; diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix index 6c85e5f1c94f..df73d2111172 100644 --- a/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix @@ -12,7 +12,7 @@ mkCoqDerivation { }; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.10" "8.18"; out = "1.0.1"; } + { case = range "8.10" "8.19"; out = "1.0.1"; } { case = range "8.5" "8.14"; out = "1.0.0"; } ] null; diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix index fa6032a7f08d..66b50ca66b83 100644 --- a/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -8,7 +8,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.16" "8.18") (isGe "2.0") ]; out = "2.0.0"; } - { cases = [ (range "8.13" "8.18") (range "1.12" "1.18") ]; out = "1.5.2"; } + { cases = [ (range "8.13" "8.19") (range "1.12" "1.19") ]; out = "1.5.2"; } { cases = [ (isGe "8.10") (range "1.11" "1.17") ]; out = "1.5.1"; } { cases = [ (range "8.7" "8.11") "1.11.0" ]; out = "1.5.0"; } { cases = [ (isEq "8.11") (range "1.8" "1.10") ]; out = "1.4.0+coq-8.11"; } diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix index 5746c9c6387d..240e265e3522 100644 --- a/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -21,9 +21,9 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.16") (isGe "2.0.0") ]; out = "2.0.0"; } - { cases = [ (isGe "8.13") (isGe "1.13.0") ]; out = "1.1.4"; } - { cases = [ (isGe "8.13") (isGe "1.12.0") ]; out = "1.1.3"; } - { cases = [ (isGe "8.10") (isGe "1.12.0") ]; out = "1.1.2"; } + { cases = [ (isGe "8.13") (range "1.13.0" "1.18.0") ]; out = "1.1.4"; } + { cases = [ (isGe "8.13") (range "1.12.0" "1.18.0") ]; out = "1.1.3"; } + { cases = [ (isGe "8.10") (range "1.12.0" "1.18.0") ]; out = "1.1.2"; } { cases = [ (isGe "8.7") "1.11.0" ]; out = "1.1.1"; } { cases = [ (isGe "8.7") (range "1.9.0" "1.10.0") ]; out = "1.0.4"; } { cases = [ (isGe "8.7") "1.8.0" ]; out = "1.0.3"; } diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-tarjan/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-tarjan/default.nix index 146898ca86d9..38c29f25faa0 100644 --- a/nixpkgs/pkgs/development/coq-modules/mathcomp-tarjan/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-tarjan/default.nix @@ -10,7 +10,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp-ssreflect.version ] [ - { cases = [ (range "8.16" "8.18") (isGe "2.0.0") ]; out = "1.0.2"; } + { cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "1.0.2"; } { cases = [ (range "8.12" "8.18") (range "1.12.0" "1.17.0") ]; out = "1.0.1"; } { cases = [ (range "8.10" "8.16") (range "1.12.0" "1.17.0") ]; out = "1.0.0"; } ] null; diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix index db8a23ea658a..52d4799eb173 100644 --- a/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -25,8 +25,8 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.16" "8.18") (isGe "2.0") ]; out = "3.0"; } - { cases = [ (range "8.12" "8.18") (range "1.12" "1.18") ]; out = "2.2"; } + { cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "3.0"; } + { cases = [ (range "8.12" "8.19") (range "1.12" "1.19") ]; out = "2.2"; } ] null; propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix index bc4ed1f1f747..8b9b8d666106 100644 --- a/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -9,8 +9,8 @@ mkCoqDerivation rec { defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp-algebra.version ] [ - { cases = [ (range "8.16" "8.18") (isGe "2.0.0") ]; out = "1.5.0+2.0+8.16"; } - { cases = [ (range "8.13" "8.18") (range "1.12" "1.18.0") ]; out = "1.3.0+1.12+8.13"; } + { cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "1.5.0+2.0+8.16"; } + { cases = [ (range "8.13" "8.19") (range "1.12" "1.19.0") ]; out = "1.3.0+1.12+8.13"; } { cases = [ (range "8.13" "8.16") (range "1.12" "1.17.0") ]; out = "1.1.0+1.12+8.13"; } ] null; diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix index 43bee68e7b5e..50fc63de4cc4 100644 --- a/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix @@ -19,8 +19,10 @@ let owner = "math-comp"; withDoc = single && (args.withDoc or false); defaultVersion = with versions; lib.switch coq.coq-version [ + { case = range "8.19" "8.19"; out = "1.19.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.19"; out = "2.2.0"; } { case = range "8.16" "8.18"; out = "2.1.0"; } { case = range "8.16" "8.18"; out = "2.0.0"; } { case = range "8.13" "8.18"; out = "1.16.0"; } @@ -36,8 +38,10 @@ let { case = range "8.5" "8.7"; out = "1.6.4"; } ] null; release = { + "2.2.0".sha256 = "sha256-SPyWSI5kIP5w7VpgnQ4vnK56yEuWnJylNQOT7M77yoQ="; "2.1.0".sha256 = "sha256-XDLx0BIkVRkSJ4sGCIE51j3rtkSGemNTs/cdVmTvxqo="; "2.0.0".sha256 = "sha256-dpOmrHYUXBBS9kmmz7puzufxlbNpIZofpcTvJFLG5DI="; + "1.19.0".sha256 = "sha256-3kxS3qA+7WwQkXoFC/+kq3OEkv4kMEzQ/G3aXPsp1Q4="; "1.18.0".sha256 = "sha256-mJJ/zvM2WtmBZU3U4oid/zCMvDXei/93v5hwyyqwiiY="; "1.17.0".sha256 = "sha256-bUfoSTMiW/GzC1jKFay6DRqGzKPuLOSUsO6/wPSFwNg="; "1.16.0".sha256 = "sha256-gXTKhRgSGeRBUnwdDezMsMKbOvxdffT+kViZ9e1gEz0="; diff --git a/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix b/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix index d2bb38f8683f..38cc0139b8e0 100644 --- a/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix @@ -9,8 +9,8 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (isGe "8.16") (isGe "2.1.0") ]; out = "2.1.0"; } - { cases = [ (isGe "8.16") "2.0.0" ]; out = "2.0.0"; } + { cases = [ (range "8.16" "8.18") (isGe "2.1.0") ]; out = "2.1.0"; } + { cases = [ (range "8.16" "8.18") "2.0.0" ]; out = "2.0.0"; } { cases = [ (isGe "8.15") (range "1.15.0" "1.18.0") ]; out = "1.6.0"; } { cases = [ (isGe "8.10") (range "1.13.0" "1.17.0") ]; out = "1.5.6"; } { cases = [ (range "8.10" "8.16") (range "1.12.0" "1.15.0") ]; out = "1.5.5"; } diff --git a/nixpkgs/pkgs/development/coq-modules/smtcoq/cvc4.nix b/nixpkgs/pkgs/development/coq-modules/smtcoq/cvc4.nix index 5b555cc8fc08..220c24a2b830 100644 --- a/nixpkgs/pkgs/development/coq-modules/smtcoq/cvc4.nix +++ b/nixpkgs/pkgs/development/coq-modules/smtcoq/cvc4.nix @@ -3,6 +3,8 @@ , python3 }: +let cln' = cln.override { gccStdenv = stdenv; }; in + stdenv.mkDerivation rec { pname = "cvc4"; version = "1.6"; @@ -15,7 +17,7 @@ stdenv.mkDerivation rec { # Build fails with GNUmake 4.4 nativeBuildInputs = [ autoreconfHook gnumake42 pkg-config ]; buildInputs = [ gmp swig libantlr3c boost python3 ] - ++ lib.optionals stdenv.isLinux [ cln ]; + ++ lib.optionals stdenv.isLinux [ cln' ]; configureFlags = [ "--enable-language-bindings=c" diff --git a/nixpkgs/pkgs/development/coq-modules/trakt/default.nix b/nixpkgs/pkgs/development/coq-modules/trakt/default.nix index 3cb6c78e6cd3..e08d7b8d50ca 100644 --- a/nixpkgs/pkgs/development/coq-modules/trakt/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/trakt/default.nix @@ -11,7 +11,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version ] [ - { cases = [ (range "8.15" "8.18") ]; out = "1.2"; } + { cases = [ (range "8.15" "8.17") ]; out = "1.2"; } { cases = [ (isEq "8.13") ]; out = "1.2+8.13"; } { cases = [ (range "8.13" "8.17") ]; out = "1.1"; } ] null; |