about summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2019-08-31 07:04:43 +0000
committerVincent Laporte <vbgl@users.noreply.github.com>2019-09-06 16:03:33 +0000
commit22c50545f2cb424eeedea541597b6dedf9b2f3e4 (patch)
treeac6de4eb556dbb87a0c61d4cb1806130360881d3 /pkgs/development/ocaml-modules
parentcd9f199c2b408e0f1078dfca84df6f4ab77ff627 (diff)
downloadnixlib-22c50545f2cb424eeedea541597b6dedf9b2f3e4.tar
nixlib-22c50545f2cb424eeedea541597b6dedf9b2f3e4.tar.gz
nixlib-22c50545f2cb424eeedea541597b6dedf9b2f3e4.tar.bz2
nixlib-22c50545f2cb424eeedea541597b6dedf9b2f3e4.tar.lz
nixlib-22c50545f2cb424eeedea541597b6dedf9b2f3e4.tar.xz
nixlib-22c50545f2cb424eeedea541597b6dedf9b2f3e4.tar.zst
nixlib-22c50545f2cb424eeedea541597b6dedf9b2f3e4.zip
ocamlPackages.ocaml_lwt: 4.1.0 -> 4.2.1
Ensures compatibility with OCaml 4.08
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r--pkgs/development/ocaml-modules/lwt/4.x.nix22
1 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/development/ocaml-modules/lwt/4.x.nix b/pkgs/development/ocaml-modules/lwt/4.x.nix
index 105104bc308d..4850a853ea04 100644
--- a/pkgs/development/ocaml-modules/lwt/4.x.nix
+++ b/pkgs/development/ocaml-modules/lwt/4.x.nix
@@ -1,29 +1,33 @@
-{ stdenv, fetchzip, pkgconfig, ncurses, libev, buildDunePackage, ocaml
+{ lib, fetchzip, pkgconfig, ncurses, libev, buildDunePackage, ocaml
 , cppo, ocaml-migrate-parsetree, ppx_tools_versioned, result
+, mmap, seq
 }:
 
-let inherit (stdenv.lib) optional versionAtLeast; in
+let inherit (lib) optional versionAtLeast; in
 
 buildDunePackage rec {
   pname = "lwt";
-  version = "4.1.0";
+  version = "4.2.1";
 
   src = fetchzip {
     url = "https://github.com/ocsigen/${pname}/archive/${version}.tar.gz";
-    sha256 = "16wnc61kfj54z4q8sn9f5iik37pswz328hcz3z6rkza3kh3s6wmm";
+    sha256 = "1hz24fyhpm7d6603v399pgxvdl236srwagqja41ljvjx83y10ysr";
   };
 
+  postPatch = ''
+    substituteInPlace lwt.opam \
+    --replace 'version: "dev"' 'version: "${version}"'
+  '';
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ cppo ocaml-migrate-parsetree ppx_tools_versioned ]
    ++ optional (!versionAtLeast ocaml.version "4.07") ncurses;
-  propagatedBuildInputs = [ libev result ];
-
-  configurePhase = "ocaml src/util/configure.ml -use-libev true";
+  propagatedBuildInputs = [ libev mmap seq result ];
 
   meta = {
     homepage = "https://ocsigen.org/lwt/";
     description = "A cooperative threads library for OCaml";
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
-    license = stdenv.lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.vbgl ];
+    license = lib.licenses.mit;
   };
 }