summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pkgs/applications/science/logic/coq/default.nix1
-rw-r--r--pkgs/top-level/all-packages.nix13
-rw-r--r--pkgs/top-level/coq-packages.nix10
3 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 040d722f9410..5fab9788a94a 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -25,6 +25,7 @@ let
"8.8.0" = "13a4fka22hdxsjk11mgjb9ffzplfxyxp1sg5v1c8nk1grxlscgw8";
"8.8.1" = "1hlf58gwazywbmfa48219amid38vqdl94yz21i11b4map6jfwhbk";
"8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd";
+ "8.9+beta1" = "1yxv2klqal3mh6symi3gc6gv3xm684zlld2c0b6ijhjmp865cin8";
}."${version}";
coq-version = builtins.substring 0 3 version;
ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6bdb2be44800..7fc0c9fee9df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21364,13 +21364,14 @@ with pkgs;
boogie = dotnetPackages.Boogie;
inherit (callPackage ./coq-packages.nix {
- inherit (ocaml-ng) ocamlPackages_4_02
- ocamlPackages_4_05
- ;
+ inherit (ocaml-ng) ocamlPackages_4_05;
}) mkCoqPackages
- coq_8_5 coq_8_6 coq_8_7 coq_8_8
- coqPackages_8_5 coqPackages_8_6 coqPackages_8_7 coqPackages_8_8
- coqPackages coq
+ coqPackages_8_5 coq_8_5
+ coqPackages_8_6 coq_8_6
+ coqPackages_8_7 coq_8_7
+ coqPackages_8_8 coq_8_8
+ coqPackages_8_9 coq_8_9
+ coqPackages coq
;
coq2html = callPackage ../applications/science/logic/coq2html {
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index a4f44b6fc6f7..3ba90f3b5943 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -1,8 +1,4 @@
-{ lib, callPackage, newScope, recurseIntoAttrs
-, gnumake3
-, ocamlPackages_4_02
-, ocamlPackages_4_05
-}:
+{ lib, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05 }:
let
mkCoqPackages' = self: coq:
@@ -70,11 +66,15 @@ in rec {
coq_8_8 = callPackage ../applications/science/logic/coq {
version = "8.8.2";
};
+ coq_8_9 = callPackage ../applications/science/logic/coq {
+ version = "8.9+beta1";
+ };
coqPackages_8_5 = mkCoqPackages coq_8_5;
coqPackages_8_6 = mkCoqPackages coq_8_6;
coqPackages_8_7 = mkCoqPackages coq_8_7;
coqPackages_8_8 = mkCoqPackages coq_8_8;
+ coqPackages_8_9 = mkCoqPackages coq_8_9;
coqPackages = coqPackages_8_8;
coq = coqPackages.coq;