Merge master into staging-next

2019-08-27 16:36:47 +02:00
parent 70c1c856d4 b40ee82685
commit 98640fd482
271 changed files with 5293 additions and 2782 deletions
@@ -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";
@@ -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 {