diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 73 |
1 files changed, 22 insertions, 51 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82c131b901a0..6e5b498f70a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6603,7 +6603,9 @@ in valkyrie = callPackage ../development/tools/analysis/valkyrie { }; - inherit (ocaml-ng.ocamlPackages_4_02) verasco; + verasco = ocaml-ng.ocamlPackages_4_02.verasco.override { + coq = coq_8_4; + }; visualvm = callPackage ../development/tools/java/visualvm { }; @@ -16716,38 +16718,34 @@ in aspino = callPackage ../applications/science/logic/aspino {}; - coq = callPackage ../applications/science/logic/coq { + coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix { + make = pkgs.gnumake3; + inherit (ocamlPackages_3_12_1) ocaml findlib; + camlp5 = ocamlPackages_3_12_1.camlp5_transitional; + lablgtk = ocamlPackages_3_12_1.lablgtk_2_14; + }; + coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix { inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk; camlp5 = ocamlPackages_4_01_0.camlp5_transitional; }; - - coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix { + coq_8_5 = callPackage ../applications/science/logic/coq/8.5.nix { inherit (ocamlPackages) ocaml findlib lablgtk; camlp5 = ocamlPackages.camlp5_transitional; }; - coq_8_6 = callPackage ../applications/science/logic/coq/8.6.nix { inherit (ocamlPackages) ocaml findlib lablgtk; camlp5 = ocamlPackages.camlp5_transitional; }; - - coq_8_5 = callPackage ../applications/science/logic/coq/8.5.nix { + coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix { inherit (ocamlPackages) ocaml findlib lablgtk; camlp5 = ocamlPackages.camlp5_transitional; }; - - coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix { - make = pkgs.gnumake3; - inherit (ocamlPackages_3_12_1) ocaml findlib; - camlp5 = ocamlPackages_3_12_1.camlp5_transitional; - lablgtk = ocamlPackages_3_12_1.lablgtk_2_14; - }; + coq = coq_8_6; mkCoqPackages_8_4 = self: let callPackage = newScope self; in { - inherit callPackage; - - bedrock = callPackage ../development/coq-modules/bedrock {}; + coq = coq_8_4; + coqPackages = coqPackages_8_4; contribs = let contribs = @@ -16757,86 +16755,59 @@ in in recurseIntoAttrs contribs; + bedrock = callPackage ../development/coq-modules/bedrock {}; coqExtLib = callPackage ../development/coq-modules/coq-ext-lib {}; - coqeal = callPackage ../development/coq-modules/coqeal {}; - coquelicot = callPackage ../development/coq-modules/coquelicot {}; - domains = callPackage ../development/coq-modules/domains {}; - fiat = callPackage ../development/coq-modules/fiat {}; fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; - flocq = callPackage ../development/coq-modules/flocq {}; - heq = callPackage ../development/coq-modules/heq {}; - interval = callPackage ../development/coq-modules/interval {}; - mathcomp = callPackage ../development/coq-modules/mathcomp {}; - paco = callPackage ../development/coq-modules/paco {}; - QuickChick = callPackage ../development/coq-modules/QuickChick {}; - ssreflect = callPackage ../development/coq-modules/ssreflect {}; - tlc = callPackage ../development/coq-modules/tlc {}; - unimath = callPackage ../development/coq-modules/unimath {}; - 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; 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 { }; - ssreflect = callPackage ../development/coq-modules/ssreflect { }; - 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; 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 { }; + ssreflect = callPackage ../development/coq-modules/ssreflect { }; fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; - }; - coqPackages = mkCoqPackages_8_4 coqPackages; + 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 = coqPackages_8_6; cryptoverif = callPackage ../applications/science/logic/cryptoverif { }; |