public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

coqPackages: remove duplication in mkCoqPackages

Browse Source
This commit is contained in:
Vincent Laporte 2017-09-04 02:39:03 +00:00
parent 1af75ba802
commit ebce795c5c
2 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/coq-modules/CoLoR/default.nix
View File

@ -1,5 +1,9 @@
{ stdenv, fetchurl, coq }: { 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 { stdenv.mkDerivation {
name = "coq${coq.coq-version}-CoLoR-1.3.0"; name = "coq${coq.coq-version}-CoLoR-1.3.0";

30
pkgs/top-level/all-packages.nix
View File

@ -18261,29 +18261,9 @@ with pkgs;
ynot = callPackage ../development/coq-modules/ynot {}; ynot = callPackage ../development/coq-modules/ynot {};
}; };
mkCoqPackages_8_5 = self: let callPackage = newScope self; in rec { mkCoqPackages = self: coq: let callPackage = newScope self; in rec {
inherit callPackage; inherit callPackage coq;
coq = coq_8_5; coqPackages = self;
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;
autosubst = callPackage ../development/coq-modules/autosubst {}; autosubst = callPackage ../development/coq-modules/autosubst {};
coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; 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_4 = mkCoqPackages_8_4 coqPackages_8_4;
coqPackages_8_5 = mkCoqPackages_8_5 coqPackages_8_5; coqPackages_8_5 = mkCoqPackages coqPackages_8_5 coq_8_5;
coqPackages_8_6 = mkCoqPackages_8_6 coqPackages_8_6; coqPackages_8_6 = mkCoqPackages coqPackages_8_6 coq_8_6;
coqPackages = coqPackages_8_6; coqPackages = coqPackages_8_6;
coq = coqPackages.coq; coq = coqPackages.coq;