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

Merge pull request #14649 from vbgl/coq_8.5.1 

Coq 8.5pl1
This commit is contained in:
Arseniy Seroka 2016-04-13 22:16:48 +03:00
parent b338187e71 618b336808
commit 0420a532e9
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/science/logic/coq/8.5.nix
View File

@ -6,7 +6,7 @@
{stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}: {stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}:
let let
version = "8.5"; version = "8.5pl1";
coq-version = "8.5"; coq-version = "8.5";
buildIde = lablgtk != null; buildIde = lablgtk != null;
ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
@ -23,8 +23,8 @@ stdenv.mkDerivation {
inherit ocaml camlp5; inherit ocaml camlp5;
src = fetchurl { src = fetchurl {
url = https://coq.inria.fr/distrib/V8.5/files/coq-8.5.tar.gz; url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz";
sha256 = "0gdfm6k5q1f8sz1xr9ijdkkvwqsb7v8prj21gmwv0z0yp6w2zac9"; sha256 = "1w2xvm6w16khfn63bp95s25hnkn2ny3w0yqg3lq63gp11aqpbyjb";
}; };
buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];

7
pkgs/development/coq-modules/coq-ext-lib/default.nix
View File

@ -1,9 +1,10 @@
{ stdenv, fetchFromGitHub, coq }: { stdenv, fetchFromGitHub, coq }:
let param = let param =
if coq.coq-version == "8.4" {
then { version = "0.9.0"; sha256 = "1n3bk003vvbghbrxkhal6drnc0l65jv9y77wd56is3jw9xgiif0w"; } "8.4" = { version = "0.9.0"; sha256 = "1n3bk003vvbghbrxkhal6drnc0l65jv9y77wd56is3jw9xgiif0w"; };
else { version = "0.9.0-beta3"; sha256 = "1dya0sqp5jjb2cl7cv2ry4gvcr359bkzzqcz0plknf3f1c5zrv0s"; }; "8.5" = { version = "0.9.3"; sha256 = "05zff5mrkxpvcsw4gi8whjj5w0mdbqzjmb247lq5b7mry0bypwc5"; };
}."${coq.coq-version}";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {