diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-07 10:16:36 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-07 10:17:42 +0200 |
| commit | ef41fc7f5140a6d980faf7ed2a865ec2f092253b (patch) | |
| tree | 81bcfcc47155b56618dd73934ba41d8d8c7fc309 /pkgs/development/coq-modules | |
| parent | 656a0089f68495cd42d3164ed85d22ceec630d82 (diff) | |
| parent | 893df17c5a37e14616a24e66d96f3fd5e0344bce (diff) | |
| download | nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.gz nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.bz2 nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.lz nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.xz nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.zst nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.zip | |
Merge branch 'master' into staging
Hydra: ?compare=1399476
Diffstat (limited to 'pkgs/development/coq-modules')
| -rw-r--r-- | pkgs/development/coq-modules/coquelicot/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/coq-modules/interval/default.nix | 18 |
2 files changed, 21 insertions, 9 deletions
diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index a81b76849bce..6f58c387586a 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -7,15 +7,15 @@ let param = url = https://gforge.inria.fr/frs/download.php/file/35429/coquelicot-2.1.1.tar.gz; sha256 = "1wxds73h26q03r2xiw8shplh97rsbim2i2s0r7af0fa490bp44km"; }; - v2_1_2 = { - version = "2.1.2"; - url = https://gforge.inria.fr/frs/download.php/file/36320/coquelicot-2.1.2.tar.gz; - sha256 = "09q9xbzyndx8i68hn3ir4pmzgqd1q33qpk3xghf2l849g8w3q5an"; + v3_0_1 = { + version = "3.0.1"; + url = "https://gforge.inria.fr/frs/download.php/file/37045/coquelicot-3.0.1.tar.gz"; + sha256 = "0hsyhsy2lwqxxx2r8xgi5csmirss42lp9bkb9yy35mnya0w78c8r"; }; in { "8.4" = v2_1_1; - "8.5" = v2_1_2; - "8.6" = v2_1_2; + "8.5" = v3_0_1; + "8.6" = v3_0_1; }."${coq.coq-version}"; in stdenv.mkDerivation { diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index c3169970ad24..a8d3f9ad144c 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -1,11 +1,23 @@ { stdenv, fetchurl, which, coq, coquelicot, flocq, mathcomp }: +let param = + if stdenv.lib.versionAtLeast coq.coq-version "8.5" + then { + version = "3.3.0"; + url = "https://gforge.inria.fr/frs/download.php/file/37077/interval-3.3.0.tar.gz"; + sha256 = "08fdcf3hbwqphglvwprvqzgkg0qbimpyhnqsgv3gac4y1ap0f903"; + } else { + version = "3.1.1"; + url = "https://gforge.inria.fr/frs/download.php/file/36723/interval-3.1.1.tar.gz"; + sha256 = "1sqsf075c7s98mwi291bhnrv5fgd7brrqrzx51747394hndlvfw3"; + }; +in + stdenv.mkDerivation { - name = "coq${coq.coq-version}-interval-3.1.1"; + name = "coq${coq.coq-version}-interval-${param.version}"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/36723/interval-3.1.1.tar.gz; - sha256 = "1sqsf075c7s98mwi291bhnrv5fgd7brrqrzx51747394hndlvfw3"; + inherit (param) url sha256; }; nativeBuildInputs = [ which ]; |