Merge branch 'master' into rename-z77z-into-maggesi

pkgs/development/ocaml-modules/labltk/default.nix

@@ -1,26 +1,43 @@
-{ stdenv, fetchurl, ocaml, findlib, tcl, tk }:
+{ stdenv, fetchurl, fetchzip, ocaml, findlib, tcl, tk }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.04"
+let OCamlVersionAtLeast = stdenv.lib.versionAtLeast ocaml.version; in
+
+if !OCamlVersionAtLeast "4.04"
 then throw "labltk is not available for OCaml ${ocaml.version}"
 else
 
-let param = {
-  "4.04" = {
+let param =
+if OCamlVersionAtLeast "4.08" then rec {
+  version = "8.06.7";
+  src = fetchzip {
+    url = "https://github.com/garrigue/labltk/archive/${version}.tar.gz";
+    sha256 = "1cqnxjv2dvw9csiz4iqqyx6rck04jgylpglk8f69kgybf7k7xk2h";
+  };
+} else
+  let mkOldParam = { version, key, sha256 }: {
+    src = fetchurl {
+      url = "https://forge.ocamlcore.org/frs/download.php/${key}/labltk-${version}.tar.gz";
+      inherit sha256;
+    };
+    inherit version;
+  }; in
+ {
+  "4.04" = mkOldParam {
     version = "8.06.2";
     key = "1628";
     sha256 = "1p97j9s33axkb4yyl0byhmhlyczqarb886ajpyggizy2br3a0bmk";
   };
-  "4.05" = {
+  "4.05" = mkOldParam {
     version = "8.06.3";
     key = "1701";
     sha256 = "1rka9jpg3kxqn7dmgfsa7pmsdwm16x7cn4sh15ijyyrad9phgdxn";
   };
-  "4.06" = {
+  "4.06" = mkOldParam {
     version = "8.06.4";
     key = "1727";
     sha256 = "0j3rz0zz4r993wa3ssnk5s416b1jhj58l6z2jk8238a86y7xqcii";
   };
-  "4.07" = {
+  "4.07" = mkOldParam {
     version = "8.06.5";
     key = "1764";
     sha256 = "0wgx65y1wkgf22ihpqmspqfp95fqbj3pldhp1p3b1mi8rmc37zwj";
@@ -29,14 +46,9 @@ let param = {
 in
 
 stdenv.mkDerivation rec {
-  inherit (param) version;
+  inherit (param) version src;
   name = "ocaml${ocaml.version}-labltk-${version}";
 
-  src = fetchurl {
-    url = "https://forge.ocamlcore.org/frs/download.php/${param.key}/labltk-${param.version}.tar.gz";
-    inherit (param) sha256;
-  };
-
   buildInputs = [ ocaml findlib tcl tk ];
 
   configureFlags = [ "--use-findlib" "--installbindir" "$(out)/bin" ];

pkgs/development/ocaml-modules/llvm/default.nix

@@ -8,7 +8,8 @@ stdenv.mkDerivation {
 
   inherit (llvm) src;
 
-  buildInputs = [ python cmake llvm ocaml findlib ctypes ];
+  buildInputs = [ python cmake ocaml findlib ctypes ];
+  propagatedBuildInputs = [ llvm ];
 
   patches = [ (fetchpatch {
     url = https://raw.githubusercontent.com/ocaml/opam-repository/2bdc193f5a9305ea93bf0f0dfc1fbc327c8b9306/packages/llvm/llvm.7.0.0/files/fix-shared.patch;
@@ -18,6 +19,7 @@ stdenv.mkDerivation {
   cmakeFlags = [
     "-DLLVM_OCAML_OUT_OF_TREE=TRUE"
     "-DLLVM_OCAML_INSTALL_PATH=${placeholder "out"}/ocaml"
+    "-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=${stdenv.lib.getLib llvm}/lib"
   ];
 
   buildFlags = "ocaml_all";
@@ -30,6 +32,10 @@ stdenv.mkDerivation {
     mv $OCAMLFIND_DESTDIR/llvm/META{.llvm,}
   '';
 
+  passthru = {
+    inherit llvm;
+  };
+
   meta = {
     inherit (llvm.meta) license homepage;
     platforms = ocaml.meta.platforms or [];

pkgs/development/ocaml-modules/ocaml-monadic/default.nix

@@ -0,0 +1,25 @@
+{ lib, fetchFromGitHub, buildDunePackage
+, ocaml-migrate-parsetree, ppx_tools_versioned
+}:
+
+buildDunePackage rec {
+  pname = "ocaml-monadic";
+  version = "0.4.1";
+
+  src = fetchFromGitHub {
+    owner = "zepalmer";
+    repo = pname;
+    rev = version;
+    sha256 = "1zcwydypk5vwfn1g7srnl5076scwwq5a5y8xwcjl70pc4cpzszll";
+  };
+
+  buildInputs = [ ppx_tools_versioned ];
+  propagatedBuildInputs = [ ocaml-migrate-parsetree ];
+
+  meta = {
+    inherit (src.meta) homepage;
+    description = "A PPX extension to provide an OCaml-friendly monadic syntax";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+}

pkgs/development/ocaml-modules/ocsigen-server/default.nix

@@ -13,14 +13,14 @@ let mkpath = p: n:
 in
 
 stdenv.mkDerivation rec {
-  version = "2.11.0";
+  version = "2.15.0";
   pname = "ocsigenserver";
 
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "ocsigenserver";
     rev = version;
-    sha256 = "0y1ngki7w9s10ip7nj9qb7254bd5sp01xxz16sxyj7l7qz603hy2";
+    sha256 = "15qdkxcbl9c1bbn0fh9awjw0hjn7r6awcn288a9vyxln7icdbifw";
   };
 
   buildInputs = [ which makeWrapper ocaml findlib

pkgs/development/ocaml-modules/ssl/default.nix

@@ -1,27 +1,23 @@
-{ stdenv, fetchzip, which, openssl, ocaml, findlib }:
+{ lib, buildDunePackage, fetchFromGitHub, pkg-config, openssl }:
 
-stdenv.mkDerivation rec {
-  name = "ocaml${ocaml.version}-ssl-${version}";
-  version = "0.5.5";
+buildDunePackage rec {
+  pname = "ssl";
+  version = "0.5.9";
 
-  src = fetchzip {
-    url = "https://github.com/savonet/ocaml-ssl/releases/download/${version}/ocaml-ssl-${version}.tar.gz";
-    sha256 = "0j5zvsx51dg5r7sli7bakv7gfd29z890h0xzi876pg9vywwz9w7l";
+  src = fetchFromGitHub {
+    owner = "savonet";
+    repo = "ocaml-ssl";
+    rev = version;
+    sha256 = "04h02rvzrwp886n5hsx84rnc9b150iggy38g5v1x1rwz3pkdnmf0";
   };
 
-  buildInputs = [which ocaml findlib];
-
+  nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [openssl];
 
-  dontAddPrefix = true;
-
-  createFindlibDestdir = true;
-
   meta = {
     homepage = http://savonet.rastageeks.org/;
     description = "OCaml bindings for libssl ";
     license = "LGPL+link exception";
-    platforms = ocaml.meta.platforms or [];
     maintainers = [
       stdenv.lib.maintainers.maggesi
     ];