ocamlPackages.lwt: 5.9.1 → 5.9.2

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

@@ -6,19 +6,26 @@
   cppo,
   dune-configurator,
   ocplib-endian,
+  ppxlib,
+  version ? if lib.versionAtLeast ppxlib.version "0.36" then "5.9.2" else "5.9.1",
 }:
 
-buildDunePackage rec {
+buildDunePackage {
   pname = "lwt";
-  version = "5.9.1";
+  inherit version;
 
   minimalOCamlVersion = "4.08";
 
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "lwt";
-    rev = version;
-    hash = "sha256-oPYLFugMTI3a+hmnwgUcoMgn5l88NP1Roq0agLhH/vI=";
+    tag = version;
+    hash =
+      {
+        "5.9.1" = "sha256-oPYLFugMTI3a+hmnwgUcoMgn5l88NP1Roq0agLhH/vI=";
+        "5.9.2" = "sha256-pzowRN1wwaF2iMfMPE7RCtA2XjlaXC3xD0yznriVfu8=";
+      }
+      ."${version}";
   };
 
   nativeBuildInputs = [ cppo ];

pkgs/development/ocaml-modules/lwt/ppx.nix

@@ -1,7 +1,6 @@
 {
   lib,
   fetchFromGitHub,
-  fetchpatch,
   buildDunePackage,
   lwt,
   ppxlib,
@@ -11,11 +10,6 @@ buildDunePackage {
   pname = "lwt_ppx";
   inherit (lwt) version src;
 
-  patches = lib.optional (lib.versionAtLeast ppxlib.version "0.36") (fetchpatch {
-    url = "https://github.com/ocsigen/lwt/commit/96b7ac686208968503786bb6d101f4ee84c8d2e6.patch";
-    hash = "sha256-uxTwNVqV0O11WEKy66fphvGqW17FWDEzEylhVYNwNnY=";
-  });
-
   propagatedBuildInputs = [
     lwt
     ppxlib