diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 35099f2bf1fe..6cff3de031f0 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -19,6 +19,10 @@ buildDunePackage { hash = "sha256-6QZZ77C1G3x/GOJsUEQMrCatVsyyxNjq36ez/TgeHSY="; }; + postPatch = '' + substituteInPlace cli/dune --replace-warn 'notty notty.lwt' 'notty-community.lwt' + ''; + nativeBuildInputs = [ ppx_sexp_conv ppx_deriving @@ -35,7 +39,7 @@ buildDunePackage { otr astring ptime - notty + notty-community sexplib hex uchar diff --git a/pkgs/by-name/do/docfd/nottui-unix.patch b/pkgs/by-name/do/docfd/nottui-unix.patch index 03a61576d00d..738c7871dafc 100644 --- a/pkgs/by-name/do/docfd/nottui-unix.patch +++ b/pkgs/by-name/do/docfd/nottui-unix.patch @@ -1,20 +1,8 @@ -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 +diff --git a/bin/UI_base.ml b/bin/UI_base.ml +index efb1d14..ce6a2a4 100644 --- a/bin/UI_base.ml +++ b/bin/UI_base.ml -@@ -587,7 +587,7 @@ let ui_loop ~quit ~term root = +@@ -787,7 +787,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) ); @@ -23,3 +11,20 @@ index f56ee8d..8d8ed70 100644 ~process_event:true ~timeout:0.05 ~renderer +diff --git a/bin/dune b/bin/dune +index c4905a4..7c7b55d 100644 +--- a/bin/dune ++++ b/bin/dune +@@ -44,9 +44,10 @@ + containers.unix + cmdliner + fmt +- notty +- notty.unix ++ notty-community ++ notty-community.unix + nottui ++ nottui-unix + lwd + oseq + eio diff --git a/pkgs/by-name/do/docfd/package.nix b/pkgs/by-name/do/docfd/package.nix index 6e4d4663bb5e..d039b22058e7 100644 --- a/pkgs/by-name/do/docfd/package.nix +++ b/pkgs/by-name/do/docfd/package.nix @@ -53,7 +53,7 @@ ocamlPackages.buildDunePackage rec { lwd nottui nottui-unix - notty + notty-community ocaml_sqlite3 ocolor oseq diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 343f0b74899b..0b7da03ab0a3 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1442,8 +1442,6 @@ let nottui-unix = callPackage ../development/ocaml-modules/lwd/nottui-unix.nix { }; - notty = callPackage ../development/ocaml-modules/notty { }; - notty-community = callPackage ../development/ocaml-modules/notty-community { }; npy = callPackage ../development/ocaml-modules/npy { @@ -2363,6 +2361,7 @@ let dune_2 = pkgs.dune_2; # Added 2025-12-08 dune_3 = pkgs.dune_3; # Added 2025-12-08 gd4o = throw "ocamlPackages.gd4o is not maintained, use ocamlPackages.gd instead"; + notty = throw "2026-05-05: notty is no longer maintained, use notty-community instead"; ocaml-freestanding = throw "ocamlPackages.ocaml-freestanding has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05 ocaml-vdom = throw "2023-10-09: ocamlPackages.ocaml-vdom was renamed to ocamlPackages.vdom"; ocaml_lwt = throw "ocamlPackages.ocaml_lwt has been renamed to ocamlPackages.lwt"; # Added 2025-12-05