diff options
| author | Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr> | 2018-11-05 14:19:16 +0100 |
|---|---|---|
| committer | Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr> | 2018-11-05 18:11:27 +0100 |
| commit | 7cc369c9d5fa9d37783a1b0f217da7848d855f1e (patch) | |
| tree | d268457036169e1c75b207c9656b728b125dd604 | |
| parent | cd05d5a112c83b80d8b9432842c97c27a9d03a90 (diff) | |
| download | nixlib-7cc369c9d5fa9d37783a1b0f217da7848d855f1e.tar nixlib-7cc369c9d5fa9d37783a1b0f217da7848d855f1e.tar.gz nixlib-7cc369c9d5fa9d37783a1b0f217da7848d855f1e.tar.bz2 nixlib-7cc369c9d5fa9d37783a1b0f217da7848d855f1e.tar.lz nixlib-7cc369c9d5fa9d37783a1b0f217da7848d855f1e.tar.xz nixlib-7cc369c9d5fa9d37783a1b0f217da7848d855f1e.tar.zst nixlib-7cc369c9d5fa9d37783a1b0f217da7848d855f1e.zip | |
coqPackages.ssreflect: refactor choice of source version
| -rw-r--r-- | pkgs/development/coq-modules/mathcomp/default.nix | 30 | ||||
| -rw-r--r-- | pkgs/development/coq-modules/ssreflect/default.nix | 26 |
2 files changed, 22 insertions, 34 deletions
diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 99a6fe311a01..c99744168dbc 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -2,26 +2,20 @@ , graphviz, withDoc ? false }: -let params = - - let param_1_7 = { - version = "1.7.0"; - sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39"; - }; in +let param = + if stdenv.lib.versionAtLeast coq.coq-version "8.6" then { - "8.5" = { - version = "1.6.1"; - sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; - }; - - "8.6" = param_1_7; - "8.7" = param_1_7; - "8.8" = param_1_7; - "8.9" = param_1_7; + version = "1.7.0"; + sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39"; + } + else if stdenv.lib.versionAtLeast coq.coq-version "8.5" then + { + version = "1.6.1"; + sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; + } + else throw "No version of math-comp is available for Coq ${coq.coq-version}"; - }; - param = params."${coq.coq-version}"; in stdenv.mkDerivation { @@ -59,7 +53,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.hasAttr v params; + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5"; }; } diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix index 840189e347a5..300b00afce1e 100644 --- a/pkgs/development/coq-modules/ssreflect/default.nix +++ b/pkgs/development/coq-modules/ssreflect/default.nix @@ -2,26 +2,20 @@ , graphviz, withDoc ? false }: -let params = +let param = - let param_1_7 = { + if stdenv.lib.versionAtLeast coq.coq-version "8.6" then + { version = "1.7.0"; sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39"; - }; in - + } + else if stdenv.lib.versionAtLeast coq.coq-version "8.5" then { - "8.5" = { - version = "1.6.1"; - sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; - }; + version = "1.6.1"; + sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; + } + else throw "No version of SSReflect is available for Coq ${coq.coq-version}"; - "8.6" = param_1_7; - "8.7" = param_1_7; - "8.8" = param_1_7; - "8.9" = param_1_7; - - }; - param = params."${coq.coq-version}"; in stdenv.mkDerivation { @@ -60,7 +54,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.hasAttr v params; + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5"; }; } |