diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-06-28 18:13:22 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-06-28 18:41:59 +0000 |
| commit | c8c673568c8ae5df78d472e14ff6bc0078666bc6 (patch) | |
| tree | d7cf8e6ec0c077294a636838f7f44dffb2f264a8 | |
| parent | 582c3edcfac7d2d5fb3bbcc96ce1aac092812940 (diff) | |
| download | nixpkgs-c8c673568c8ae5df78d472e14ff6bc0078666bc6.tar nixpkgs-c8c673568c8ae5df78d472e14ff6bc0078666bc6.tar.gz nixpkgs-c8c673568c8ae5df78d472e14ff6bc0078666bc6.tar.bz2 nixpkgs-c8c673568c8ae5df78d472e14ff6bc0078666bc6.tar.lz nixpkgs-c8c673568c8ae5df78d472e14ff6bc0078666bc6.tar.xz nixpkgs-c8c673568c8ae5df78d472e14ff6bc0078666bc6.tar.zst nixpkgs-c8c673568c8ae5df78d472e14ff6bc0078666bc6.zip | |
ocamlPackages.stringext: 1.4.0 -> 1.4.3
ocamlPackages.qcheck: 0.4.0.1 -> 0.6
| -rw-r--r-- | pkgs/development/ocaml-modules/qcheck/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/stringext/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 4 |
3 files changed, 10 insertions, 12 deletions
diff --git a/pkgs/development/ocaml-modules/qcheck/default.nix b/pkgs/development/ocaml-modules/qcheck/default.nix index 158c69ef11a..695a751c7a9 100644 --- a/pkgs/development/ocaml-modules/qcheck/default.nix +++ b/pkgs/development/ocaml-modules/qcheck/default.nix @@ -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"; stdenv.mkDerivation { - name = "ocaml-qcheck-0.4.0.1"; + name = "ocaml${ocaml.version}-qcheck-0.6"; src = fetchzip { - url = https://github.com/c-cube/qcheck/archive/0.4.0.1.tar.gz; - sha256 = "0j2jdrfz8rrslgjihnfgg8yy12860z2vvf7hqzjbmfmf03hz4pgv"; + url = https://github.com/c-cube/qcheck/archive/0.6.tar.gz; + sha256 = "14rlg0jh4p12sd9xagppacsbfw0239anbq5r1aqhsqxlfmzbmi1p"; }; - buildInputs = [ ocaml findlib ocamlbuild oasis ounit ]; + buildInputs = [ ocaml findlib ocamlbuild ounit ]; - configureFlags = "--enable-tests --enable-ounit"; + configureFlags = "--enable-tests"; doCheck = true; checkPhase = "ocaml setup.ml -test"; diff --git a/pkgs/development/ocaml-modules/stringext/default.nix b/pkgs/development/ocaml-modules/stringext/default.nix index 9eb9ad514f7..c932bc3a46a 100644 --- a/pkgs/development/ocaml-modules/stringext/default.nix +++ b/pkgs/development/ocaml-modules/stringext/default.nix @@ -3,14 +3,14 @@ , doCheck ? stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01" }: -let version = "1.4.0"; in +let version = "1.4.3"; in stdenv.mkDerivation { - name = "ocaml-stringext-${version}"; + name = "ocaml${ocaml.version}-stringext-${version}"; src = fetchzip { url = "https://github.com/rgrinberg/stringext/archive/v${version}.tar.gz"; - sha256 = "1jp0x9rkss8a48z9wbnc4v5zvmnysin30345psl3xnxb2aqzwlii"; + sha256 = "121k79vjazvsd254yg391fp4spsd1p32amccrahd0g6hjhf5w6sl"; }; buildInputs = [ ocaml findlib ocamlbuild ounit qcheck ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 1038e13dbcd..96adaff03dc 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -515,9 +515,7 @@ let pycaml = callPackage ../development/ocaml-modules/pycaml { }; - qcheck = callPackage ../development/ocaml-modules/qcheck { - oasis = ocaml_oasis; - }; + qcheck = callPackage ../development/ocaml-modules/qcheck { }; qtest = callPackage ../development/ocaml-modules/qtest { }; |