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

coq_8_12: 8.12+β1 → 8.12.0

Browse Source 
coqPackages.equations: 1.2.2 → 1.2.3
This commit is contained in:
Vincent Laporte 2020-07-30 14:54:25 +02:00 committed by Vincent Laporte
parent 86fbad8466
commit b8dfca143c
3 changed files with 11 additions and 9 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

@ -35,7 +35,7 @@ let
"8.11.0" = "1rfdic6mp7acx2zfwz7ziqk12g95bl9nyj68z4n20a5bcjv2pxpn"; "8.11.0" = "1rfdic6mp7acx2zfwz7ziqk12g95bl9nyj68z4n20a5bcjv2pxpn";
"8.11.1" = "0qriy9dy36dajsv5qmli8gd6v55mah02ya334nw49ky19v7518m0"; "8.11.1" = "0qriy9dy36dajsv5qmli8gd6v55mah02ya334nw49ky19v7518m0";
"8.11.2" = "0f77ccyxdgbf1nrj5fa8qvrk1cyfy06fv8gj9kzfvlcgn0cf48sa"; "8.11.2" = "0f77ccyxdgbf1nrj5fa8qvrk1cyfy06fv8gj9kzfvlcgn0cf48sa";
"8.12+beta1" = "0jbm8am9j926s0h4fi0cjl95l37l6p7i03spcryyrd4sg5xrddr7"; "8.12.0" = "18dc7k0piv6v064zgdadpw6mkkxk7j663hb3svgj5236fihjr0cz";
}.${version}; }.${version};
coq-version = stdenv.lib.versions.majorMinor version; coq-version = stdenv.lib.versions.majorMinor version;
versionAtLeast = stdenv.lib.versionAtLeast coq-version; versionAtLeast = stdenv.lib.versionAtLeast coq-version;
@ -112,13 +112,15 @@ self = stdenv.mkDerivation {
; ;
buildInputs = [ ncurses ocamlPackages.ocaml ocamlPackages.findlib ] buildInputs = [ ncurses ocamlPackages.ocaml ocamlPackages.findlib ]
++ stdenv.lib.optional (!versionAtLeast "8.10") ocamlPackages.camlp5 ++ stdenv.lib.optional (!versionAtLeast "8.10") ocamlPackages.camlp5
++ [ ocamlPackages.num ] ++ stdenv.lib.optional (!versionAtLeast "8.12") ocamlPackages.num
++ stdenv.lib.optionals buildIde ++ stdenv.lib.optionals buildIde
(if versionAtLeast "8.10" (if versionAtLeast "8.10"
then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ] then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ]
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa
else [ ocamlPackages.lablgtk ]); else [ ocamlPackages.lablgtk ]);
propagatedBuildInputs = stdenv.lib.optional (versionAtLeast "8.12") ocamlPackages.num;
postPatch = '' postPatch = ''
UNAME=$(type -tp uname) UNAME=$(type -tp uname)
RM=$(type -tp rm) RM=$(type -tp rm)

12
pkgs/development/coq-modules/equations/default.nix
View File

@ -33,15 +33,15 @@ let
}; };
"8.11" = { "8.11" = {
version = "1.2.2"; version = "1.2.3";
rev = "v1.2.2-8.11"; rev = "v1.2.3-8.11";
sha256 = "0g2y0s8kb2imbqyrx9hmvjzpwmicid7shv7ma10fnb8dgk2dqkf9"; sha256 = "1srxz1rws8jsh7402g2x2vcqgjbbsr64dxxj5d2zs48pmhb20csf";
}; };
"8.12" = { "8.12" = {
version = "1.2.2"; version = "1.2.3";
rev = "v1.2.2-8.12"; rev = "v1.2.3-8.12";
sha256 = "0fkz78i2gn9x9scfa7n8fl2sq7czppsicy7w5mq919qqfp0w1aj0"; sha256 = "1y0jkvzyz5ssv5vby41p1i8zs7nsdc8g3pzyq73ih9jz8h252643";
}; };
}; };
param = params.${coq.coq-version}; param = params.${coq.coq-version};

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

@ -118,7 +118,7 @@ in rec {
version = "8.11.2"; version = "8.11.2";
}; };
coq_8_12 = callPackage ../applications/science/logic/coq { coq_8_12 = callPackage ../applications/science/logic/coq {
version = "8.12+beta1"; version = "8.12.0";
}; };
coqPackages_8_5 = mkCoqPackages coq_8_5; coqPackages_8_5 = mkCoqPackages coq_8_5;