all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / Atom feed
* [bug#52039] [PATCH 0/7] Add utop.
@ 2021-11-22 15:32 zimoun
  2021-11-22 15:35 ` [bug#52039] [PATCH 1/7] gnu: Add ocaml-trie zimoun
                   ` (2 more replies)
  0 siblings, 3 replies; 16+ messages in thread
From: zimoun @ 2021-11-22 15:32 UTC (permalink / raw)
  To: 52039; +Cc: zimoun, julien

Hi,

This series updates utop.  Instead of removing ocaml4.07- packages, the new
ones are added and ocaml4.07- inherit from them.  Note that 'git-fetch' is
preferred over url-fetch when it fetches from Github.  And source from
'ocaml-community' is also preferred over other repositories.


All the best,
simon


zimoun (7):
  gnu: Add ocaml-trie.
  gnu: Add ocaml-mew.
  gnu: Add ocaml-mew-vi.
  gnu: ocaml-charinfo-width: Fix source to get 'LICENSE' file.
  gnu: Add ocaml-zed.
  gnu: Add ocaml-lambda-term.
  gnu: Add ocaml-utop.

 gnu/packages/ocaml.scm | 252 +++++++++++++++++++++++++++++++++--------
 1 file changed, 204 insertions(+), 48 deletions(-)


base-commit: 9d370029c21487c54b7bda4aa53e49251107a71f
-- 
2.32.0





^ permalink raw reply	[flat|nested] 16+ messages in thread

* [bug#52039] [PATCH 1/7] gnu: Add ocaml-trie.
  2021-11-22 15:32 [bug#52039] [PATCH 0/7] Add utop zimoun
@ 2021-11-22 15:35 ` zimoun
  2021-11-22 15:35   ` [bug#52039] [PATCH 2/7] gnu: Add ocaml-mew zimoun
                     ` (5 more replies)
  2021-11-22 17:36 ` [bug#52039] [PATCH v2 1/7] gnu: Add ocaml-trie zimoun
  2021-11-24  1:14 ` bug#52039: [PATCH 0/7] Add utop Julien Lepiller
  2 siblings, 6 replies; 16+ messages in thread
From: zimoun @ 2021-11-22 15:35 UTC (permalink / raw)
  To: 52039; +Cc: zimoun

* gnu/packages/ocaml.scm (ocaml-trie): New variable.
---
 gnu/packages/ocaml.scm | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 123f05d568..5e195572ec 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -15,7 +15,7 @@
 ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
 ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
-;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2020, 2021 Simon Tournier <zimon.toutoune@gmail.com>
 ;;; Copyright © 2020 divoplade <d@divoplade.fr>
 ;;; Copyright © 2020, 2021 pukkamustard <pukkamustard@posteo.net>
 ;;; Copyright © 2021 aecepoglu <aecepoglu@fastmail.fm>
@@ -7434,6 +7434,29 @@ (define-public ocaml-bigstringaf
 these missing pieces.")
     (license license:bsd-3)))
 
+(define-public ocaml-trie
+  (package
+    (name "ocaml-trie")
+    (version "1.0.0")
+    (home-page "https://github.com/kandu/trie/")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url home-page)
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0s7p9swjqjsqddylmgid6cv263ggq7pmb734z4k84yfcrgb6kg4g"))))
+    (build-system dune-build-system)
+    (arguments
+     '(#:tests? #f))                    ;no tests
+    (synopsis "Strict impure trie tree")
+    (description
+     "This module implements strict impure trie tree data structure for
+OCaml.")
+    (license license:expat)))
+
 (define-public ocaml-syntax-shims
   (package
     (name "ocaml-syntax-shims")
-- 
2.32.0





^ permalink raw reply	[flat|nested] 16+ messages in thread

* [bug#52039] [PATCH 2/7] gnu: Add ocaml-mew.
  2021-11-22 15:35 ` [bug#52039] [PATCH 1/7] gnu: Add ocaml-trie zimoun
@ 2021-11-22 15:35   ` zimoun
  2021-11-22 15:35   ` [bug#52039] [PATCH 3/7] gnu: Add ocaml-mew-vi zimoun
                     ` (4 subsequent siblings)
  5 siblings, 0 replies; 16+ messages in thread
From: zimoun @ 2021-11-22 15:35 UTC (permalink / raw)
  To: 52039; +Cc: zimoun

* gnu/packages/ocaml.scm (ocaml-mew): New variable.
---
 gnu/packages/ocaml.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 5e195572ec..427ee2c682 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -7457,6 +7457,32 @@ (define-public ocaml-trie
 OCaml.")
     (license license:expat)))
 
+(define-public ocaml-mew
+  (package
+    (name "ocaml-mew")
+    (version "0.1.0")
+    (home-page "https://github.com/kandu/mew")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url home-page)
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0417xsghj92v3xa5q4dk4nzf2r4mylrx2fd18i7cg3nzja65nia2"))))
+    (build-system dune-build-system)
+    (propagated-inputs
+     `(("ocaml-result" ,ocaml-result)
+       ("ocaml-trie" ,ocaml-trie)))
+    (native-inputs
+     `(("ocaml-ppx-expect" ,ocaml-ppx-expect)))
+    (synopsis "General modal editing engine generator")
+    (description
+     "This package provides the core modules of Modal Editing Witch, a general
+modal editing engine generator.")
+    (license license:expat)))
+
 (define-public ocaml-syntax-shims
   (package
     (name "ocaml-syntax-shims")
-- 
2.32.0





^ permalink raw reply	[flat|nested] 16+ messages in thread

* [bug#52039] [PATCH 3/7] gnu: Add ocaml-mew-vi.
  2021-11-22 15:35 ` [bug#52039] [PATCH 1/7] gnu: Add ocaml-trie zimoun
  2021-11-22 15:35   ` [bug#52039] [PATCH 2/7] gnu: Add ocaml-mew zimoun
@ 2021-11-22 15:35   ` zimoun
  2021-11-22 15:35   ` [bug#52039] [PATCH 4/7] gnu: ocaml-charinfo-width: Fix source to get 'LICENSE' file zimoun
                     ` (3 subsequent siblings)
  5 siblings, 0 replies; 16+ messages in thread
From: zimoun @ 2021-11-22 15:35 UTC (permalink / raw)
  To: 52039; +Cc: zimoun

* gnu/packages/ocaml.scm (ocaml-mew-vi): New variable.
---
 gnu/packages/ocaml.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 427ee2c682..82670fec7f 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -7483,6 +7483,32 @@ (define-public ocaml-mew
 modal editing engine generator.")
     (license license:expat)))
 
+(define-public ocaml-mew-vi
+  (package
+    (name "ocaml-mew-vi")
+    (version "0.5.0")
+    (home-page "https://github.com/kandu/mew_vi")
+    (source
+      (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url home-page)
+             (commit version)))
+       (file-name (git-file-name name version))
+        (sha256
+          (base32 "0lihbf822k5zasl60w5mhwmdkljlq49c9saayrws7g4qc1j353r8"))))
+    (build-system dune-build-system)
+    (propagated-inputs
+      `(("ocaml-mew" ,ocaml-mew)
+        ("ocaml-react" ,ocaml-react)))
+    (native-inputs
+     `(("ocaml-ppx-expect" ,ocaml-ppx-expect)))
+    (properties `((upstream-name . "mew_vi")))
+    (synopsis "Modal editing VI-like editing engine generator")
+    (description "This module provides a vi-like modal editing engine
+generator.")
+    (license license:expat)))
+
 (define-public ocaml-syntax-shims
   (package
     (name "ocaml-syntax-shims")
-- 
2.32.0





^ permalink raw reply	[flat|nested] 16+ messages in thread

* [bug#52039] [PATCH 4/7] gnu: ocaml-charinfo-width: Fix source to get 'LICENSE' file.
  2021-11-22 15:35 ` [bug#52039] [PATCH 1/7] gnu: Add ocaml-trie zimoun
  2021-11-22 15:35   ` [bug#52039] [PATCH 2/7] gnu: Add ocaml-mew zimoun
  2021-11-22 15:35   ` [bug#52039] [PATCH 3/7] gnu: Add ocaml-mew-vi zimoun
@ 2021-11-22 15:35   ` zimoun
  2021-11-22 15:35   ` [bug#52039] [PATCH 5/7] gnu: Add ocaml-zed zimoun
                     ` (2 subsequent siblings)
  5 siblings, 0 replies; 16+ messages in thread
From: zimoun @ 2021-11-22 15:35 UTC (permalink / raw)
  To: 52039; +Cc: zimoun

* gnu/packages/ocaml.scm (ocaml-charinfo-width): Replace 'url-fetch' by
'git-fetch' and update to unreleased commit.
---
 gnu/packages/ocaml.scm | 49 ++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 82670fec7f..92ace48abb 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -3992,30 +3992,33 @@ (define-public ocaml-camomile
     (license license:lgpl2.0+)))
 
 (define-public ocaml-charinfo-width
-  (package
-    (name "ocaml-charinfo-width")
-    (version "1.1.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://bitbucket.org/zandoye/charinfo_width"
-                                  "/get/" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "00bv4p1yqs8y0z4z07wd9w9yyv669dikp9b04dcjbwpiy2wy0086"))))
-    (build-system dune-build-system)
-    (propagated-inputs
-     `(("ocaml-result" ,ocaml-result)
-       ("ocaml-camomile" ,ocaml-camomile)))
-    (native-inputs
-     `(("ocaml-ppx-expect" ,ocaml-ppx-expect)))
-    (properties
-     `((upstream-name . "charInfo_width")))
-    (home-page "https://bitbucket.org/zandoye/charinfo_width/")
-    (synopsis "Determine column width for a character")
-    (description "This module is implements purely in OCaml a character width
+  ;; Add LICENSE file and Dune tests
+  (let ((commit "20aaaa6dca8f1e0b1ace55b6f2a8ba5e5910b620"))
+    (package
+      (name "ocaml-charinfo-width")
+      (version (git-version "1.1.0" "1" commit))
+      (home-page "https://github.com/kandu/charinfo_width/")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url home-page)
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "04gil5hxm2jax9paw3i24d8zyzhyl5cphzfyryvy2lcrm3c485q0"))))
+      (build-system dune-build-system)
+      (propagated-inputs
+       `(("ocaml-result" ,ocaml-result)
+         ("ocaml-camomile" ,ocaml-camomile)))
+      (native-inputs
+       `(("ocaml-ppx-expect" ,ocaml-ppx-expect)))
+      (properties
+       `((upstream-name . "charInfo_width")))
+      (synopsis "Determine column width for a character")
+      (description "This module is implements purely in OCaml a character width
 function that follows the prototype of POSIX's wcwidth.")
-    (license license:expat)))
+      (license license:expat))))
 
 (define-public ocaml4.07-zed
   (package
-- 
2.32.0





^ permalink raw reply	[flat|nested] 16+ messages in thread

* [bug#52039] [PATCH 5/7] gnu: Add ocaml-zed.
  2021-11-22 15:35 ` [bug#52039] [PATCH 1/7] gnu: Add ocaml-trie zimoun
                     ` (2 preceding siblings ...)
  2021-11-22 15:35   ` [bug#52039] [PATCH 4/7] gnu: ocaml-charinfo-width: Fix source to get 'LICENSE' file zimoun
@ 2021-11-22 15:35   ` zimoun
  2021-11-22 15:35   ` [bug#52039] [PATCH 6/7] gnu: Add ocaml-lambda-term zimoun
  2021-11-22 15:35   ` [bug#52039] [PATCH 7/7] gnu: Add ocaml-utop zimoun
  5 siblings, 0 replies; 16+ messages in thread
From: zimoun @ 2021-11-22 15:35 UTC (permalink / raw)
  To: 52039; +Cc: zimoun

* gnu/packages/ocaml.scm (ocaml-zed): New variable.
(ocaml4.07-zed): Inherit and adjust 'source'.
---
 gnu/packages/ocaml.scm | 43 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 92ace48abb..032347a28e 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -4020,15 +4020,48 @@ (define-public ocaml-charinfo-width
 function that follows the prototype of POSIX's wcwidth.")
       (license license:expat))))
 
+(define-public ocaml-zed
+  (package
+    (name "ocaml-zed")
+    (version "3.1.0")
+    (home-page "https://github.com/ocaml-community/zed")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url home-page)
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p"))))
+    (build-system dune-build-system)
+    (arguments
+     `(#:test-target "."))
+    (propagated-inputs
+     `(("ocaml-charInfo-width" ,ocaml-charinfo-width)
+       ("ocaml-camomile" ,ocaml-camomile)
+       ("ocaml-react" ,ocaml-react)))
+    (synopsis "Abstract engine for text edition in OCaml")
+    (description
+     "This module provides an abstract engine for text edition.  It can be
+used to write text editors, edition widgets, readlines, and more.  The module
+Zed uses Camomile to fully support the Unicode specification, and implements
+an UTF-8 encoded string type with validation, and a rope datastructure to
+achieve efficient operations on large Unicode buffers.  Zed also features a
+regular expression search on ropes.  To support efficient text edition
+capabilities, Zed provides macro recording and cursor management facilities.")
+    (license license:bsd-3)))
+
 (define-public ocaml4.07-zed
   (package
+    (inherit ocaml-zed)
     (name "ocaml4.07-zed")
     (version "2.0.3")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/diml/zed")
+             (url "https://github.com/ocaml-community/zed")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -4042,13 +4075,7 @@ (define-public ocaml4.07-zed
     (propagated-inputs
      `(("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile))
        ("ocaml-charinfo-width" ,(package-with-ocaml4.07 ocaml-charinfo-width))
-       ("ocaml-react" ,(package-with-ocaml4.07 ocaml-react))))
-    (home-page "https://github.com/diml/zed")
-    (synopsis "Abstract engine for text editing in OCaml")
-    (description "Zed is an abstract engine for text edition.  It can be used
-to write text editors, edition widgets, readlines, etc.  You just have to
-connect an engine to your inputs and rendering functions to get an editor.")
-    (license license:bsd-3)))
+       ("ocaml-react" ,(package-with-ocaml4.07 ocaml-react))))))
 
 (define-public ocaml4.07-lambda-term
   (package
-- 
2.32.0





^ permalink raw reply	[flat|nested] 16+ messages in thread

* [bug#52039] [PATCH 6/7] gnu: Add ocaml-lambda-term.
  2021-11-22 15:35 ` [bug#52039] [PATCH 1/7] gnu: Add ocaml-trie zimoun
                     ` (3 preceding siblings ...)
  2021-11-22 15:35   ` [bug#52039] [PATCH 5/7] gnu: Add ocaml-zed zimoun
@ 2021-11-22 15:35   ` zimoun
  2021-11-22 15:35   ` [bug#52039] [PATCH 7/7] gnu: Add ocaml-utop zimoun
  5 siblings, 0 replies; 16+ messages in thread
From: zimoun @ 2021-11-22 15:35 UTC (permalink / raw)
  To: 52039; +Cc: zimoun

* gnu/packages/ocaml.scm (ocaml-lambda-term): New variable.
(omca4.07-lambda-term): Inherit and adjust source.
[arguments]: Set tests.
---
 gnu/packages/ocaml.scm | 51 +++++++++++++++++++++++++++++++-----------
 1 file changed, 38 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 032347a28e..f63a00f1d8 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -4077,22 +4077,56 @@ (define-public ocaml4.07-zed
        ("ocaml-charinfo-width" ,(package-with-ocaml4.07 ocaml-charinfo-width))
        ("ocaml-react" ,(package-with-ocaml4.07 ocaml-react))))))
 
+(define-public ocaml-lambda-term
+  (package
+    (name "ocaml-lambda-term")
+    (version "3.1.0")
+    (home-page "https://github.com/ocaml-community/lambda-term")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url home-page)
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg"))))
+    (build-system dune-build-system)
+    (arguments
+     `(#:test-target "."))
+    (propagated-inputs
+     `(("ocaml-lwt" ,ocaml-lwt)
+       ("ocaml-lwt-log" ,ocaml-lwt-log)
+       ("ocaml-react" ,ocaml-react)
+       ("ocaml-zed" ,ocaml-zed)
+       ("ocaml-camomile" ,ocaml-camomile)
+       ("ocaml-lwt-react" ,ocaml-lwt-react)
+       ("ocaml-mew-vi" ,ocaml-mew-vi)))
+    (synopsis "Terminal manipulation library for OCaml")
+    (description "Lambda-Term is a cross-platform library for manipulating the
+terminal.  It provides an abstraction for keys, mouse events, colors, as well as
+a set of widgets to write curses-like applications.  The main objective of
+Lambda-Term is to provide a higher level functional interface to terminal
+manipulation than, for example, ncurses, by providing a native OCaml interface
+instead of bindings to a C library.")
+    (license license:bsd-3)))
+
 (define-public ocaml4.07-lambda-term
   (package
+    (inherit ocaml-lambda-term)
     (name "ocaml4.07-lambda-term")
     (version "2.0.2")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/diml/lambda-term")
+             (url "https://github.com/ocaml-community/lambda-term")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
         (base32 "0zcjy6fvf0d3i2ssz96asl889n3r6bplyzk7xvb2s3dkxbgcisyy"))))
-    (build-system dune-build-system)
     (arguments
-     `(#:tests? #f
+     `(#:test-target "."
        #:ocaml ,ocaml-4.07
        #:findlib ,ocaml4.07-findlib
        #:dune ,ocaml4.07-dune))
@@ -4100,16 +4134,7 @@ (define-public ocaml4.07-lambda-term
      `(("ocaml-lwt" ,(package-with-ocaml4.07 ocaml-lwt))
        ("ocaml-lwt-log" ,(package-with-ocaml4.07 ocaml-lwt-log))
        ("ocaml-lwt-react" ,(package-with-ocaml4.07 ocaml-lwt-react))
-       ("ocaml-zed" ,ocaml4.07-zed)))
-    (home-page "https://github.com/diml/lambda-term")
-    (synopsis "Terminal manipulation library for OCaml")
-    (description "Lambda-Term is a cross-platform library for manipulating the
-terminal.  It provides an abstraction for keys, mouse events, colors, as well as
-a set of widgets to write curses-like applications.  The main objective of
-Lambda-Term is to provide a higher level functional interface to terminal
-manipulation than, for example, ncurses, by providing a native OCaml interface
-instead of bindings to a C library.")
-    (license license:bsd-3)))
+       ("ocaml-zed" ,ocaml4.07-zed)))))
 
 (define-public ocaml4.07-utop
   (package
-- 
2.32.0





^ permalink raw reply	[flat|nested] 16+ messages in thread

* [bug#52039] [PATCH 7/7] gnu: Add ocaml-utop.
  2021-11-22 15:35 ` [bug#52039] [PATCH 1/7] gnu: Add ocaml-trie zimoun
                     ` (4 preceding siblings ...)
  2021-11-22 15:35   ` [bug#52039] [PATCH 6/7] gnu: Add ocaml-lambda-term zimoun
@ 2021-11-22 15:35   ` zimoun
  5 siblings, 0 replies; 16+ messages in thread
From: zimoun @ 2021-11-22 15:35 UTC (permalink / raw)
  To: 52039; +Cc: zimoun

* gnu/packages/ocaml.scm (ocaml-utop): New variable.
(ocaml4.07-utop): Inherit and adjust.
---
 gnu/packages/ocaml.scm | 40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index f63a00f1d8..8d72641bfd 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -4136,8 +4136,40 @@ (define-public ocaml4.07-lambda-term
        ("ocaml-lwt-react" ,(package-with-ocaml4.07 ocaml-lwt-react))
        ("ocaml-zed" ,ocaml4.07-zed)))))
 
+(define-public ocaml-utop
+  (package
+    (name "ocaml-utop")
+    (version "2.8.0")
+    (home-page "https://github.com/ocaml-community/utop")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url home-page)
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1zf4hg33sblzh2f65vk0292jg4jlwa8702kfwpsg1kcg4w6nsfdp"))))
+    (build-system dune-build-system)
+    (arguments
+     '(#:test-target "."))
+    (propagated-inputs
+     `(("ocaml-lambda-term" ,ocaml-lambda-term)
+       ("ocaml-lwt" ,ocaml-lwt)
+       ("ocaml-lwt-react" ,ocaml-lwt-react)
+       ("ocaml-camomile" ,ocaml-camomile)
+       ("ocaml-react" ,ocaml-react)))
+    (native-inputs
+     `(("ocaml-cppo" ,ocaml-cppo)))
+    (synopsis "Improved interface to the OCaml toplevel")
+    (description "UTop is an improved toplevel for OCaml.  It can run in a
+terminal or in Emacs.  It supports line editing, history, real-time and context
+sensitive completion, colors, and more.")
+    (license license:bsd-3)))
+
 (define-public ocaml4.07-utop
   (package
+    (inherit ocaml-utop)
     (name "ocaml4.07-utop")
     (version "2.4.3")
     (source
@@ -4162,13 +4194,7 @@ (define-public ocaml4.07-utop
        ("lwt" ,(package-with-ocaml4.07 ocaml-lwt))
        ("react" ,(package-with-ocaml4.07 ocaml-react))
        ("camomile" ,(package-with-ocaml4.07 ocaml-camomile))
-       ("zed" ,ocaml4.07-zed)))
-    (home-page "https://github.com/ocaml-community/utop")
-    (synopsis "Improved interface to the OCaml toplevel")
-    (description "UTop is an improved toplevel for OCaml.  It can run in a
-terminal or in Emacs.  It supports line editing, history, real-time and context
-sensitive completion, colors, and more.")
-    (license license:bsd-3)))
+       ("zed" ,ocaml4.07-zed)))))
 
 (define-public ocaml-integers
   (package
-- 
2.32.0





^ permalink raw reply	[flat|nested] 16+ messages in thread

* [bug#52039] [PATCH v2 1/7] gnu: Add ocaml-trie.
  2021-11-22 15:32 [bug#52039] [PATCH 0/7] Add utop zimoun
  2021-11-22 15:35 ` [bug#52039] [PATCH 1/7] gnu: Add ocaml-trie zimoun
@ 2021-11-22 17:36 ` zimoun
  2021-11-22 17:36   ` [bug#52039] [PATCH v2 2/7] gnu: Add ocaml-mew zimoun
                     ` (5 more replies)
  2021-11-24  1:14 ` bug#52039: [PATCH 0/7] Add utop Julien Lepiller
  2 siblings, 6 replies; 16+ messages in thread
From: zimoun @ 2021-11-22 17:36 UTC (permalink / raw)
  To: 52039; +Cc: zimoun

* gnu/packages/ocaml.scm (ocaml-trie): New variable.
---
 gnu/packages/ocaml.scm | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 123f05d568..5e195572ec 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -15,7 +15,7 @@
 ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
 ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
-;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2020, 2021 Simon Tournier <zimon.toutoune@gmail.com>
 ;;; Copyright © 2020 divoplade <d@divoplade.fr>
 ;;; Copyright © 2020, 2021 pukkamustard <pukkamustard@posteo.net>
 ;;; Copyright © 2021 aecepoglu <aecepoglu@fastmail.fm>
@@ -7434,6 +7434,29 @@ (define-public ocaml-bigstringaf
 these missing pieces.")
     (license license:bsd-3)))
 
+(define-public ocaml-trie
+  (package
+    (name "ocaml-trie")
+    (version "1.0.0")
+    (home-page "https://github.com/kandu/trie/")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url home-page)
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0s7p9swjqjsqddylmgid6cv263ggq7pmb734z4k84yfcrgb6kg4g"))))
+    (build-system dune-build-system)
+    (arguments
+     '(#:tests? #f))                    ;no tests
+    (synopsis "Strict impure trie tree")
+    (description
+     "This module implements strict impure trie tree data structure for
+OCaml.")
+    (license license:expat)))
+
 (define-public ocaml-syntax-shims
   (package
     (name "ocaml-syntax-shims")

base-commit: 9d370029c21487c54b7bda4aa53e49251107a71f
-- 
2.32.0





^ permalink raw reply	[flat|nested] 16+ messages in thread

* [bug#52039] [PATCH v2 2/7] gnu: Add ocaml-mew.
  2021-11-22 17:36 ` [bug#52039] [PATCH v2 1/7] gnu: Add ocaml-trie zimoun
@ 2021-11-22 17:36   ` zimoun
  2021-11-22 17:36   ` [bug#52039] [PATCH v2 3/7] gnu: Add ocaml-mew-vi zimoun
                     ` (4 subsequent siblings)
  5 siblings, 0 replies; 16+ messages in thread
From: zimoun @ 2021-11-22 17:36 UTC (permalink / raw)
  To: 52039; +Cc: zimoun

* gnu/packages/ocaml.scm (ocaml-mew): New variable.
---
 gnu/packages/ocaml.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 5e195572ec..427ee2c682 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -7457,6 +7457,32 @@ (define-public ocaml-trie
 OCaml.")
     (license license:expat)))
 
+(define-public ocaml-mew
+  (package
+    (name "ocaml-mew")
+    (version "0.1.0")
+    (home-page "https://github.com/kandu/mew")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url home-page)
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0417xsghj92v3xa5q4dk4nzf2r4mylrx2fd18i7cg3nzja65nia2"))))
+    (build-system dune-build-system)
+    (propagated-inputs
+     `(("ocaml-result" ,ocaml-result)
+       ("ocaml-trie" ,ocaml-trie)))
+    (native-inputs
+     `(("ocaml-ppx-expect" ,ocaml-ppx-expect)))
+    (synopsis "General modal editing engine generator")
+    (description
+     "This package provides the core modules of Modal Editing Witch, a general
+modal editing engine generator.")
+    (license license:expat)))
+
 (define-public ocaml-syntax-shims
   (package
     (name "ocaml-syntax-shims")
-- 
2.32.0





^ permalink raw reply	[flat|nested] 16+ messages in thread

* [bug#52039] [PATCH v2 3/7] gnu: Add ocaml-mew-vi.
  2021-11-22 17:36 ` [bug#52039] [PATCH v2 1/7] gnu: Add ocaml-trie zimoun
  2021-11-22 17:36   ` [bug#52039] [PATCH v2 2/7] gnu: Add ocaml-mew zimoun
@ 2021-11-22 17:36   ` zimoun
  2021-11-22 17:36   ` [bug#52039] [PATCH v2 4/7] gnu: ocaml-charinfo-width: Fix source to get 'LICENSE' file zimoun
                     ` (3 subsequent siblings)
  5 siblings, 0 replies; 16+ messages in thread
From: zimoun @ 2021-11-22 17:36 UTC (permalink / raw)
  To: 52039; +Cc: zimoun

* gnu/packages/ocaml.scm (ocaml-mew-vi): New variable.
---
 gnu/packages/ocaml.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 427ee2c682..82670fec7f 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -7483,6 +7483,32 @@ (define-public ocaml-mew
 modal editing engine generator.")
     (license license:expat)))
 
+(define-public ocaml-mew-vi
+  (package
+    (name "ocaml-mew-vi")
+    (version "0.5.0")
+    (home-page "https://github.com/kandu/mew_vi")
+    (source
+      (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url home-page)
+             (commit version)))
+       (file-name (git-file-name name version))
+        (sha256
+          (base32 "0lihbf822k5zasl60w5mhwmdkljlq49c9saayrws7g4qc1j353r8"))))
+    (build-system dune-build-system)
+    (propagated-inputs
+      `(("ocaml-mew" ,ocaml-mew)
+        ("ocaml-react" ,ocaml-react)))
+    (native-inputs
+     `(("ocaml-ppx-expect" ,ocaml-ppx-expect)))
+    (properties `((upstream-name . "mew_vi")))
+    (synopsis "Modal editing VI-like editing engine generator")
+    (description "This module provides a vi-like modal editing engine
+generator.")
+    (license license:expat)))
+
 (define-public ocaml-syntax-shims
   (package
     (name "ocaml-syntax-shims")
-- 
2.32.0





^ permalink raw reply	[flat|nested] 16+ messages in thread

* [bug#52039] [PATCH v2 4/7] gnu: ocaml-charinfo-width: Fix source to get 'LICENSE' file.
  2021-11-22 17:36 ` [bug#52039] [PATCH v2 1/7] gnu: Add ocaml-trie zimoun
  2021-11-22 17:36   ` [bug#52039] [PATCH v2 2/7] gnu: Add ocaml-mew zimoun
  2021-11-22 17:36   ` [bug#52039] [PATCH v2 3/7] gnu: Add ocaml-mew-vi zimoun
@ 2021-11-22 17:36   ` zimoun
  2021-11-22 17:37   ` [bug#52039] [PATCH v2 5/7] gnu: Add ocaml-zed zimoun
                     ` (2 subsequent siblings)
  5 siblings, 0 replies; 16+ messages in thread
From: zimoun @ 2021-11-22 17:36 UTC (permalink / raw)
  To: 52039; +Cc: zimoun

* gnu/packages/ocaml.scm (ocaml-charinfo-width): Replace 'url-fetch' by
'git-fetch' and update to unreleased commit.
---
 gnu/packages/ocaml.scm | 49 ++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 82670fec7f..92ace48abb 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -3992,30 +3992,33 @@ (define-public ocaml-camomile
     (license license:lgpl2.0+)))
 
 (define-public ocaml-charinfo-width
-  (package
-    (name "ocaml-charinfo-width")
-    (version "1.1.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://bitbucket.org/zandoye/charinfo_width"
-                                  "/get/" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "00bv4p1yqs8y0z4z07wd9w9yyv669dikp9b04dcjbwpiy2wy0086"))))
-    (build-system dune-build-system)
-    (propagated-inputs
-     `(("ocaml-result" ,ocaml-result)
-       ("ocaml-camomile" ,ocaml-camomile)))
-    (native-inputs
-     `(("ocaml-ppx-expect" ,ocaml-ppx-expect)))
-    (properties
-     `((upstream-name . "charInfo_width")))
-    (home-page "https://bitbucket.org/zandoye/charinfo_width/")
-    (synopsis "Determine column width for a character")
-    (description "This module is implements purely in OCaml a character width
+  ;; Add LICENSE file and Dune tests
+  (let ((commit "20aaaa6dca8f1e0b1ace55b6f2a8ba5e5910b620"))
+    (package
+      (name "ocaml-charinfo-width")
+      (version (git-version "1.1.0" "1" commit))
+      (home-page "https://github.com/kandu/charinfo_width/")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url home-page)
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "04gil5hxm2jax9paw3i24d8zyzhyl5cphzfyryvy2lcrm3c485q0"))))
+      (build-system dune-build-system)
+      (propagated-inputs
+       `(("ocaml-result" ,ocaml-result)
+         ("ocaml-camomile" ,ocaml-camomile)))
+      (native-inputs
+       `(("ocaml-ppx-expect" ,ocaml-ppx-expect)))
+      (properties
+       `((upstream-name . "charInfo_width")))
+      (synopsis "Determine column width for a character")
+      (description "This module is implements purely in OCaml a character width
 function that follows the prototype of POSIX's wcwidth.")
-    (license license:expat)))
+      (license license:expat))))
 
 (define-public ocaml4.07-zed
   (package
-- 
2.32.0





^ permalink raw reply	[flat|nested] 16+ messages in thread

* [bug#52039] [PATCH v2 5/7] gnu: Add ocaml-zed.
  2021-11-22 17:36 ` [bug#52039] [PATCH v2 1/7] gnu: Add ocaml-trie zimoun
                     ` (2 preceding siblings ...)
  2021-11-22 17:36   ` [bug#52039] [PATCH v2 4/7] gnu: ocaml-charinfo-width: Fix source to get 'LICENSE' file zimoun
@ 2021-11-22 17:37   ` zimoun
  2021-11-22 17:37   ` [bug#52039] [PATCH v2 6/7] gnu: Add ocaml-lambda-term zimoun
  2021-11-22 17:37   ` [bug#52039] [PATCH v2 7/7] gnu: Add ocaml-utop zimoun
  5 siblings, 0 replies; 16+ messages in thread
From: zimoun @ 2021-11-22 17:37 UTC (permalink / raw)
  To: 52039; +Cc: zimoun

* gnu/packages/ocaml.scm (ocaml-zed): New variable.
(ocaml4.07-zed): Inherit and adjust source.
---
 gnu/packages/ocaml.scm | 53 ++++++++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 92ace48abb..9ee443f3af 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -4020,36 +4020,55 @@ (define-public ocaml-charinfo-width
 function that follows the prototype of POSIX's wcwidth.")
       (license license:expat))))
 
-(define-public ocaml4.07-zed
+(define-public ocaml-zed
   (package
-    (name "ocaml4.07-zed")
-    (version "2.0.3")
+    (name "ocaml-zed")
+    (version "3.1.0")
+    (home-page "https://github.com/ocaml-community/zed")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/diml/zed")
+             (url home-page)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0pa9awinqr0plp4b2az78dwpvh01pwaljnn5ydg8mc6hi7rmir55"))))
+        (base32 "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p"))))
     (build-system dune-build-system)
     (arguments
-     `(#:test-target "."
-       #:ocaml ,ocaml-4.07
-       #:findlib ,ocaml4.07-findlib
-       #:dune ,ocaml4.07-dune))
+     `(#:test-target "."))
     (propagated-inputs
-     `(("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile))
-       ("ocaml-charinfo-width" ,(package-with-ocaml4.07 ocaml-charinfo-width))
-       ("ocaml-react" ,(package-with-ocaml4.07 ocaml-react))))
-    (home-page "https://github.com/diml/zed")
-    (synopsis "Abstract engine for text editing in OCaml")
-    (description "Zed is an abstract engine for text edition.  It can be used
-to write text editors, edition widgets, readlines, etc.  You just have to
-connect an engine to your inputs and rendering functions to get an editor.")
+     `(("ocaml-charInfo-width" ,ocaml-charinfo-width)
+       ("ocaml-camomile" ,ocaml-camomile)
+       ("ocaml-react" ,ocaml-react)))
+    (properties `((ocaml4.07-variant . ,(delay ocaml4.07-zed))))
+    (synopsis "Abstract engine for text edition in OCaml")
+    (description
+     "This module provides an abstract engine for text edition.  It can be
+used to write text editors, edition widgets, readlines, and more.  The module
+Zed uses Camomile to fully support the Unicode specification, and implements
+an UTF-8 encoded string type with validation, and a rope datastructure to
+achieve efficient operations on large Unicode buffers.  Zed also features a
+regular expression search on ropes.  To support efficient text edition
+capabilities, Zed provides macro recording and cursor management facilities.")
     (license license:bsd-3)))
 
+(define-public ocaml4.07-zed
+  (package-with-ocaml4.07
+   (package
+     (inherit ocaml-zed)
+     (version "2.0.3")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/ocaml-community/zed")
+                     (commit version)))
+               (file-name (git-file-name "ocaml4.07-zed" version))
+               (sha256
+                (base32
+                 "0pa9awinqr0plp4b2az78dwpvh01pwaljnn5ydg8mc6hi7rmir55"))))
+     (properties '()))))
+
 (define-public ocaml4.07-lambda-term
   (package
     (name "ocaml4.07-lambda-term")
-- 
2.32.0





^ permalink raw reply	[flat|nested] 16+ messages in thread

* [bug#52039] [PATCH v2 6/7] gnu: Add ocaml-lambda-term.
  2021-11-22 17:36 ` [bug#52039] [PATCH v2 1/7] gnu: Add ocaml-trie zimoun
                     ` (3 preceding siblings ...)
  2021-11-22 17:37   ` [bug#52039] [PATCH v2 5/7] gnu: Add ocaml-zed zimoun
@ 2021-11-22 17:37   ` zimoun
  2021-11-22 17:37   ` [bug#52039] [PATCH v2 7/7] gnu: Add ocaml-utop zimoun
  5 siblings, 0 replies; 16+ messages in thread
From: zimoun @ 2021-11-22 17:37 UTC (permalink / raw)
  To: 52039; +Cc: zimoun

* gnu/packages/ocaml.scm (ocaml-lambda-term): New variable.
(omca4.07-lambda-term): Inherit and adjust.
---
 gnu/packages/ocaml.scm | 64 ++++++++++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 9ee443f3af..844d018ded 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -4069,31 +4069,32 @@ (define-public ocaml4.07-zed
                  "0pa9awinqr0plp4b2az78dwpvh01pwaljnn5ydg8mc6hi7rmir55"))))
      (properties '()))))
 
-(define-public ocaml4.07-lambda-term
+(define-public ocaml-lambda-term
   (package
-    (name "ocaml4.07-lambda-term")
-    (version "2.0.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/diml/lambda-term")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0zcjy6fvf0d3i2ssz96asl889n3r6bplyzk7xvb2s3dkxbgcisyy"))))
+    (name "ocaml-lambda-term")
+    (version "3.1.0")
+    (home-page "https://github.com/ocaml-community/lambda-term")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url home-page)
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg"))))
     (build-system dune-build-system)
     (arguments
-     `(#:tests? #f
-       #:ocaml ,ocaml-4.07
-       #:findlib ,ocaml4.07-findlib
-       #:dune ,ocaml4.07-dune))
+     `(#:test-target "."))
     (propagated-inputs
-     `(("ocaml-lwt" ,(package-with-ocaml4.07 ocaml-lwt))
-       ("ocaml-lwt-log" ,(package-with-ocaml4.07 ocaml-lwt-log))
-       ("ocaml-lwt-react" ,(package-with-ocaml4.07 ocaml-lwt-react))
-       ("ocaml-zed" ,ocaml4.07-zed)))
-    (home-page "https://github.com/diml/lambda-term")
+     `(("ocaml-lwt" ,ocaml-lwt)
+       ("ocaml-lwt-log" ,ocaml-lwt-log)
+       ("ocaml-react" ,ocaml-react)
+       ("ocaml-zed" ,ocaml-zed)
+       ("ocaml-camomile" ,ocaml-camomile)
+       ("ocaml-lwt-react" ,ocaml-lwt-react)
+       ("ocaml-mew-vi" ,ocaml-mew-vi)))
+    (properties `((ocaml4.07-variant . ,(delay ocaml4.07-lambda-term))))
     (synopsis "Terminal manipulation library for OCaml")
     (description "Lambda-Term is a cross-platform library for manipulating the
 terminal.  It provides an abstraction for keys, mouse events, colors, as well as
@@ -4103,6 +4104,27 @@ (define-public ocaml4.07-lambda-term
 instead of bindings to a C library.")
     (license license:bsd-3)))
 
+(define-public ocaml4.07-lambda-term
+  (package-with-ocaml4.07
+   (package
+     (inherit ocaml-lambda-term)
+     (version "2.0.2")
+     (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+              (url "https://github.com/ocaml-community/lambda-term")
+              (commit version)))
+        (file-name (git-file-name "ocaml4.07-lambda-term" version))
+        (sha256
+         (base32 "0zcjy6fvf0d3i2ssz96asl889n3r6bplyzk7xvb2s3dkxbgcisyy"))))
+     (propagated-inputs
+      `(("ocaml-lwt" ,(package-with-ocaml4.07 ocaml-lwt))
+        ("ocaml-lwt-log" ,(package-with-ocaml4.07 ocaml-lwt-log))
+        ("ocaml-lwt-react" ,(package-with-ocaml4.07 ocaml-lwt-react))
+        ("ocaml-zed" ,ocaml4.07-zed)))
+     (properties '()))))
+
 (define-public ocaml4.07-utop
   (package
     (name "ocaml4.07-utop")
-- 
2.32.0





^ permalink raw reply	[flat|nested] 16+ messages in thread

* [bug#52039] [PATCH v2 7/7] gnu: Add ocaml-utop.
  2021-11-22 17:36 ` [bug#52039] [PATCH v2 1/7] gnu: Add ocaml-trie zimoun
                     ` (4 preceding siblings ...)
  2021-11-22 17:37   ` [bug#52039] [PATCH v2 6/7] gnu: Add ocaml-lambda-term zimoun
@ 2021-11-22 17:37   ` zimoun
  5 siblings, 0 replies; 16+ messages in thread
From: zimoun @ 2021-11-22 17:37 UTC (permalink / raw)
  To: 52039; +Cc: zimoun

* gnu/packages/ocaml.scm (ocaml-utop): New variable.
(ocaml4.07-utop): Inherit and adjust.
---
 gnu/packages/ocaml.scm | 52 +++++++++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 844d018ded..0551aec589 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -4125,40 +4125,60 @@ (define-public ocaml4.07-lambda-term
         ("ocaml-zed" ,ocaml4.07-zed)))
      (properties '()))))
 
-(define-public ocaml4.07-utop
+(define-public ocaml-utop
   (package
-    (name "ocaml4.07-utop")
-    (version "2.4.3")
+    (name "ocaml-utop")
+    (version "2.8.0")
+    (home-page "https://github.com/ocaml-community/utop")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ocaml-community/utop")
+             (url home-page)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1bl4943qpi3qy152dbdm5glhx19zsiylmn4rcxi8l66g58hikyjp"))))
+        (base32 "1zf4hg33sblzh2f65vk0292jg4jlwa8702kfwpsg1kcg4w6nsfdp"))))
     (build-system dune-build-system)
     (arguments
-     `(#:test-target "."
-       #:ocaml ,ocaml-4.07
-       #:findlib ,ocaml4.07-findlib
-       #:dune ,ocaml4.07-dune))
+     '(#:test-target "."))
     (native-inputs
-     `(("cppo" ,(package-with-ocaml4.07 ocaml-cppo))))
+     `(("ocaml-cppo" ,ocaml-cppo)))
     (propagated-inputs
-     `(("lambda-term" ,ocaml4.07-lambda-term)
-       ("lwt" ,(package-with-ocaml4.07 ocaml-lwt))
-       ("react" ,(package-with-ocaml4.07 ocaml-react))
-       ("camomile" ,(package-with-ocaml4.07 ocaml-camomile))
-       ("zed" ,ocaml4.07-zed)))
-    (home-page "https://github.com/ocaml-community/utop")
+     `(("ocaml-lambda-term" ,ocaml-lambda-term)
+       ("ocaml-lwt" ,ocaml-lwt)
+       ("ocaml-lwt-react" ,ocaml-lwt-react)
+       ("ocaml-camomile" ,ocaml-camomile)
+       ("ocaml-react" ,ocaml-react)))
+    (properties `((ocaml4.07-variant . ,(delay ocaml4.07-utop))))
     (synopsis "Improved interface to the OCaml toplevel")
     (description "UTop is an improved toplevel for OCaml.  It can run in a
 terminal or in Emacs.  It supports line editing, history, real-time and context
 sensitive completion, colors, and more.")
     (license license:bsd-3)))
 
+(define-public ocaml4.07-utop
+  (package-with-ocaml4.07
+   (package
+     (inherit ocaml-utop)
+     (version "2.4.3")
+     (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+              (url "https://github.com/ocaml-community/utop")
+              (commit version)))
+        (file-name (git-file-name "ocaml4.07-utop" version))
+        (sha256
+         (base32 "1bl4943qpi3qy152dbdm5glhx19zsiylmn4rcxi8l66g58hikyjp"))))
+     (propagated-inputs
+      `(("lambda-term" ,ocaml4.07-lambda-term)
+        ("lwt" ,(package-with-ocaml4.07 ocaml-lwt))
+        ("react" ,(package-with-ocaml4.07 ocaml-react))
+        ("camomile" ,(package-with-ocaml4.07 ocaml-camomile))
+        ("zed" ,ocaml4.07-zed)))
+     (properties '()))))
+
 (define-public ocaml-integers
   (package
     (name "ocaml-integers")
-- 
2.32.0





^ permalink raw reply	[flat|nested] 16+ messages in thread

* bug#52039: [PATCH 0/7] Add utop.
  2021-11-22 15:32 [bug#52039] [PATCH 0/7] Add utop zimoun
  2021-11-22 15:35 ` [bug#52039] [PATCH 1/7] gnu: Add ocaml-trie zimoun
  2021-11-22 17:36 ` [bug#52039] [PATCH v2 1/7] gnu: Add ocaml-trie zimoun
@ 2021-11-24  1:14 ` Julien Lepiller
  2 siblings, 0 replies; 16+ messages in thread
From: Julien Lepiller @ 2021-11-24  1:14 UTC (permalink / raw)
  To: zimoun; +Cc: 52039-done

Pushed to master with small changes as
b2a725c6792bfc278ee200f461a1765c28bd444b to
8365b4a0a3ff110069840191df80a6cb9795f727. Thanks!




^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2021-11-24  1:15 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-22 15:32 [bug#52039] [PATCH 0/7] Add utop zimoun
2021-11-22 15:35 ` [bug#52039] [PATCH 1/7] gnu: Add ocaml-trie zimoun
2021-11-22 15:35   ` [bug#52039] [PATCH 2/7] gnu: Add ocaml-mew zimoun
2021-11-22 15:35   ` [bug#52039] [PATCH 3/7] gnu: Add ocaml-mew-vi zimoun
2021-11-22 15:35   ` [bug#52039] [PATCH 4/7] gnu: ocaml-charinfo-width: Fix source to get 'LICENSE' file zimoun
2021-11-22 15:35   ` [bug#52039] [PATCH 5/7] gnu: Add ocaml-zed zimoun
2021-11-22 15:35   ` [bug#52039] [PATCH 6/7] gnu: Add ocaml-lambda-term zimoun
2021-11-22 15:35   ` [bug#52039] [PATCH 7/7] gnu: Add ocaml-utop zimoun
2021-11-22 17:36 ` [bug#52039] [PATCH v2 1/7] gnu: Add ocaml-trie zimoun
2021-11-22 17:36   ` [bug#52039] [PATCH v2 2/7] gnu: Add ocaml-mew zimoun
2021-11-22 17:36   ` [bug#52039] [PATCH v2 3/7] gnu: Add ocaml-mew-vi zimoun
2021-11-22 17:36   ` [bug#52039] [PATCH v2 4/7] gnu: ocaml-charinfo-width: Fix source to get 'LICENSE' file zimoun
2021-11-22 17:37   ` [bug#52039] [PATCH v2 5/7] gnu: Add ocaml-zed zimoun
2021-11-22 17:37   ` [bug#52039] [PATCH v2 6/7] gnu: Add ocaml-lambda-term zimoun
2021-11-22 17:37   ` [bug#52039] [PATCH v2 7/7] gnu: Add ocaml-utop zimoun
2021-11-24  1:14 ` bug#52039: [PATCH 0/7] Add utop Julien Lepiller

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.