b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

coq_8_14: 8.14.0 → 8.14.1

Browse source 
And build Coq ≥ 8.14 with OCaml 4.12
This commit is contained in:
Vincent Laporte 2021-11-24 10:33:29 +00:00 committed by Vincent Laporte
parent 4f51fae5bb
commit 48406e3fca
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/science/logic/coq/default.nix
View file

@ -7,7 +7,7 @@
{ lib, stdenv, fetchzip, writeText, pkg-config, gnumake42 { lib, stdenv, fetchzip, writeText, pkg-config, gnumake42
, customOCamlPackages ? null , 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 , buildIde ? true
, glib, gnome, wrapGAppsHook, makeDesktopItem, copyDesktopItems , glib, gnome, wrapGAppsHook, makeDesktopItem, copyDesktopItems
, csdp ? null , csdp ? null
@ -45,6 +45,7 @@ let
"8.13.1".sha256 = "0xx2ns84mlip9bg2mkahy3pmc5zfcgrjxsviq9yijbzy1r95wf0n"; "8.13.1".sha256 = "0xx2ns84mlip9bg2mkahy3pmc5zfcgrjxsviq9yijbzy1r95wf0n";
"8.13.2".sha256 = "1884vbmwmqwn9ngibax6dhnqh4cc02l0s2ajc6jb1xgr0i60whjk"; "8.13.2".sha256 = "1884vbmwmqwn9ngibax6dhnqh4cc02l0s2ajc6jb1xgr0i60whjk";
"8.14.0".sha256 = "04y2z0qyvag66zanfyc3f9agvmzbn4lsr0p1l7ck6yjhqx7vbm17"; "8.14.0".sha256 = "04y2z0qyvag66zanfyc3f9agvmzbn4lsr0p1l7ck6yjhqx7vbm17";
"8.14.1".sha256 = "0sx78pgx0qw8v7v2r32zzy3l161zipzq95iacda628girim7psnl";
}; };
releaseRev = v: "V${v}"; releaseRev = v: "V${v}";
fetched = import ../../../../build-support/coq/meta-fetch/default.nix fetched = import ../../../../build-support/coq/meta-fetch/default.nix
@ -62,10 +63,11 @@ let
'' else ""; '' else "";
ocamlPackages = if !isNull customOCamlPackages then customOCamlPackages ocamlPackages = if !isNull customOCamlPackages then customOCamlPackages
else with versions; switch coq-version [ 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.11" "8.13"; out = ocamlPackages_4_10; }
{ case = range "8.7" "8.10"; out = ocamlPackages_4_09; } { case = range "8.7" "8.10"; out = ocamlPackages_4_09; }
{ case = range "8.5" "8.6"; out = ocamlPackages_4_05; } { case = range "8.5" "8.6"; out = ocamlPackages_4_05; }
] ocamlPackages_4_10; ] ocamlPackages_4_12;
ocamlBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] ocamlBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ]
++ optional (!versionAtLeast "8.10") ocamlPackages.camlp5 ++ optional (!versionAtLeast "8.10") ocamlPackages.camlp5
++ optional (!versionAtLeast "8.13") ocamlPackages.num ++ optional (!versionAtLeast "8.13") ocamlPackages.num

2
pkgs/top-level/all-packages.nix
View file

@ -31621,7 +31621,7 @@ with pkgs;
cadical = callPackage ../applications/science/logic/cadical {}; cadical = callPackage ../applications/science/logic/cadical {};
inherit (callPackage ./coq-packages.nix { 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 }) mkCoqPackages
coqPackages_8_5 coq_8_5 coqPackages_8_5 coq_8_5
coqPackages_8_6 coq_8_6 coqPackages_8_6 coq_8_6

9
pkgs/top-level/coq-packages.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09 { 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: }@args:
let lib = import ../build-support/coq/extra-lib.nix {inherit (args) lib;}; in let lib = import ../build-support/coq/extra-lib.nix {inherit (args) lib;}; in
let let
@ -113,7 +113,12 @@ let
) (lib.attrNames set) ) (lib.attrNames set)
); );
mkCoq = version: callPackage ../applications/science/logic/coq { 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 { in rec {