From patchwork Mon Oct 25 22:06:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 34047 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4B1B327BBE3; Mon, 25 Oct 2021 23:07:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E9E3D27BBE1 for ; Mon, 25 Oct 2021 23:07:13 +0100 (BST) Received: from localhost ([::1]:34152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mf87d-0000OP-23 for patchwork@mira.cbaines.net; Mon, 25 Oct 2021 18:07:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mf87T-0000Kr-Js for guix-patches@gnu.org; Mon, 25 Oct 2021 18:07:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32992) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mf87T-0004Ur-A5 for guix-patches@gnu.org; Mon, 25 Oct 2021 18:07:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mf87T-0004Vd-4S for guix-patches@gnu.org; Mon, 25 Oct 2021 18:07:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51358] [PATCH 3/4] gnu: Add ocaml-gsl. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Oct 2021 22:07:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51358 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51358@debbugs.gnu.org Received: via spool by 51358-submit@debbugs.gnu.org id=B51358.163519961717299 (code B ref 51358); Mon, 25 Oct 2021 22:07:03 +0000 Received: (at 51358) by debbugs.gnu.org; 25 Oct 2021 22:06:57 +0000 Received: from localhost ([127.0.0.1]:44534 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mf87M-0004Uq-Pi for submit@debbugs.gnu.org; Mon, 25 Oct 2021 18:06:57 -0400 Received: from lepiller.eu ([89.234.186.109]:36704) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mf87H-0004UG-If for 51358@debbugs.gnu.org; Mon, 25 Oct 2021 18:06:52 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 97bced2c for <51358@debbugs.gnu.org>; Mon, 25 Oct 2021 22:06:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=V1V4TMObr0FatCTIUTNYYNhKU 9LGiLwQYl++9w8PDqA=; b=bcpKLz+zxWotgVExLJsp9x3wLd/yP16WQSo6fRy7W sn6H8G4Jq+bZvnXzjYMFm80j/cfoazzyT426MHypaSOH1Es4HJ0dVztNZPBQpOvh iodqOwp7ihF8d44dvV0gQwZK61sXEHXuQ2oTfIR08eAgh7pR2IKzPDJFYsjCFfjK Mu/ZeOYqqO347DjPCQ92MJrg6H8Ud01zPJGiK0XcRd547f6NwPNnWJtzOoBqat62 Ivekv1Fs4W7V58JtCBd1YFrQSfx2WYE2ChgtxY+6AnZl7YUp9mx6mhqoVlAxUSkZ MmYnu2P5cKTGQuTac3q3gLnh62aBswIOi7bm/BKu2ZJqw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id b801c365 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <51358@debbugs.gnu.org>; Mon, 25 Oct 2021 22:06:50 +0000 (UTC) From: Julien Lepiller Date: Tue, 26 Oct 2021 00:06:41 +0200 Message-Id: <38172f3c92b0ab3462985efef82e155dbe4025ad.1635199548.git.julien@lepiller.eu> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211026000536.1b19cf19@tachikoma.lepiller.eu> References: <20211026000536.1b19cf19@tachikoma.lepiller.eu> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml4.07-gsl): Replace with... (ocaml-gsl): ...this. Use latest ocaml package. (ocaml4.07-gsl-1): Adapt accordingly. --- gnu/packages/ocaml.scm | 53 +++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f0469940aa..a6e8af8bcf 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4650,9 +4650,9 @@ (define-public ocaml-merlin Atom.") (license license:expat))) -(define-public ocaml4.07-gsl +(define-public ocaml-gsl (package - (name "ocaml4.07-gsl") + (name "ocaml-gsl") (version "1.24.0") (source (origin @@ -4672,16 +4672,12 @@ (define-public ocaml4.07-gsl (add-after 'unpack 'fix-gsl-directory (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/config/discover.ml" - (("/usr") (assoc-ref inputs "gsl"))) - #t))) - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + (("/usr") (assoc-ref inputs "gsl")))))))) (inputs `(("gsl" ,gsl))) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-stdio" ,ocaml-stdio))) (home-page "https://mmottl.github.io/gsl-ocaml") (synopsis "Bindings to the GNU Scientific Library") (description @@ -4690,26 +4686,25 @@ (define-public ocaml4.07-gsl (license license:gpl3+))) (define-public ocaml4.07-gsl-1 - (package - (inherit ocaml4.07-gsl) - (version "1.19.3") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mmottl/gsl-ocaml" - "/releases/download/v" - version "/gsl-ocaml-" version ".tar.gz")) - (sha256 - (base32 - "0nzp43hp8pbjqkrxnwp5lgjrabxayf61h18fjaydi0s5faq6f3xh")))) - (build-system ocaml-build-system) - (inputs - `(("gsl" ,gsl))) - (native-inputs - `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild)))) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) - (propagated-inputs '()))) + (package-with-ocaml4.07 + (package + (inherit ocaml-gsl) + (version "1.19.3") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/mmottl/gsl-ocaml" + "/releases/download/v" + version "/gsl-ocaml-" version ".tar.gz")) + (sha256 + (base32 + "0nzp43hp8pbjqkrxnwp5lgjrabxayf61h18fjaydi0s5faq6f3xh")))) + (build-system ocaml-build-system) + (inputs + `(("gsl" ,gsl))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild))) + (arguments '()) + (propagated-inputs '())))) (define-public cubicle (package