mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 07:31:20 +00:00
ocamlPackages.qtest: 2.2 -> 2.6
ocamlPackages.batteries: 2.6.0 -> 2.7.0
This commit is contained in:
parent
746979e0fc
commit
2a62e931c1
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest }:
|
||||
|
||||
let version = "2.6.0"; in
|
||||
let version = "2.7.0"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml-batteries-${version}";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz";
|
||||
sha256 = "1nnypfxm3zkahjkzll5qn4ngpqvbxlwg9qdp8qdqvq2vl76w0672";
|
||||
sha256 = "02rgfylz6x4y2030cclf9zwk2i8xqsydn1y9hjkja2qsk895bwfb";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ocamlbuild qtest ];
|
||||
|
|
|
@ -1,22 +1,21 @@
|
|||
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }:
|
||||
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, qcheck, ounit }:
|
||||
|
||||
if !stdenv.lib.versionAtLeast ocaml.version "4"
|
||||
then throw "qtest is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
let version = "2.2"; in
|
||||
let version = "2.6"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml-qtest-${version}";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/vincent-hugot/iTeML/archive/v${version}.tar.gz";
|
||||
sha256 = "1k68z8kby1f9s5j9xbn9bz8yhk59aalffz8gj5d1y5zhyalifrlz";
|
||||
sha256 = "1v5c1n5p8rhnisn606fs05q8764lqwgw08w66y5dm8wgmxgmsb3k";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ocamlbuild ];
|
||||
propagatedBuildInputs = [ ounit ];
|
||||
propagatedBuildInputs = [ qcheck ounit ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
installFlags = [ "BIN=$(out)/bin" ];
|
||||
preInstall = "mkdir -p $out/bin";
|
||||
|
||||
|
|
Loading…
Reference in a new issue