Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benchmarks/dune
Original file line number Diff line number Diff line change
@@ -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))
25 changes: 2 additions & 23 deletions dune-project
Original file line number Diff line number Diff line change
@@ -1,26 +1,5 @@
(lang dune 3.0)
(name notty)
(name notty-community)

(formatting disabled)
(generate_opam_files true)

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the benefit of removing this?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is personal preference on account of this feature being devoid of value past the initial generation, duplicating all the informations over two files and making it harder to contribute changes to the opam file.


(source (github ocaml-community/notty))
(maintainers
"Ali Caglayan <alizter@gmail.com>"
"Antonin Décimo <antonin@tarides.com>"
"Romain Calascibetta <romain.calascibetta@gmail.com>")
(authors "David Kaloper <dk505@cam.ac.uk>")
(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)
6 changes: 3 additions & 3 deletions examples/dune
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
16 changes: 10 additions & 6 deletions notty.opam → notty-community.opam
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
# 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.

This is a branch from the original notty, maintained by the community.
"""
maintainer: [
"Ali Caglayan <alizter@gmail.com>"
"Antonin Décimo <antonin@tarides.com>"

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"Antonin Décimo <antonin@tarides.com>"
"Shon Feder <shon.feder@gmail.com>"

if i'm understanding correctly? @Alizter do you want to be removed too or are you fine maintaining it?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine with staying as a maintainer.

"Romain Calascibetta <romain.calascibetta@gmail.com>"
Comment on lines 11 to 13

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this needs to be updated? Or are these people still available to maintain this package?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For my part, I'm available 👍

]
authors: ["David Kaloper <dk505@cam.ac.uk>"]
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"}
Expand All @@ -37,4 +41,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"
4 changes: 2 additions & 2 deletions src-lwt/dune
Original file line number Diff line number Diff line change
@@ -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))
4 changes: 2 additions & 2 deletions src-unix/dune
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(library
(public_name notty.unix)
(public_name notty-community.unix)
(synopsis "Notty Unix IO")
(name notty_unix)
(wrapped false)
Expand All @@ -10,6 +10,6 @@
:standard
(-Wall -Wextra -O3)))
(optional)
(libraries notty unix))
(libraries notty-community unix))

(include_subdirs unqualified)
5 changes: 3 additions & 2 deletions src/dune
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
(include_subdirs unqualified)

(library
(public_name notty)
(name notty)
(public_name notty-community)
(synopsis "Declaring terminals")
(libraries uutf)
(wrapped false)
(modules notty notty_grapheme_cluster notty_uucp notty_uucp_data)
(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)
Expand Down
4 changes: 2 additions & 2 deletions src/notty.mli
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down Expand Up @@ -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]}

Expand Down