From 2a62e931c104ce07fd8e39944ab4b9bd4f31e0cd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 21 Aug 2017 07:55:59 +0200 Subject: [PATCH] ocamlPackages.qtest: 2.2 -> 2.6 ocamlPackages.batteries: 2.6.0 -> 2.7.0 --- pkgs/development/ocaml-modules/batteries/default.nix | 4 ++-- pkgs/development/ocaml-modules/qtest/default.nix | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index b3e657842f8..7c8dc08c488 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -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 ]; diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix index 4d3ab0ddb4f..eb65384fc97 100644 --- a/pkgs/development/ocaml-modules/qtest/default.nix +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -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";