From 6b8da804666f76d2d931a3ffd3f948daa14673fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Tue, 16 May 2017 13:22:25 +0200 Subject: [PATCH 1/2] coqPackages: default version 8.4pl6 -> 8.6 This fixes incomplete commit 83a50c2. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c49aeeda5279..e48b420a47a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17714,7 +17714,7 @@ 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 = coqPackages_8_4; + coqPackages = coqPackages_8_6; cryptoverif = callPackage ../applications/science/logic/cryptoverif { }; From 5f04a61d4fe8fac31dfb4b1d58f599a1067017c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Tue, 16 May 2017 13:36:33 +0200 Subject: [PATCH 2/2] coq: default version is the one of coqPackages This clean-up is supposed to avoid the mistake made in 83a50c2 and fixed in 6b8da80 in the future. --- pkgs/top-level/all-packages.nix | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e48b420a47a6..5cb32f28ea0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17635,20 +17635,13 @@ with pkgs; 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_02) ocaml findlib lablgtk; - camlp5 = ocamlPackages_4_02.camlp5_transitional; - }; - coq_8_5 = callPackage ../applications/science/logic/coq { - version = "8.5pl3"; - }; - coq_8_6 = callPackage ../applications/science/logic/coq {}; - coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {}; - coq = coq_8_6; mkCoqPackages_8_4 = self: let callPackage = newScope self; in { inherit callPackage; - coq = coq_8_4; + coq = callPackage ../applications/science/logic/coq/8.4.nix { + inherit (ocamlPackages_4_02) ocaml findlib lablgtk; + camlp5 = ocamlPackages_4_02.camlp5_transitional; + }; coqPackages = coqPackages_8_4; contribs = @@ -17680,7 +17673,9 @@ with pkgs; mkCoqPackages_8_5 = self: let callPackage = newScope self; in rec { inherit callPackage; - coq = coq_8_5; + coq = callPackage ../applications/science/logic/coq { + version = "8.5pl3"; + }; coqPackages = coqPackages_8_5; coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; @@ -17697,7 +17692,7 @@ with pkgs; mkCoqPackages_8_6 = self: let callPackage = newScope self; in rec { inherit callPackage; - coq = coq_8_6; + coq = callPackage ../applications/science/logic/coq {}; coqPackages = coqPackages_8_6; coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; @@ -17715,6 +17710,12 @@ with pkgs; coqPackages_8_5 = mkCoqPackages_8_5 coqPackages_8_5; coqPackages_8_6 = mkCoqPackages_8_6 coqPackages_8_6; coqPackages = coqPackages_8_6; + + coq_8_4 = coqPackages_8_4.coq; + coq_8_5 = coqPackages_8_5.coq; + coq_8_6 = coqPackages_8_6.coq; + coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {}; + coq = coqPackages.coq; cryptoverif = callPackage ../applications/science/logic/cryptoverif { };