From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id WNB9No0qd2HIGQEAgWs5BA (envelope-from ) for ; Tue, 26 Oct 2021 00:07:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id GBUyMo0qd2FBZQAAB5/wlQ (envelope-from ) for ; Mon, 25 Oct 2021 22:07:09 +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 62B532D52D for ; Tue, 26 Oct 2021 00:07:09 +0200 (CEST) Received: from localhost ([::1]:34152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mf87Y-0000OP-HZ for larch@yhetil.org; Mon, 25 Oct 2021 18:07:08 -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 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=1635199629; 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=X6Ppb8CwCUiJsVx6vTFbP/4wYBS3pttTb8rX4kIzTk4=; b=NmKYZjih1/Z8HV3NqT3aqSNnIgtqZSGqxb8WKktwA6TFTT+xsSNDSpJyXzUgjX4MbOlKxk RipFI1jPuAA94wW1Uv+Xl+2qW7PAL6l1kAsw4R4l09fnDEELN5s5sdBB1bX7tezesvmey+ xD+T1rGjven75LmNttc7x/teNC3p+F8KkJ6GCoYIVm1uQ0BWoSB5UWq8EPHYbZ/f9FrV2L +960hqZs7nHcSXXRev71Yx5VWzsRuZirgBFRFN10NEWjeP+vQO4Z3L1BD1OFaR5TV6eD+d MDMWREgGkGv97PW6x6lcvu2qH/t39UrfUWlE9YIQJN2hefYZoEbVF0Om0wKEKw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1635199629; a=rsa-sha256; cv=none; b=h+iipqK0nymKIk4wg77qzXEpbi8SkyCio7UTqTVCXPXWVx5IP+9kwoTz46MeWKyMHlwBnb wTTGYrU4op+NHeavcI06qLkVdfHWXvp9g1ZZ5VjXJVvFsPv0UWi1ZgXnMMzj87JYR1z8af Zb7Z8VJppNXAXiUtyEEjCp4jswKDNR0mIxHfvMC4A85l5VoGbNNN/oIqubFjdLnUvrsqbJ 1SA0bF6kMIXrQ98SzD5OsY+t5V/7FQsYl5RceAvJ0m8tqWtYsflPwX5fljwfDQXNI0I+PW K7SdiACpXYQ81IB7ovwITpldkT/159efgg6Wl6hYkxLhzzrIdAHTnZ2Z/XOwTg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=bcpKLz+z; 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: 3.67 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=bcpKLz+z; 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: 62B532D52D X-Spam-Score: 3.67 X-Migadu-Scanner: scn0.migadu.com X-TUID: CaHxKMYHNUnm * 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 -- 2.33.0