diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-27 16:36:47 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-27 16:36:47 +0200 |
| commit | 98640fd48212f8e6552517f667bba1901f5936d4 (patch) | |
| tree | 0b5f895f31f16b47e8f837c1d3ac87da1f2884eb /pkgs/development/ocaml-modules | |
| parent | 70c1c856d4c96fb37b6e507db4acb125656f992d (diff) | |
| parent | b40ee8268515d78b419f53fb22a9fad49b985de8 (diff) | |
| download | nixlib-98640fd48212f8e6552517f667bba1901f5936d4.tar nixlib-98640fd48212f8e6552517f667bba1901f5936d4.tar.gz nixlib-98640fd48212f8e6552517f667bba1901f5936d4.tar.bz2 nixlib-98640fd48212f8e6552517f667bba1901f5936d4.tar.lz nixlib-98640fd48212f8e6552517f667bba1901f5936d4.tar.xz nixlib-98640fd48212f8e6552517f667bba1901f5936d4.tar.zst nixlib-98640fd48212f8e6552517f667bba1901f5936d4.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/mtime/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/ocurl/default.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index 73f84886cc57..f4e3586b43c1 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -7,8 +7,8 @@ with lib; let param = if versionAtLeast ocaml.version "4.03" then { - version = "1.1.0"; - sha256 = "1qb4ljwirrc3g8brh97s76rjky2cpmy7zm87y7iqd6pxix52ydk3"; + version = "1.2.0"; + sha256 = "0zm1jvqkz3ghznfsm3bbv9q2zinp9grggdf7k9phjazjvny68xb8"; } else { version = "0.8.4"; sha256 = "1adm8sc3lkjly99hyi5gqnxas748k7h62ljgn8x423nkn8gyp8dh"; diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index 0b90cd4b6aad..8c8d45192494 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -1,5 +1,9 @@ { stdenv, pkgconfig, ocaml, findlib, fetchurl, curl, ncurses }: +if stdenv.lib.versionOlder ocaml.version "4.02" +then throw "ocurl is not available for OCaml ${ocaml.version}" +else + stdenv.mkDerivation rec { name = "ocurl-0.8.2"; src = fetchurl { |