coq_8_14: 8.14.0 → 8.14.1
And build Coq ≥ 8.14 with OCaml 4.12
This commit is contained in:
parent
4f51fae5bb
commit
48406e3fca
|
@ -7,7 +7,7 @@
|
|||
|
||||
{ lib, stdenv, fetchzip, writeText, pkg-config, gnumake42
|
||||
, customOCamlPackages ? null
|
||||
, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ncurses
|
||||
, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12, ncurses
|
||||
, buildIde ? true
|
||||
, glib, gnome, wrapGAppsHook, makeDesktopItem, copyDesktopItems
|
||||
, csdp ? null
|
||||
|
@ -45,6 +45,7 @@ let
|
|||
"8.13.1".sha256 = "0xx2ns84mlip9bg2mkahy3pmc5zfcgrjxsviq9yijbzy1r95wf0n";
|
||||
"8.13.2".sha256 = "1884vbmwmqwn9ngibax6dhnqh4cc02l0s2ajc6jb1xgr0i60whjk";
|
||||
"8.14.0".sha256 = "04y2z0qyvag66zanfyc3f9agvmzbn4lsr0p1l7ck6yjhqx7vbm17";
|
||||
"8.14.1".sha256 = "0sx78pgx0qw8v7v2r32zzy3l161zipzq95iacda628girim7psnl";
|
||||
};
|
||||
releaseRev = v: "V${v}";
|
||||
fetched = import ../../../../build-support/coq/meta-fetch/default.nix
|
||||
|
@ -62,10 +63,11 @@ let
|
|||
'' else "";
|
||||
ocamlPackages = if !isNull customOCamlPackages then customOCamlPackages
|
||||
else with versions; switch coq-version [
|
||||
{ case = range "8.14" "8.14"; out = ocamlPackages_4_12; }
|
||||
{ case = range "8.11" "8.13"; out = ocamlPackages_4_10; }
|
||||
{ case = range "8.7" "8.10"; out = ocamlPackages_4_09; }
|
||||
{ case = range "8.5" "8.6"; out = ocamlPackages_4_05; }
|
||||
] ocamlPackages_4_10;
|
||||
] ocamlPackages_4_12;
|
||||
ocamlBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ]
|
||||
++ optional (!versionAtLeast "8.10") ocamlPackages.camlp5
|
||||
++ optional (!versionAtLeast "8.13") ocamlPackages.num
|
||||
|
|
|
@ -31621,7 +31621,7 @@ with pkgs;
|
|||
cadical = callPackage ../applications/science/logic/cadical {};
|
||||
|
||||
inherit (callPackage ./coq-packages.nix {
|
||||
inherit (ocaml-ng) ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10;
|
||||
inherit (ocaml-ng) ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10 ocamlPackages_4_12;
|
||||
}) mkCoqPackages
|
||||
coqPackages_8_5 coq_8_5
|
||||
coqPackages_8_6 coq_8_6
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09
|
||||
, ocamlPackages_4_10, fetchpatch, makeWrapper, coq2html
|
||||
, ocamlPackages_4_10, ocamlPackages_4_12, fetchpatch, makeWrapper, coq2html
|
||||
}@args:
|
||||
let lib = import ../build-support/coq/extra-lib.nix {inherit (args) lib;}; in
|
||||
let
|
||||
|
@ -113,7 +113,12 @@ let
|
|||
) (lib.attrNames set)
|
||||
);
|
||||
mkCoq = version: callPackage ../applications/science/logic/coq {
|
||||
inherit version ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10;
|
||||
inherit version
|
||||
ocamlPackages_4_05
|
||||
ocamlPackages_4_09
|
||||
ocamlPackages_4_10
|
||||
ocamlPackages_4_12
|
||||
;
|
||||
};
|
||||
in rec {
|
||||
|
||||
|
|
Loading…
Reference in a new issue