From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id +r8KOMAg6l/1XAAA0tVLHw (envelope-from ) for ; Mon, 28 Dec 2020 18:15:28 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id +LdsM8Ag6l9yFAAAbx9fmQ (envelope-from ) for ; Mon, 28 Dec 2020 18:15:28 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5928894038E for ; Mon, 28 Dec 2020 18:15:24 +0000 (UTC) Received: from localhost ([::1]:40048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktx3B-0003bB-FS for larch@yhetil.org; Mon, 28 Dec 2020 13:15:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktx2t-0003aG-2v for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53521) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktx2s-0006dG-Qn for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktx2s-0000EL-Kl for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH v2 01/13] gnu: Remove ocaml-js-build-tools. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 18:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45498 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45498@debbugs.gnu.org Received: via spool by 45498-submit@debbugs.gnu.org id=B45498.1609179279735 (code B ref 45498); Mon, 28 Dec 2020 18:15:02 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 18:14:39 +0000 Received: from localhost ([127.0.0.1]:36805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2R-0000BN-5k for submit@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:38 -0500 Received: from mout02.posteo.de ([185.67.36.66]:46637) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2P-0000B2-4n for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:34 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 2E557240100 for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 19:14:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609179266; bh=RehPZ00GRntKaLmUQuAm0uQLZoxW7MoXK5vdTeWMDo8=; h=From:To:Cc:Subject:Date:From; b=EP9aFXHe3qLJG/j8hNZu4n+s5qDN14KLSnExKj7sqC9qpbog4K9NuISEp7Fwcvhd7 d8U68ARUa2G8d4bxbhpUvOnXIcB6Dg5N0yhkDi5r5ssVQoepjSqUjIVcIczvOLb4tL JQsVWeAGUw/egdoF3ANcojsjqPHNd4gXetwpu+LcLLEGk1xn97OwCw7bEdIlcUMaV3 r/6nEFi2ob7Z2HtGgBAS/PlZ8bOm/H07q8GTXTV2XAN4FPQ7GjUpKbmez3hpRuu+KR RQb5Ry57x49aqo3Jfhb+7BHWlAd2g+jhMTFF9B1JY5RLGxrFNyBeJzEICqaWafE0uh jYaldlHpVkeRA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4Qg54JwLz6tmH; Mon, 28 Dec 2020 19:14:25 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 19:14:02 +0100 Message-Id: <20201228181414.14196-1-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <86pn2tn6mv.fsf@posteo.net> References: <86pn2tn6mv.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -0.22 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=posteo.net header.s=2017 header.b=EP9aFXHe; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 5928894038E X-Spam-Score: -0.22 X-Migadu-Scanner: scn0.migadu.com X-TUID: EbYug0ukD336 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 ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Simon Tournier +;;; Copyright © 2020 pukkamustard ;;; ;;; 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