diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-12-22 10:34:56 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-12-22 10:35:56 -0800 |
| commit | 4888bfecc28c0b74a18351a08cce5618c5b54868 (patch) | |
| tree | 2b2e2a1437e9b466f56bb113c55239689a9980ff /pkgs/development/coq-modules/mathcomp/default.nix | |
| parent | 603dbfc5a9ea77e4a98e46274843139a8501deda (diff) | |
| download | nixpkgs-4888bfecc28c0b74a18351a08cce5618c5b54868.tar nixpkgs-4888bfecc28c0b74a18351a08cce5618c5b54868.tar.gz nixpkgs-4888bfecc28c0b74a18351a08cce5618c5b54868.tar.bz2 nixpkgs-4888bfecc28c0b74a18351a08cce5618c5b54868.tar.lz nixpkgs-4888bfecc28c0b74a18351a08cce5618c5b54868.tar.xz nixpkgs-4888bfecc28c0b74a18351a08cce5618c5b54868.tar.zst nixpkgs-4888bfecc28c0b74a18351a08cce5618c5b54868.zip | |
coq_8_6: 8.6 is now default, 8.4 optional, updated mathcomp/ssreflect
Addresses #14829
Diffstat (limited to 'pkgs/development/coq-modules/mathcomp/default.nix')
| -rw-r--r-- | pkgs/development/coq-modules/mathcomp/default.nix | 45 |
1 files changed, 30 insertions, 15 deletions
diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 189b1220640..81cfdecdfff 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -1,24 +1,39 @@ -{ callPackage, coq, fetchurl }: +{ callPackage, fetchurl, coq }: -let src = - if coq.coq-version == "8.4" then +if coq.coq-version == "8.4" then - fetchurl { - url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz; - sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8"; - } +callPackage ./generic.nix { + + name = "coq-mathcomp-1.6-${coq.coq-version}"; + src = fetchurl { + url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz; + sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8"; + }; + +} + +else if coq.coq-version == "8.5" then - else if coq.coq-version == "8.5" then +callPackage ./generic.nix { - fetchurl { - url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz; - sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8"; - } + name = "coq-mathcomp-1.6-${coq.coq-version}"; + src = fetchurl { + url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz; + sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8"; + }; - else throw "No mathcomp package for Coq version ${coq.coq-version}"; +} -in +else if coq.coq-version == "8.6" then callPackage ./generic.nix { - inherit src; + + name = "coq-mathcomp-1.6.1-${coq.coq-version}"; + src = fetchurl { + url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; + sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; + }; + } + +else throw "No ssreflect package for Coq version ${coq.coq-version}" |