From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kBqdHG9NdGEcTQEAgWs5BA (envelope-from ) for ; Sat, 23 Oct 2021 19:59:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id aBUzGG9NdGH/bQAAbx9fmQ (envelope-from ) for ; Sat, 23 Oct 2021 17:59:11 +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 41B761C5BD for ; Sat, 23 Oct 2021 19:59:11 +0200 (CEST) Received: from localhost ([::1]:54340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1meLIU-0000zl-8B for larch@yhetil.org; Sat, 23 Oct 2021 13:59:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLIN-0000xl-7f for guix-patches@gnu.org; Sat, 23 Oct 2021 13:59:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53847) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1meLIM-0003mO-WB for guix-patches@gnu.org; Sat, 23 Oct 2021 13:59:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1meLIM-0005E8-VS for guix-patches@gnu.org; Sat, 23 Oct 2021 13:59:02 -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: Sat, 23 Oct 2021 17:59:02 +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.163501194120064 (code B ref 51358); Sat, 23 Oct 2021 17:59:02 +0000 Received: (at 51358) by debbugs.gnu.org; 23 Oct 2021 17:59:01 +0000 Received: from localhost ([127.0.0.1]:37156 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1meLIK-0005DW-9t for submit@debbugs.gnu.org; Sat, 23 Oct 2021 13:59:00 -0400 Received: from lepiller.eu ([89.234.186.109]:36450) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1meLID-0005Cm-C4 for 51358@debbugs.gnu.org; Sat, 23 Oct 2021 13:58:53 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id a5c846f9 for <51358@debbugs.gnu.org>; Sat, 23 Oct 2021 17:58:51 +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=pHV7FLG8RlI5JaDuBjkMAaqBP yEoYIX0Dxy3aaIWhf4=; b=RujsLLS6wrJYmFeag+yDrnAqT+LahpSdBgE7o3mx9 4XQBZx5bJxQcKdxeDd3munu97gcZ5usw4sQt2vsVHaMDUrBEwRjg6j0O68P8Hw0A jZgzqtL/lgrqutTdUBBQvUMsS1AISM5hdDIJPmlXGLS+MJVPw8++WJdobajefJX8 04H7emGEdWNFRuZo2Nlrxr5rVigzzKltXY993AbH3wWpE1AFx+SI2XkoO6zBt+dB aefU+Pe1M+S5XwT30MIjMPQ+eoGRzco4FtmVHzW4B0sED/pxcBIM+TowLkoCvLAN 83x2h3VVdr8fBL0tTycL1LxFOWPlkYprHPYy9rvRaz7nA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 152be74e (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <51358@debbugs.gnu.org>; Sat, 23 Oct 2021 17:58:50 +0000 (UTC) From: Julien Lepiller Date: Sat, 23 Oct 2021 19:58:42 +0200 Message-Id: <62ba40aedaa4174e8787e9e1a2893ea078057d39.1635011212.git.julien@lepiller.eu> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211023195212.4baaee5e@tachikoma.lepiller.eu> References: <20211023195212.4baaee5e@tachikoma.lepiller.eu> MIME-Version: 1.0 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1635011951; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=0BuqbBjEn9WnAvxsjEVyKFPZk3vNtJBy5C5WPHNvxyw=; b=AadY2OH0VI8i436adZtzLdtJagd7bjsZhRTdvUbkTL1LZIZhoLDK/Bv5eC/1sXFA8k2q/f zkjrlW/UrK5JsCqY6nN9S4FovfMeoNPgjgn7k+MbZGFHaZtm2uRpJSN/U9O2CfcJjCEH+S qIn2dn79e03vECG3FWqJgJKW6Yi/F/yxIIO3gx6mD0bdUOsgZlK7eCtFfrPqdY59AVGFgN rfoFuY9MueB+LVc2SHofmb+moQQUhb/aQ6hSbCWKaqS5VY2acixE0YWLHp9rXKhACq50IB qNlxTVlFS7ykaaS3+BTCmqjID+N356estqGp0xC5vWiaTj8v9RAD49KUnGGOag== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1635011951; a=rsa-sha256; cv=none; b=sk2xSHV5k3UOcGBZbVg8EmvoJ+hTx7YXt+IrGouRpDPE9q87sR7vftPLPf1YO0tSVcYJEt ssVjLFW8sD8vPkBMMqaFI1mU5FcjcjvFW+un8fn1bFwDCQKovZ/1co3m64vQGXc4UjiwJU kRfOr2heeIM8gF+OFkY9LhMjAxxwmvF9uivXCIsw9idlPhcR2w1UmB4MTtZPPo2DdqN4yQ 81kYWwdouEO0pQnnaE0WTcAxrrYEspk6LnVYHpNTdRU85eAfydqAzkOnSMWjKdXX4uZhrj mkC8ry6n+vfRFo/MOmyL/ihFDLDXJXYE4bSdnsSgPnFzROd1S7H8U2U3ITGe3g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=RujsLLS6; 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-Spam-Score: 5.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=RujsLLS6; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (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: 41B761C5BD X-Spam-Score: 5.17 X-Migadu-Scanner: scn0.migadu.com X-TUID: IGSW/PaSjx3o * 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 4bd805edcc..9f94762a85 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 -- 2.33.0