diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix index f7e585b43b08..05b9c06af0fe 100644 --- a/pkgs/development/ocaml-modules/qtest/default.nix +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchzip, ocaml, oasis, findlib, ounit }: +{ stdenv, fetchzip, ocaml, findlib, ounit }: -let version = "2.0.1"; in +let version = "2.2"; in stdenv.mkDerivation { name = "ocaml-qtest-${version}"; src = fetchzip { url = "https://github.com/vincent-hugot/iTeML/archive/v${version}.tar.gz"; - sha256 = "00sir7q7z78s22w8fzrgw9gqm7r8ww0bgwqxrq6nsbbclgxj9c6i"; + sha256 = "1k68z8kby1f9s5j9xbn9bz8yhk59aalffz8gj5d1y5zhyalifrlz"; }; - buildInputs = [ ocaml oasis findlib ]; + buildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ ounit ]; - buildPhase = "ocaml do.ml qtest build $out"; createFindlibDestdir = true; - installPhase = "ocaml do.ml qtest install $out"; + installFlags = [ "BIN=$(out)/bin" ]; + preInstall = "mkdir -p $out/bin"; meta = { description = "Inline (Unit) Tests for OCaml (formerly “qtest”)"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b66f7f48e37..4d6deb9ca0c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5444,9 +5444,7 @@ in oasis = ocaml_oasis; }; - qtest = callPackage ../development/ocaml-modules/qtest { - oasis = ocaml_oasis; - }; + qtest = callPackage ../development/ocaml-modules/qtest { }; re = callPackage ../development/ocaml-modules/re { };