jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coq_8_16: use OCaml 4.14

Browse Source
This commit is contained in:
Vincent Laporte 2022-10-11 08:51:38 +02:00 committed by Vincent Laporte
parent d451ea73dc
commit 661ee3a269
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/science/logic/coq/default.nix
View File

@ -7,7 +7,9 @@
{ lib, stdenv, fetchzip, writeText, pkg-config, gnumake42
, customOCamlPackages ? null
, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12, ncurses
, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12
, ocamlPackages_4_14
, ncurses
, buildIde ? null # default is true for Coq < 8.14 and false for Coq >= 8.14
, glib, gnome, wrapGAppsHook, makeDesktopItem, copyDesktopItems
, csdp ? null
@ -68,11 +70,12 @@ 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.16" "8.17"; out = ocamlPackages_4_14; }
{ case = range "8.14" "8.15"; 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_12;
] ocamlPackages_4_14;
ocamlNativeBuildInputs = with ocamlPackages; [ ocaml findlib ]
++ optional (coqAtLeast "8.14") dune_2;
ocamlPropagatedBuildInputs = [ ]

8
pkgs/top-level/all-packages.nix
View File

@ -35294,7 +35294,13 @@ 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 ocamlPackages_4_12;
inherit (ocaml-ng)
ocamlPackages_4_05
ocamlPackages_4_09
ocamlPackages_4_10
ocamlPackages_4_12
ocamlPackages_4_14
;
}) mkCoqPackages
coqPackages_8_5 coq_8_5
coqPackages_8_6 coq_8_6

4
pkgs/top-level/coq-packages.nix
View File

@ -1,6 +1,7 @@
{ lib, stdenv, fetchzip
, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09
, ocamlPackages_4_10, ocamlPackages_4_12, fetchpatch, makeWrapper, coq2html
, ocamlPackages_4_10, ocamlPackages_4_12, ocamlPackages_4_14
, fetchpatch, makeWrapper, coq2html
}@args:
let lib = import ../build-support/coq/extra-lib.nix {inherit (args) lib;}; in
let
@ -130,6 +131,7 @@ let
ocamlPackages_4_09
ocamlPackages_4_10
ocamlPackages_4_12
ocamlPackages_4_14
;
};
in rec {