ocamlPackages.lwd: 0.3 → 0.4

ocamlPackages.nottui-unix: init at 0.4

pkgs/by-name/do/docfd/nottui-unix.patch

@@ -0,0 +1,25 @@
+diff --git a/bin/dune b/bin/dune
+index e0ddc1f..a4e8523 100644
+--- a/bin/dune
++++ b/bin/dune
+@@ -47,6 +47,7 @@
+             notty
+             notty.unix
+             nottui
++            nottui-unix
+             lwd
+             oseq
+             eio
+diff --git a/bin/ui_base.ml b/bin/ui_base.ml
+index f56ee8d..8d8ed70 100644
+--- a/bin/ui_base.ml
++++ b/bin/ui_base.ml
+@@ -587,7 +587,7 @@ let ui_loop ~quit ~term root =
+       if term_width <> prev_term_width || term_height <> prev_term_height then (
+         Lwd.set Vars.term_width_height (term_width, term_height)
+       );
+-      Nottui.Ui_loop.step
++      Nottui_unix.step
+         ~process_event:true
+         ~timeout:0.05
+         ~renderer

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

@@ -25,6 +25,9 @@ ocamlPackages.buildDunePackage rec {
     hash = "sha256-uRC2QBn4gAfS9u85YaNH2Mm2C0reP8FnDHbyloY+OC8=";
   };
 
+  # Compatibility with nottui ≥ 0.4
+  patches = [ ./nottui-unix.patch ];
+
   nativeBuildInputs = [
     python3
     dune_3
@@ -40,6 +43,7 @@ ocamlPackages.buildDunePackage rec {
     eio_main
     lwd
     nottui
+    nottui-unix
     notty
     ocaml_sqlite3
     ocolor

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

@@ -7,14 +7,13 @@
 
 buildDunePackage rec {
   pname = "lwd";
-  version = "0.3";
+  version = "0.4";
 
   minimalOCamlVersion = "4.08";
-  duneVersion = "3";
 
   src = fetchurl {
     url = "https://github.com/let-def/lwd/releases/download/v${version}/lwd-${version}.tbz";
-    sha256 = "sha256-H/vyW2tn2OBuWwcmPs8NcINXgFe93MSxRd8dzeoXARI=";
+    hash = "sha256-nnFltlBWfPOerF4HuVNGzXcZxRSdsM+abeD5ZdQ+x8U=";
   };
 
   propagatedBuildInputs = [ seq ];

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

@@ -11,9 +11,6 @@ buildDunePackage {
 
   inherit (lwd) version src;
 
-  minimalOCamlVersion = "4.08";
-  duneVersion = "3";
-
   propagatedBuildInputs = [
     lwt
     nottui

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

@@ -10,9 +10,6 @@ buildDunePackage {
 
   inherit (lwd) version src;
 
-  minimalOCamlVersion = "4.08";
-  duneVersion = "3";
-
   propagatedBuildInputs = [ nottui ];
 
   meta = with lib; {

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

@@ -0,0 +1,26 @@
+{
+  lib,
+  buildDunePackage,
+  lwd,
+  nottui,
+  notty,
+}:
+
+buildDunePackage {
+  pname = "nottui-unix";
+
+  inherit (lwd) version src;
+
+  propagatedBuildInputs = [
+    lwd
+    nottui
+    notty
+  ];
+
+  meta = with lib; {
+    description = "UI toolkit for the UNIX terminal built on top of Notty and Lwd";
+    license = licenses.mit;
+    maintainers = [ maintainers.vbgl ];
+    homepage = "https://github.com/let-def/lwd";
+  };
+}

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

@@ -10,9 +10,6 @@ buildDunePackage {
 
   inherit (lwd) version src;
 
-  minimalOCamlVersion = "4.08";
-  duneVersion = "3";
-
   propagatedBuildInputs = [
     lwd
     notty

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

@@ -1,6 +1,5 @@
 {
   lib,
-  fetchpatch,
   buildDunePackage,
   js_of_ocaml,
   js_of_ocaml-ppx,
@@ -13,14 +12,6 @@ buildDunePackage {
 
   inherit (lwd) version src;
 
-  # Compatibility with latest Tyxml (4.6.x)
-  patches = fetchpatch {
-    url = "https://github.com/let-def/lwd/commit/7f3364ec593b5ccf0d0294b97bcd1e28e4164691.patch";
-    hash = "sha256-W1HjExZxDKRwsrB9ZTkvHTMKO0K5iZl+FrNqPs6BPGU=";
-  };
-
-  minimalOCamlVersion = "4.08";
-
   buildInputs = [ js_of_ocaml-ppx ];
   propagatedBuildInputs = [
     js_of_ocaml

pkgs/top-level/ocaml-packages.nix

@@ -1353,6 +1353,8 @@ let
 
         nottui-pretty = callPackage ../development/ocaml-modules/lwd/nottui-pretty.nix { };
 
+        nottui-unix = callPackage ../development/ocaml-modules/lwd/nottui-unix.nix { };
+
         notty = callPackage ../development/ocaml-modules/notty { };
 
         npy = callPackage ../development/ocaml-modules/npy {