From: zimoun <zimon.toutoune@gmail.com>
To: 52039@debbugs.gnu.org
Cc: zimoun <zimon.toutoune@gmail.com>
Subject: [bug#52039] [PATCH v2 7/7] gnu: Add ocaml-utop.
Date: Mon, 22 Nov 2021 18:37:02 +0100 [thread overview]
Message-ID: <20211122173702.59732-7-zimon.toutoune@gmail.com> (raw)
In-Reply-To: <20211122173702.59732-1-zimon.toutoune@gmail.com>
* 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
next prev parent reply other threads:[~2021-11-22 17:38 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` zimoun [this message]
2021-11-24 1:14 ` bug#52039: [PATCH 0/7] Add utop Julien Lepiller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211122173702.59732-7-zimon.toutoune@gmail.com \
--to=zimon.toutoune@gmail.com \
--cc=52039@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).