3
0
Fork 0
forked from mirrors/nixpkgs

ocamlPackages.stringext: 1.4.0 -> 1.4.3

ocamlPackages.qcheck: 0.4.0.1 -> 0.6
This commit is contained in:
Vincent Laporte 2017-06-28 18:13:22 +00:00
parent 582c3edcfa
commit c8c673568c
3 changed files with 10 additions and 12 deletions

View file

@ -1,18 +1,18 @@
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, oasis, ounit }: { stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4"; assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4";
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml-qcheck-0.4.0.1"; name = "ocaml${ocaml.version}-qcheck-0.6";
src = fetchzip { src = fetchzip {
url = https://github.com/c-cube/qcheck/archive/0.4.0.1.tar.gz; url = https://github.com/c-cube/qcheck/archive/0.6.tar.gz;
sha256 = "0j2jdrfz8rrslgjihnfgg8yy12860z2vvf7hqzjbmfmf03hz4pgv"; sha256 = "14rlg0jh4p12sd9xagppacsbfw0239anbq5r1aqhsqxlfmzbmi1p";
}; };
buildInputs = [ ocaml findlib ocamlbuild oasis ounit ]; buildInputs = [ ocaml findlib ocamlbuild ounit ];
configureFlags = "--enable-tests --enable-ounit"; configureFlags = "--enable-tests";
doCheck = true; doCheck = true;
checkPhase = "ocaml setup.ml -test"; checkPhase = "ocaml setup.ml -test";

View file

@ -3,14 +3,14 @@
, doCheck ? stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01" , doCheck ? stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"
}: }:
let version = "1.4.0"; in let version = "1.4.3"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml-stringext-${version}"; name = "ocaml${ocaml.version}-stringext-${version}";
src = fetchzip { src = fetchzip {
url = "https://github.com/rgrinberg/stringext/archive/v${version}.tar.gz"; url = "https://github.com/rgrinberg/stringext/archive/v${version}.tar.gz";
sha256 = "1jp0x9rkss8a48z9wbnc4v5zvmnysin30345psl3xnxb2aqzwlii"; sha256 = "121k79vjazvsd254yg391fp4spsd1p32amccrahd0g6hjhf5w6sl";
}; };
buildInputs = [ ocaml findlib ocamlbuild ounit qcheck ]; buildInputs = [ ocaml findlib ocamlbuild ounit qcheck ];

View file

@ -515,9 +515,7 @@ let
pycaml = callPackage ../development/ocaml-modules/pycaml { }; pycaml = callPackage ../development/ocaml-modules/pycaml { };
qcheck = callPackage ../development/ocaml-modules/qcheck { qcheck = callPackage ../development/ocaml-modules/qcheck { };
oasis = ocaml_oasis;
};
qtest = callPackage ../development/ocaml-modules/qtest { }; qtest = callPackage ../development/ocaml-modules/qtest { };