ocamlPackages.lwd: 0.4 → 0.5

pkgs/by-name/do/docfd/package.nix

@@ -3,6 +3,7 @@
   ocamlPackages,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   python3,
   dune,
   makeWrapper,
@@ -25,8 +26,16 @@ ocamlPackages.buildDunePackage rec {
     hash = "sha256-d7c72jXadwBtUqarfdGnEDo9yFwCAeEX0GGVqCe70Ak=";
   };
 
-  # Compatibility with nottui ≥ 0.4
-  patches = [ ./nottui-unix.patch ];
+  patches = [
+    # Compatibility with nottui ≥ 0.4
+    ./nottui-unix.patch
+    # Compatibility with lwd ≥ 0.5
+    (fetchpatch {
+      url = "https://github.com/darrenldl/docfd/commit/439ff57e80778f684cf8526b3b33c745a02da2a7.patch";
+      includes = [ "*.ml" ];
+      hash = "sha256-bB+zta2VcrDd42FUD9ExBui787LmtN3PMyb/MJQO7u0=";
+    })
+  ];
 
   nativeBuildInputs = [
     python3

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

@@ -5,15 +5,13 @@
   seq,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "lwd";
-  version = "0.4";
-
-  minimalOCamlVersion = "4.08";
+  version = "0.5";
 
   src = fetchurl {
-    url = "https://github.com/let-def/lwd/releases/download/v${version}/lwd-${version}.tbz";
-    hash = "sha256-nnFltlBWfPOerF4HuVNGzXcZxRSdsM+abeD5ZdQ+x8U=";
+    url = "https://github.com/let-def/lwd/releases/download/v${finalAttrs.version}/lwd-${finalAttrs.version}.tbz";
+    hash = "sha256-YAZjeLuhAxUCB3RrBul4u70g5TEqT2C7Z09YbYyPZOY=";
   };
 
   propagatedBuildInputs = [ seq ];
@@ -24,4 +22,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.alizter ];
     homepage = "https://github.com/let-def/lwd";
   };
-}
+})

pkgs/development/ocaml-modules/lwd/nottui-unix.nix

@@ -3,7 +3,6 @@
   buildDunePackage,
   lwd,
   nottui,
-  notty,
 }:
 
 buildDunePackage {
@@ -14,7 +13,6 @@ buildDunePackage {
   propagatedBuildInputs = [
     lwd
     nottui
-    notty
   ];
 
   meta = {

pkgs/development/ocaml-modules/lwd/nottui.nix

@@ -2,7 +2,7 @@
   lib,
   buildDunePackage,
   lwd,
-  notty,
+  notty-community,
 }:
 
 buildDunePackage {
@@ -12,7 +12,7 @@ buildDunePackage {
 
   propagatedBuildInputs = [
     lwd
-    notty
+    notty-community
   ];
 
   meta = {