cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #62776 from vbgl/coq-simple-io-1.2.0

Browse source 
[coq] simple-io: 1.0.0 -> 1.2.0; QuickChick: init at 1.1.0 for Coq 8.9
This commit is contained in:
Vincent Laporte 2019-06-13 06:58:44 +00:00 committed by GitHub
commit b58ada326a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkgs/development/coq-modules/QuickChick/default.nix
View file

@ -14,23 +14,23 @@ let params =
sha256 = "0fri4nih40vfb0fbr82dsi631ydkw48xszinq43lyinpknf54y17";
};
"8.7" = {
version = "20171212";
rev = "195e550a1cf0810497734356437a1720ebb6d744";
sha256 = "0zm23y89z0h4iamy74qk9qi2pz2cj3ga6ygav0w79n0qyqwhxcq1";
};
"8.8" = rec {
preConfigure = "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";
version = "20190311";
rev = "22af9e9a223d0038f05638654422e637e863b355";
sha256 = "00rnr19lg6lg0haq1sy4ld38p7imzand6fc52fvfq27gblxkp2aq";
buildInputs = with coq.ocamlPackages; [ ocamlbuild num ];
propagatedBuildInputs = [ coq-ext-lib simple-io ];
};
"8.9" = rec {
version = "1.1.0";
rev = "v${version}";
sha256 = "1c34v1k37rk7v0xk2czv5n79mbjxjrm6nh3llg2mpfmdsqi68wf3";
};
};
param = params."${coq.coq-version}";
in
let recent = stdenv.lib.versionAtLeast coq.coq-version "8.8"; in
stdenv.mkDerivation rec {
name = "coq${coq.coq-version}-QuickChick-${param.version}";
@ -41,16 +41,19 @@ stdenv.mkDerivation rec {
inherit (param) rev sha256;
};
preConfigure = stdenv.lib.optionalString recent
"substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";
buildInputs = [ coq ]
++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ])
++ (param.buildInputs or [])
++ stdenv.lib.optionals recent
(with coq.ocamlPackages; [ ocamlbuild num ])
;
propagatedBuildInputs = [ ssreflect ] ++ (param.propagatedBuildInputs or []);
propagatedBuildInputs = [ ssreflect ]
++ stdenv.lib.optionals recent [ coq-ext-lib simple-io ];
enableParallelBuilding = false;
preConfigure = param.preConfigure or null;
installPhase = ''
make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
'';

4
pkgs/development/coq-modules/simple-io/default.nix
View file

@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, coq, coq-ext-lib }:
stdenv.mkDerivation rec {
version = "1.0.0";
version = "1.2.0";
name = "coq${coq.coq-version}-simple-io-${version}";
src = fetchFromGitHub {
owner = "Lysxia";
repo = "coq-simple-io";
rev = version;
sha256 = "06gnbl8chv6ig18rlxnp8gg0np6863kxd7j15h46q0v1cnpx84lp";
sha256 = "1im1vwp7l7ha8swnhgbih0qjg187n8yx14i003nf6yy7p0ryxc9m";
};
buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml ocamlbuild ]);