From 134d58ebe29853361dece6b41814e313a45819c0 Mon Sep 17 00:00:00 2001 From: Kate Date: Mon, 6 Oct 2025 16:54:58 +0100 Subject: [PATCH 1/2] Rename the library from notty to notty-community --- benchmarks/dune | 2 +- dune-project | 25 ++----------------------- examples/dune | 6 +++--- notty.opam => notty-community.opam | 14 ++++++++------ src-lwt/dune | 4 ++-- src-unix/dune | 4 ++-- src/dune | 5 +++-- src/notty.mli | 4 ++-- 8 files changed, 23 insertions(+), 41 deletions(-) rename notty.opam => notty-community.opam (56%) diff --git a/benchmarks/dune b/benchmarks/dune index 75e3dfb..ec0f9dc 100644 --- a/benchmarks/dune +++ b/benchmarks/dune @@ -1,3 +1,3 @@ (executable (name speed) - (libraries notty notty.unix common unmark unmark.cli)) + (libraries notty-community notty-community.unix common unmark unmark.cli)) diff --git a/dune-project b/dune-project index 54c97ef..969a062 100644 --- a/dune-project +++ b/dune-project @@ -1,26 +1,5 @@ (lang dune 3.0) -(name notty) +(name notty-community) (formatting disabled) -(generate_opam_files true) - -(source (github ocaml-community/notty)) -(maintainers - "Ali Caglayan " - "Antonin Décimo " - "Romain Calascibetta ") -(authors "David Kaloper ") -(license "ISC") - -(package - (name notty) - (synopsis "Declaring terminals") - (description "Notty is a declarative terminal library for OCaml structured around a notion of composable images. It tries to abstract away the basic terminal programming model, providing something simpler and more expressive.") - (depends - (ocaml (>= 4.08.0)) - (cppo (and :build (>= 1.1.0))) - (uutf (>= 1.0.0))) - (depopts - lwt) - (conflicts - (lwt (< 2.6.0)))) +(generate_opam_files false) diff --git a/examples/dune b/examples/dune index 82206fc..e9c068e 100644 --- a/examples/dune +++ b/examples/dune @@ -1,12 +1,12 @@ (library (name common) (modules common) - (libraries notty notty.unix)) + (libraries notty-community notty-community.unix)) (library (name common_lwt) (modules common_lwt) - (libraries common notty.lwt)) + (libraries common notty-community.lwt)) (executables (names testpatterns colors almondbread crops cursor cuts emoji inline keys @@ -20,7 +20,7 @@ (alias (name ex) - (package notty) + (package notty-community) (deps testpatterns.exe colors.exe almondbread.exe crops.exe cursor.exe cuts.exe emoji.exe inline.exe keys.exe letters.exe mouse.exe thisbig.exe runes.exe sierpinski.exe rain.exe sierpinski_lwt.exe diff --git a/notty.opam b/notty-community.opam similarity index 56% rename from notty.opam rename to notty-community.opam index 4aef5a5..14bf126 100644 --- a/notty.opam +++ b/notty-community.opam @@ -1,8 +1,10 @@ -# This file is generated by dune, edit dune-project instead opam-version: "2.0" synopsis: "Declaring terminals" -description: - "Notty is a declarative terminal library for OCaml structured around a notion of composable images. It tries to abstract away the basic terminal programming model, providing something simpler and more expressive." +description: """ +Notty is a declarative terminal library for OCaml structured around a notion +of composable images. It tries to abstract away the basic terminal +programming model, providing something simpler and more expressive. +""" maintainer: [ "Ali Caglayan " "Antonin Décimo " @@ -10,8 +12,8 @@ maintainer: [ ] authors: ["David Kaloper "] license: "ISC" -homepage: "https://github.com/ocaml-community/notty" -bug-reports: "https://github.com/ocaml-community/notty/issues" +homepage: "https://github.com/ocaml-community/notty-community" +bug-reports: "https://github.com/ocaml-community/notty-community/issues" depends: [ "dune" {>= "3.0"} "ocaml" {>= "4.08.0"} @@ -37,4 +39,4 @@ build: [ "@doc" {with-doc} ] ] -dev-repo: "git+https://github.com/ocaml-community/notty.git" +dev-repo: "git+https://github.com/ocaml-community/notty-community.git" diff --git a/src-lwt/dune b/src-lwt/dune index e3c150d..5cb19bf 100644 --- a/src-lwt/dune +++ b/src-lwt/dune @@ -1,7 +1,7 @@ (library - (public_name notty.lwt) + (public_name notty-community.lwt) (synopsis "Notty Lwt+Unix IO") (name notty_lwt) (wrapped false) (optional) - (libraries notty notty.unix lwt lwt.unix)) + (libraries notty-community notty-community.unix lwt lwt.unix)) diff --git a/src-unix/dune b/src-unix/dune index 35ddb58..8bde109 100644 --- a/src-unix/dune +++ b/src-unix/dune @@ -1,5 +1,5 @@ (library - (public_name notty.unix) + (public_name notty-community.unix) (synopsis "Notty Unix IO") (name notty_unix) (wrapped false) @@ -10,6 +10,6 @@ :standard (-Wall -Wextra -O3))) (optional) - (libraries notty unix)) + (libraries notty-community unix)) (include_subdirs unqualified) diff --git a/src/dune b/src/dune index 7e85f2d..6b94899 100644 --- a/src/dune +++ b/src/dune @@ -1,7 +1,8 @@ (include_subdirs unqualified) (library - (public_name notty) + (name notty) + (public_name notty-community) (synopsis "Declaring terminals") (libraries uutf) (wrapped false) @@ -9,7 +10,7 @@ (private_modules notty_grapheme_cluster notty_uucp notty_uucp_data)) (library - (public_name notty.top) + (public_name notty-community.top) (synopsis "Notty toplevel support") (name notty_top) (wrapped false) diff --git a/src/notty.mli b/src/notty.mli index b2b3455..79a8c07 100644 --- a/src/notty.mli +++ b/src/notty.mli @@ -728,7 +728,7 @@ I.(wow <-> (void 2 0 <|> wow)) |> Notty_unix.output_image {1:examples Examples} - We assume a toplevel with [Notty] support ([#require "notty.top"]). + We assume a toplevel with [Notty] support ([#require "notty-community.top"]). {2 Hello} @@ -817,7 +817,7 @@ colors |> List.mapi I.(fun i c -> rad i c |> pad ~t:i ~l:(2 * i)) expressions, displayed by the pretty-printer that is installed by the toplevel support. Self-contained programs need a separate IO module: - {[#require "notty.unix"]} + {[#require "notty-community.unix"]} {[sierp 8 |> Notty_unix.output_image]} From 8c05ba174ea5a31ad438fe7595a9d78e81984696 Mon Sep 17 00:00:00 2001 From: Kate Date: Tue, 7 Oct 2025 13:27:45 +0100 Subject: [PATCH 2/2] Update notty-community.opam Co-authored-by: Shon Feder --- notty-community.opam | 2 ++ 1 file changed, 2 insertions(+) diff --git a/notty-community.opam b/notty-community.opam index 14bf126..c4aa524 100644 --- a/notty-community.opam +++ b/notty-community.opam @@ -4,6 +4,8 @@ description: """ Notty is a declarative terminal library for OCaml structured around a notion of composable images. It tries to abstract away the basic terminal programming model, providing something simpler and more expressive. + +This is a branch from the original notty, maintained by the community. """ maintainer: [ "Ali Caglayan "