From patchwork Sat Oct 23 17:58:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 34026 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 3458D27BBE3; Sat, 23 Oct 2021 18:59:23 +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 0047427BBE1 for ; Sat, 23 Oct 2021 18:59:23 +0100 (BST) Received: from localhost ([::1]:54342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1meLId-0000zn-Rf for patchwork@mira.cbaines.net; Sat, 23 Oct 2021 13:59:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLIM-0000xO-KA for guix-patches@gnu.org; Sat, 23 Oct 2021 13:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53845) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1meLIM-0003m7-Bc for guix-patches@gnu.org; Sat, 23 Oct 2021 13:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1meLIM-0005Dt-5b for guix-patches@gnu.org; Sat, 23 Oct 2021 13:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51358] [PATCH 1/4] gnu: Add ocaml-lacaml. 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.163501193420038 (code B ref 51358); Sat, 23 Oct 2021 17:59:02 +0000 Received: (at 51358) by debbugs.gnu.org; 23 Oct 2021 17:58:54 +0000 Received: from localhost ([127.0.0.1]:37151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1meLID-0005D1-LL for submit@debbugs.gnu.org; Sat, 23 Oct 2021 13:58:53 -0400 Received: from lepiller.eu ([89.234.186.109]:36450) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1meLIB-0005Cm-AU for 51358@debbugs.gnu.org; Sat, 23 Oct 2021 13:58:52 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 98f69c9e for <51358@debbugs.gnu.org>; Sat, 23 Oct 2021 17:58:49 +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=KWTKRGHqk0WPk9fJ4LTzzhvvA ni7lSRb3b2dxYVk7Xo=; b=LSHyYspFfXBhXnu/CKw9gNlvz3Xw4hqteniQCSlBC LYHJgLC7ES/bRC7A8WP0ajhWZmZnTZYOHZxlmGw5Iq6zJVg/dortJ5nS+8aPglO9 BZyU+uyFdmxn1LG6gX0jZkw4umChN+MEPq67vRkh4Aq3pFhqGynJouotGASzMUy2 n/Vy005tRB+chBoiAsV1mVPyqUz2vd/YY5vrI/XSupWW3o8iVedztZAUWllUYTJ8 XihSeUmR0a4mGnxpZlICREVjsohy1kRpmJAF+HOBacFqFjqCpVpw/j5XdfJEfoGh QtVOzK1+clhXYFj4KLx3djrWXq2YGesIZ2wq6B1kMt74w== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id ddcb0531 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <51358@debbugs.gnu.org>; Sat, 23 Oct 2021 17:58:49 +0000 (UTC) From: Julien Lepiller Date: Sat, 23 Oct 2021 19:58:40 +0200 Message-Id: <842202eb6abc579a6d64b64ff41733a3536ff76b.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 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-lacaml): Replace with... (ocaml-lacaml): ...this. Use latest ocaml package. --- gnu/packages/ocaml.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f640acca35..b128a4d19a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6757,7 +6757,7 @@ (define-public ocaml4.07-fftw3 ("fftwf" ,fftwf))) (native-inputs `(("ocaml-cppo" ,(package-with-ocaml4.07 ocaml-cppo)) - ("ocaml-lacaml" ,ocaml4.07-lacaml))) + ("ocaml-lacaml" ,(package-with-ocaml4.07 ocaml-lacaml)))) (home-page "https://github.com/Chris00/fftw-ocaml") (synopsis @@ -6767,9 +6767,9 @@ (define-public ocaml4.07-fftw3 library FFTW.") (license license:lgpl2.1))) ; with static linking exception. -(define-public ocaml4.07-lacaml +(define-public ocaml-lacaml (package - (name "ocaml4.07-lacaml") + (name "ocaml-lacaml") (version "11.0.5") (source (origin @@ -6783,10 +6783,7 @@ (define-public ocaml4.07-lacaml "180yb79a3qgx067qcpm50q12hrimjygf06rgkzbish9d1zfm670c")))) (build-system dune-build-system) (arguments - `(#:tests? #f ; No test target. - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:tests? #f)) ; No test target. (native-inputs `(("openblas" ,openblas) ("lapack" ,lapack) From patchwork Sat Oct 23 17:58: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: 34023 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 E3F5B27BBE4; Sat, 23 Oct 2021 18:59:13 +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 552AB27BBE3 for ; Sat, 23 Oct 2021 18:59:13 +0100 (BST) Received: from localhost ([::1]:54310 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1meLIW-0000yN-DO for patchwork@mira.cbaines.net; Sat, 23 Oct 2021 13:59:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLIM-0000xb-S9 for guix-patches@gnu.org; Sat, 23 Oct 2021 13:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53846) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1meLIM-0003mD-Jt for guix-patches@gnu.org; Sat, 23 Oct 2021 13:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1meLIM-0005E0-JV for guix-patches@gnu.org; Sat, 23 Oct 2021 13:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51358] [PATCH 2/4] gnu: Add ocaml-fftw3. 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.163501193420044 (code B ref 51358); Sat, 23 Oct 2021 17:59:02 +0000 Received: (at 51358) by debbugs.gnu.org; 23 Oct 2021 17:58:54 +0000 Received: from localhost ([127.0.0.1]:37153 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1meLIE-0005D5-0x for submit@debbugs.gnu.org; Sat, 23 Oct 2021 13:58:54 -0400 Received: from lepiller.eu ([89.234.186.109]:36450) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1meLIC-0005Cm-Nc 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 9a2fe157 for <51358@debbugs.gnu.org>; Sat, 23 Oct 2021 17:58: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=GBwP1ySLd/zU42+kGRwSjL7Ic 5d4pIcAJTrh6pkWn10=; b=l+p5HZfIHFKFxpWtK1S0g6s0//z0nvmCm0xCw8oYe kXv6DjP+R2NMsw/ypCSlXy9Sg2O8eomOf9l+ngsHsA+sV0l0k+6FwC6yNnFMJGVM ogAqpe2zfKtn9qZtRCjNEwp1lV1DSw/nvV2UD4hGj1WHKLNMEy7pYSYSglWNFIjg jGmxXnvQXzPWPBflXYGGSIDiE985umyqKbKJxZ2Ras/m8uxbzzUc3phZU07QxT4L 8YWKHOuClAVJAGnO2sQPjgmlmr7NPc/U6qYsVCQLxW/d5kObNhP6T1PE9rLdpKaY 311M5QqSzfye+6XuOClYp3rYL0hGgZCB9/Gk6rXodYY1w== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id dd48742f (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:41 +0200 Message-Id: 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 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-fftw3): Replace with... (ocaml-fftw3) ...this. Use latest ocaml package. --- gnu/packages/ocaml.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b128a4d19a..4bd805edcc 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6731,9 +6731,9 @@ (define-public ocaml4.07-odoc ("ocaml-uutf" ,ocaml-uutf))) (properties '())))) -(define-public ocaml4.07-fftw3 +(define-public ocaml-fftw3 (package - (name "ocaml4.07-fftw3") + (name "ocaml-fftw3") (version "0.8.4") (source (origin @@ -6747,11 +6747,7 @@ (define-public ocaml4.07-fftw3 "0l66yagjkwdcib6q55wd8wiap50vi23qiahkghlvm28z7nvbclfk")))) (build-system dune-build-system) (arguments - `(#:tests? #t - #:test-target "tests" - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:test-target "tests")) (propagated-inputs `(("fftw" ,fftw) ("fftwf" ,fftwf))) From patchwork Sat Oct 23 17:58:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 34024 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 B631E27BBE3; Sat, 23 Oct 2021 18:59:15 +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 6F32027BBE1 for ; Sat, 23 Oct 2021 18:59:15 +0100 (BST) Received: from localhost ([::1]:54340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1meLIY-0000zl-0Y for patchwork@mira.cbaines.net; Sat, 23 Oct 2021 13:59:14 -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 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 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 From patchwork Sat Oct 23 17:58:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 34025 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 F0EC727BBE3; Sat, 23 Oct 2021 18:59:20 +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=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED,URIBL_SBL,URIBL_SBL_A 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 9F71F27BBE1 for ; Sat, 23 Oct 2021 18:59:20 +0100 (BST) Received: from localhost ([::1]:54386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1meLId-00012L-Nh for patchwork@mira.cbaines.net; Sat, 23 Oct 2021 13:59:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLIN-0000xt-JU for guix-patches@gnu.org; Sat, 23 Oct 2021 13:59:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53848) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1meLIN-0003mz-Bj 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 1meLIN-0005EF-BN for guix-patches@gnu.org; Sat, 23 Oct 2021 13:59:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51358] [PATCH 4/4] gnu: Add ocaml-charinfo-width. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Oct 2021 17:59: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.163501194120073 (code B ref 51358); Sat, 23 Oct 2021 17:59:03 +0000 Received: (at 51358) by debbugs.gnu.org; 23 Oct 2021 17:59:01 +0000 Received: from localhost ([127.0.0.1]:37158 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1meLIK-0005DZ-UE for submit@debbugs.gnu.org; Sat, 23 Oct 2021 13:59:01 -0400 Received: from lepiller.eu ([89.234.186.109]:36450) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1meLIE-0005Cm-8J for 51358@debbugs.gnu.org; Sat, 23 Oct 2021 13:58:54 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 1795a61c 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=J9TLrVa1rp70XL20wxs6UvIiK VNikqli/0cY11WdaU8=; b=QDI3brMqCIBfgwsQAp3NU8b14qomqfqOH82t5Jol8 fbCv4s42HFRI3aE8dsnh7T6j4pfCi5rPOThCLJKRhy2RCYier0dJE2i4F+jJLBpH xZLicoySUr22Zoycbko7+jxjjd4wuezmN+2FMr652xepCWX7iCswfY1UOA1j9HX6 RZ/ZG2OesxlFD2Qwde0Vk7annzwy5MZU/ML8SA63ZkU2AEbIb+SLKwaHEgTRIEVb KC0S7zlPRbnFD/YNUdseO87rPJbMADB6xgsLlkmv+oA3NJwk5IV/vhqUxtoByJr+ QlfsZYeXzIKBzriFc/dlglH9powwpd3pXdhI/w+IvOgBw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id ddfba8a4 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <51358@debbugs.gnu.org>; Sat, 23 Oct 2021 17:58:51 +0000 (UTC) From: Julien Lepiller Date: Sat, 23 Oct 2021 19:58:43 +0200 Message-Id: <94c892169535f0c144d606d4eb657d5cdadfabf4.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 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-charinfo-width): Replace with... (ocaml-charinfo-width): ...this. Use latest ocaml package. --- gnu/packages/ocaml.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9f94762a85..af081756c8 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3882,9 +3882,9 @@ (define-public ocaml-camomile ;; with an exception for linked libraries to use a different license (license license:lgpl2.0+))) -(define-public ocaml4.07-charinfo-width +(define-public ocaml-charinfo-width (package - (name "ocaml4.07-charinfo-width") + (name "ocaml-charinfo-width") (version "1.1.0") (source (origin (method url-fetch) @@ -3895,15 +3895,11 @@ (define-public ocaml4.07-charinfo-width (base32 "00bv4p1yqs8y0z4z07wd9w9yyv669dikp9b04dcjbwpiy2wy0086")))) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) - ("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile)))) + `(("ocaml-result" ,ocaml-result) + ("ocaml-camomile" ,ocaml-camomile))) (native-inputs - `(("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect)))) + `(("ocaml-ppx-expect" ,ocaml-ppx-expect))) (properties `((upstream-name . "charInfo_width"))) (home-page "https://bitbucket.org/zandoye/charinfo_width/") @@ -3933,7 +3929,7 @@ (define-public ocaml4.07-zed #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile)) - ("ocaml-charinfo-width" ,ocaml4.07-charinfo-width) + ("ocaml-charinfo-width" ,(package-with-ocaml4.07 ocaml-charinfo-width)) ("ocaml-react" ,(package-with-ocaml4.07 ocaml-react)))) (home-page "https://github.com/diml/zed") (synopsis "Abstract engine for text editing in OCaml")