From: Julien Lepiller <julien@lepiller.eu>
To: 35280@debbugs.gnu.org
Subject: [bug#35280] [PATCH 3/5] gnu: Remove ocaml-jbuilder.
Date: Sun, 14 Apr 2019 22:32:03 +0200 [thread overview]
Message-ID: <20190414203205.8104-3-julien@lepiller.eu> (raw)
In-Reply-To: <20190414203205.8104-1-julien@lepiller.eu>
Jbuilder is deprecated and replaced by dune.
* gnu/packages/ocaml.scm (ocaml-jbuilder): Remove variable.
(ocaml-zed, ocaml-utop): Use dune-build-system.
---
gnu/packages/ocaml.scm | 75 +++++-------------------------------------
1 file changed, 8 insertions(+), 67 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 18c2531658..252d9b8496 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -4326,42 +4326,6 @@ library is currently designed for Unicode Standard 3.2.")
(define-public ocaml4.02-camomile
(package-with-ocaml4.02 ocaml-camomile))
-(define-public ocaml-jbuilder
- (package
- (name "ocaml-jbuilder")
- (version "1.0+beta16")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/janestreet/jbuilder.git")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1y3fgf570w3vrnhianrg26jy5j749zczq3f78s2dy5ylbp1hrx71"))))
- (build-system ocaml-build-system)
- (arguments
- `(#:ocaml ,ocaml-4.02
- #:findlib ,ocaml4.02-findlib
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (setenv "PREFIX" out))
- #t)))))
- (native-inputs
- `(("menhir" ,ocaml4.02-menhir)))
- (propagated-inputs
- `(("opam" ,opam)))
- (home-page "https://github.com/janestreet/jbuilder")
- (synopsis "Composable build system for OCaml")
- (description "Jbuilder is a build system designed for OCaml/Reason projects
-only. It focuses on providing the user with a consistent experience and takes
-care of most of the low-level details of OCaml compilation. All you have to do
-is provide a description of your project and Jbuilder will do the rest.")
- (license license:asl2.0)))
-
(define-public ocaml-zed
(package
(name "ocaml-zed")
@@ -4375,20 +4339,10 @@ is provide a description of your project and Jbuilder will do the rest.")
(file-name (git-file-name name version))
(sha256
(base32 "00hhxcjf3bj3w2qm8nzs9x6vrqkadf4i0277s5whzy2rmiknj63v"))))
- (build-system ocaml-build-system)
+ (build-system dune-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (replace 'build
- (lambda _ (invoke "jbuilder" "build")))
- (delete 'check)
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (invoke "jbuilder" "install" "--prefix" out)))))))
- (native-inputs
- `(("jbuilder" ,ocaml-jbuilder)))
+ `(#:jbuild? #t
+ #:test-target "."))
(propagated-inputs
`(("camomile" ,ocaml-camomile)
("react" ,ocaml-react)))
@@ -4449,27 +4403,14 @@ instead of bindings to a C library.")
(file-name (git-file-name name version))
(sha256
(base32 "02hjkc0rdzfq3bqy9mqm5wmw312r3187v9cl66ynb6hxkj6s3glb"))))
- (build-system gnu-build-system)
+ (build-system dune-build-system)
(arguments
- `(#:test-target "test"
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (libdir (string-append out "/lib/ocaml/site-lib")))
- (mkdir-p libdir)
- (invoke "jbuilder" "install"
- "--prefix" out
- "--libdir" libdir)))))))
+ `(#:jbuild? #t
+ #:test-target "."))
(native-inputs
- `(("ocaml" ,ocaml)
- ("cppo" ,ocaml-cppo)
- ("jbuilder" ,ocaml-jbuilder)))
+ `(("cppo" ,ocaml-cppo)))
(propagated-inputs
- `(("ocaml-findlib" ,ocaml-findlib)
- ("lambda-term" ,ocaml-lambda-term)
+ `(("lambda-term" ,ocaml-lambda-term)
("lwt" ,ocaml-lwt)
("react" ,ocaml-react)
("camomile" ,ocaml-camomile)
--
2.21.0
next prev parent reply other threads:[~2019-04-14 20:33 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-14 20:25 [bug#35280] [PATCH] Remove ocaml-4.02 Julien Lepiller
2019-04-14 20:32 ` [bug#35280] [PATCH 1/5] gnu: Add ocaml-bigarray-compat Julien Lepiller
2019-04-14 20:32 ` [bug#35280] [PATCH 2/5] gnu: bap: Update to 1.6.0 Julien Lepiller
2019-04-14 20:32 ` Julien Lepiller [this message]
2019-04-14 20:32 ` [bug#35280] [PATCH 4/5] gnu: ocamlify: Downgrade to 0.0.1 Julien Lepiller
2019-04-14 20:32 ` [bug#35280] [PATCH 5/5] gnu: ocaml@4.02: Remove the package, affected by a CVE, and its dependent packages Julien Lepiller
2019-04-25 17:04 ` bug#35280: [PATCH] Remove ocaml-4.02 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=20190414203205.8104-3-julien@lepiller.eu \
--to=julien@lepiller.eu \
--cc=35280@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).