diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2019-04-16 08:30:14 +0000 |
---|---|---|
committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2019-04-23 09:35:38 +0200 |
commit | f09a13899dbd767ba0602309b21f4b8926e7e059 (patch) | |
tree | 6e8e47bf0656ea02eaadee4983dde70cdef62534 /pkgs/development/coq-modules | |
parent | 640fd927091d399062098079c5987cb0693d0d69 (diff) | |
download | nixpkgs-f09a13899dbd767ba0602309b21f4b8926e7e059.tar nixpkgs-f09a13899dbd767ba0602309b21f4b8926e7e059.tar.gz nixpkgs-f09a13899dbd767ba0602309b21f4b8926e7e059.tar.bz2 nixpkgs-f09a13899dbd767ba0602309b21f4b8926e7e059.tar.lz nixpkgs-f09a13899dbd767ba0602309b21f4b8926e7e059.tar.xz nixpkgs-f09a13899dbd767ba0602309b21f4b8926e7e059.tar.zst nixpkgs-f09a13899dbd767ba0602309b21f4b8926e7e059.zip |
coqPackages.mathcomp: 1.7.0 -> 1.8.0
coqPackages.mathcomp-finmap: 1.1.0 -> 1.2.0 coqPackages.mathcomp-analysis: 0.1.0 -> 0.2.0
Diffstat (limited to 'pkgs/development/coq-modules')
-rw-r--r-- | pkgs/development/coq-modules/mathcomp-analysis/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/coq-modules/mathcomp-finmap/default.nix | 15 | ||||
-rw-r--r-- | pkgs/development/coq-modules/mathcomp/default.nix | 7 |
3 files changed, 21 insertions, 5 deletions
diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index 8ff9cc5b830..8c315371229 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, coq, mathcomp-bigenough, mathcomp-finmap }: stdenv.mkDerivation rec { - version = "0.1.0"; + version = "0.2.0"; name = "coq${coq.coq-version}-mathcomp-analysis-${version}"; src = fetchFromGitHub { owner = "math-comp"; repo = "analysis"; rev = version; - sha256 = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al"; + sha256 = "1186xjxgns4ns1szyi931964bjm0mp126qzlv10mkqqgfw07nhrd"; }; buildInputs = [ coq ]; diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix index 18584d28c68..c36b72711ff 100644 --- a/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -1,14 +1,25 @@ { stdenv, fetchFromGitHub, coq, mathcomp }: +let param = + if stdenv.lib.versionAtLeast mathcomp.version "1.8.0" + then { + version = "1.2.0"; + sha256 = "0b6wrdr0d7rcnv86s37zm80540jl2wmiyf39ih7mw3dlwli2cyj4"; + } else { + version = "1.1.0"; + sha256 = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a"; + } +; in + stdenv.mkDerivation rec { - version = "1.1.0"; + inherit (param) version; name = "coq${coq.coq-version}-mathcomp-finmap-${version}"; src = fetchFromGitHub { owner = "math-comp"; repo = "finmap"; rev = version; - sha256 = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a"; + inherit (param) sha256; }; buildInputs = [ coq ]; diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 1e5b6b7bf66..8b4c74fb1a5 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -4,7 +4,12 @@ let param = - if stdenv.lib.versionAtLeast coq.coq-version "8.6" then + if stdenv.lib.versionAtLeast coq.coq-version "8.7" then + { + version = "1.8.0"; + sha256 = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp"; + } + else if stdenv.lib.versionAtLeast coq.coq-version "8.6" then { version = "1.7.0"; sha256 = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1"; |