From: pukkamustard <pukkamustard@posteo.net>
To: 45498@debbugs.gnu.org
Subject: [bug#45498] [PATCH v2 01/13] gnu: Remove ocaml-js-build-tools.
Date: Mon, 28 Dec 2020 19:14:02 +0100 [thread overview]
Message-ID: <20201228181414.14196-1-pukkamustard@posteo.net> (raw)
In-Reply-To: <86pn2tn6mv.fsf@posteo.net>
The package is deprecated and no longer maintained. It is recommended
to use dune instead.
* gnu/packages/ocaml.xyz (ocaml-js-build-tools, janestreet-origin,
janestreet-arguments): Remove variable.
---
gnu/packages/ocaml.scm | 65 +-----------------------------------------
1 file changed, 1 insertion(+), 64 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 2bfda7307e..aa9dfb3dae 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -16,6 +16,7 @@
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2020 pukkamustard <pukkamustard@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -92,47 +93,6 @@
(number->string file-number) "/" name "-" version
".tar.gz"))
-;; Janestreet packages are found in a similar way and all need the same patch.
-(define (janestreet-origin name version hash)
- (origin (method url-fetch)
- (uri (string-append "https://ocaml.janestreet.com/ocaml-core/"
- (version-major+minor version) "/files/"
- name "-" version ".tar.gz"))
- (sha256 (base32 hash))
- (modules '((guix build utils)))
- (snippet
- (let ((pattern (string-append "lib/" name)))
- `(begin
- ;; install.ml contains an invalid reference to the ppx file and
- ;; propagates this error to the generated META file. It
- ;; looks for it in the "lib" directory, but it is installed in
- ;; "lib/ocaml/site-lib/package". This substitute does not change
- ;; this file for non ppx packages.
- (substitute* "install.ml"
- ((,pattern) (string-append "lib/ocaml/site-lib/" ,name)))
- ;; The standard Makefile would try to install janestreet modules
- ;; in OCaml's directory in the store, which is read-only.
- (substitute* "Makefile"
- (("--prefix")
- "--libdir $(LIBDIR) --prefix"))
- #t)))))
-
-;; They also require almost the same set of arguments
-(define janestreet-arguments
- `(#:use-make? #t
- #:make-flags
- (list (string-append "CONFIGUREFLAGS=--prefix "
- (assoc-ref %outputs "out")
- " --enable-tests")
- (string-append "LIBDIR="
- (assoc-ref %outputs "out")
- "/lib/ocaml/site-lib")
- ;; for ocaml-bin-prot, otherwise ignored
- (string-append "OCAML_TOPLEVEL_PATH="
- (assoc-ref %build-inputs "findlib")
- "/lib/ocaml/site-lib"))
- #:phases (modify-phases %standard-phases (delete 'configure))))
-
(define-public ocaml-4.11
(package
(name "ocaml")
@@ -2715,29 +2675,6 @@ system in your OCaml projects. It helps to create standard entry points in your
build system and allows external tools to analyse your project easily.")
(license license:lgpl2.1+))) ; with ocaml static compilation exception
-(define-public ocaml-js-build-tools
- (package
- (name "ocaml-js-build-tools")
- (version "113.33.06")
- (source (janestreet-origin "js-build-tools" version
- "0r8z4fz8iy5y6hkdlkpwf6rk4qigcr3dzyv35585xgg2ahf12zy6"))
- (native-inputs
- `(("oasis" ,ocaml-oasis)
- ("ocamlbuild" ,ocamlbuild)
- ("opam" ,opam)))
- (build-system ocaml-build-system)
- (arguments janestreet-arguments)
- (home-page "https://github.com/janestreet/js-build-tools")
- (synopsis "Collection of tools to help building Jane Street Packages")
- (description "This package contains tools to help building Jane Street
-packages, but can be used for other purposes. It contains:
-@enumerate
-@item an @command{oasis2opam-install} tool to produce a @file{.install} file
-from the oasis build log
-@item a @code{js_build_tools} ocamlbuild plugin with various goodies.
-@end enumerate")
- (license license:asl2.0)))
-
(define-public ocaml-cppo
(package
(name "ocaml-cppo")
--
2.29.2
next prev parent reply other threads:[~2020-12-28 18:15 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-28 12:40 [bug#45498] [PATCH 00/12] Add ocaml-merlin pukkamustard
2020-12-28 12:47 ` [bug#45498] [PATCH 01/12] gnu: Remove ocaml-js-build-tools pukkamustard
2020-12-28 12:47 ` [bug#45498] [PATCH 02/12] gnu: Add ocaml-sexplib pukkamustard
2020-12-28 12:47 ` [bug#45498] [PATCH 03/12] gnu: Add ocaml-base pukkamustard
2020-12-28 12:47 ` [bug#45498] [PATCH 04/12] gnu: Add ocaml-parsexp pukkamustard
2020-12-28 12:47 ` [bug#45498] [PATCH 05/12] gnu: Add ocaml-sexplib pukkamustard
2020-12-28 12:47 ` [bug#45498] [PATCH 06/12] gnu: Add ocaml-ounit2 pukkamustard
2020-12-28 12:47 ` [bug#45498] [PATCH 07/12] gnu: ocaml-tyxml: Update to 4.4.0 pukkamustard
2020-12-28 12:47 ` [bug#45498] [PATCH 08/12] gnu: ocaml-markup: Update to 1.0.0 pukkamustard
2020-12-28 13:58 ` Julien Lepiller
2020-12-28 12:47 ` [bug#45498] [PATCH 09/12] gnu: Add ocaml-odoc pukkamustard
2020-12-28 14:02 ` Julien Lepiller
2020-12-28 12:47 ` [bug#45498] [PATCH 10/12] gnu: Add ocaml-version pukkamustard
2020-12-28 12:47 ` [bug#45498] [PATCH 11/12] gnu: Add ocaml-mdx pukkamustard
2020-12-28 12:47 ` [bug#45498] [PATCH 12/12] gnu: Add ocaml-merlin pukkamustard
2020-12-28 14:06 ` [bug#34412] [bug#45498] [PATCH 00/12] " Julien Lepiller
2020-12-28 18:10 ` pukkamustard
2020-12-28 18:14 ` pukkamustard [this message]
2020-12-28 18:14 ` [bug#45498] [PATCH v2 02/13] gnu: Add ocaml-sexplib0 pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 03/13] gnu: Add ocaml-base pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 04/13] gnu: Add ocaml-parsexp pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 05/13] gnu: Add ocaml-sexplib pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 06/13] gnu: Add ocaml-ounit2 pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 07/13] gnu: ocaml-tyxml: Update to 4.4.0 pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 08/13] gnu: ocaml-markup: Update to 1.0.0 pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 09/13] gnu: Add ocaml-odoc pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 10/13] gnu: Add ocaml-version pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 11/13] gnu: Add ocaml-mdx pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 12/13] gnu: Add ocaml-merlin pukkamustard
2020-12-28 18:14 ` [bug#45498] [PATCH v2 13/13] gnu: ocaml-yojson: Make dependencies propagated-inputs pukkamustard
2020-12-28 20:00 ` [bug#45498] [PATCH 00/12] Add ocaml-merlin Julien Lepiller
2020-12-28 21:09 ` pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 01/14] gnu: Remove ocaml-js-build-tools pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 02/14] gnu: Add ocaml-sexplib0 pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 03/14] gnu: Add ocaml-base pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 04/14] gnu: Add ocaml-parsexp pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 05/14] gnu: Add ocaml-sexplib pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 06/14] gnu: Add ocaml-ounit2 pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 07/14] gnu: ocaml-tyxml: Update to 4.4.0 pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 08/14] gnu: ocaml-markup: Update to 1.0.0 pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 09/14] gnu: Add ocaml-odoc pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 10/14] gnu: Add ocaml-version pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 11/14] gnu: Add ocaml-mdx pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 12/14] gnu: ocaml-yojson: Make dependencies propagated-inputs pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 13/14] gnu: Add ocaml-dot-merlin-reader pukkamustard
2020-12-28 21:10 ` [bug#45498] [PATCH v3 14/14] gnu: Add ocaml-merlin pukkamustard
2020-12-30 13:29 ` bug#45498: [PATCH 00/12] " 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=20201228181414.14196-1-pukkamustard@posteo.net \
--to=pukkamustard@posteo.net \
--cc=45498@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).