diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-09-04 02:39:03 +0000 |
---|---|---|
committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-09-04 02:39:49 +0000 |
commit | ebce795c5c6d5d156783cff389194ab6e6c7eba5 (patch) | |
tree | ab5d93fddc235f475ceb2596a96839f84c448136 | |
parent | 1af75ba80253eaf264dec2c3f3a3deb4f04df4f0 (diff) | |
download | nixlib-ebce795c5c6d5d156783cff389194ab6e6c7eba5.tar nixlib-ebce795c5c6d5d156783cff389194ab6e6c7eba5.tar.gz nixlib-ebce795c5c6d5d156783cff389194ab6e6c7eba5.tar.bz2 nixlib-ebce795c5c6d5d156783cff389194ab6e6c7eba5.tar.lz nixlib-ebce795c5c6d5d156783cff389194ab6e6c7eba5.tar.xz nixlib-ebce795c5c6d5d156783cff389194ab6e6c7eba5.tar.zst nixlib-ebce795c5c6d5d156783cff389194ab6e6c7eba5.zip |
coqPackages: remove duplication in mkCoqPackages
-rw-r--r-- | pkgs/development/coq-modules/CoLoR/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 30 |
2 files changed, 9 insertions, 25 deletions
diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index c7aaf2a2e329..ececcf807405 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -1,5 +1,9 @@ { stdenv, fetchurl, coq }: +if !stdenv.lib.versionAtLeast coq.coq-version "8.6" +then throw "CoLoR is not available for Coq ${coq.coq-version}" +else + stdenv.mkDerivation { name = "coq${coq.coq-version}-CoLoR-1.3.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa429230aa30..ea23c44b76b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18261,29 +18261,9 @@ with pkgs; ynot = callPackage ../development/coq-modules/ynot {}; }; - mkCoqPackages_8_5 = self: let callPackage = newScope self; in rec { - inherit callPackage; - coq = coq_8_5; - coqPackages = coqPackages_8_5; - - autosubst = callPackage ../development/coq-modules/autosubst {}; - coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; - coquelicot = callPackage ../development/coq-modules/coquelicot {}; - dpdgraph = callPackage ../development/coq-modules/dpdgraph {}; - flocq = callPackage ../development/coq-modules/flocq {}; - interval = callPackage ../development/coq-modules/interval {}; - mathcomp = callPackage ../development/coq-modules/mathcomp { }; - paco = callPackage ../development/coq-modules/paco {}; - math-classes = callPackage ../development/coq-modules/math-classes { }; - ssreflect = callPackage ../development/coq-modules/ssreflect { }; - QuickChick = callPackage ../development/coq-modules/QuickChick {}; - fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; - }; - - mkCoqPackages_8_6 = self: let callPackage = newScope self; in rec { - inherit callPackage; - coq = coq_8_6; - coqPackages = coqPackages_8_6; + mkCoqPackages = self: coq: let callPackage = newScope self; in rec { + inherit callPackage coq; + coqPackages = self; autosubst = callPackage ../development/coq-modules/autosubst {}; coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; @@ -18302,8 +18282,8 @@ with pkgs; }; coqPackages_8_4 = mkCoqPackages_8_4 coqPackages_8_4; - coqPackages_8_5 = mkCoqPackages_8_5 coqPackages_8_5; - coqPackages_8_6 = mkCoqPackages_8_6 coqPackages_8_6; + coqPackages_8_5 = mkCoqPackages coqPackages_8_5 coq_8_5; + coqPackages_8_6 = mkCoqPackages coqPackages_8_6 coq_8_6; coqPackages = coqPackages_8_6; coq = coqPackages.coq; |