From patchwork Mon Oct 25 22:06:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 34048 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 A905527BBE3; Mon, 25 Oct 2021 23:08: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 6690B27BBE1 for ; Mon, 25 Oct 2021 23:08:15 +0100 (BST) Received: from localhost ([::1]:35398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mf88c-0001G8-Hs for patchwork@mira.cbaines.net; Mon, 25 Oct 2021 18:08:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mf87S-0000JJ-NT for guix-patches@gnu.org; Mon, 25 Oct 2021 18:07:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32990) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mf87S-0004UH-F1 for guix-patches@gnu.org; Mon, 25 Oct 2021 18:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mf87S-0004VO-A3 for guix-patches@gnu.org; Mon, 25 Oct 2021 18:07: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: Mon, 25 Oct 2021 22:07: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.163519961217274 (code B ref 51358); Mon, 25 Oct 2021 22:07:02 +0000 Received: (at 51358) by debbugs.gnu.org; 25 Oct 2021 22:06:52 +0000 Received: from localhost ([127.0.0.1]:44529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mf87I-0004UT-6U for submit@debbugs.gnu.org; Mon, 25 Oct 2021 18:06:52 -0400 Received: from lepiller.eu ([89.234.186.109]:36704) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mf87G-0004UG-17 for 51358@debbugs.gnu.org; Mon, 25 Oct 2021 18:06:50 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id b0417a8b for <51358@debbugs.gnu.org>; Mon, 25 Oct 2021 22:06: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=V8wHFlnRd71om4Fw1HyZbNVyW s9AdyLPJQMzix+ybV4=; b=N3dILoOB2sN7gsILOGYnd/r5kM7oUaS2UWr+Vqpxu upfGJzSDSQRnRC0x7/LYqXmfcqL55e9fZXvtZD1hmU5JkpQhHvjmzpgrYyzOmJfZ fbZCSgwhjo8sK/Np9QjRzAWy+mz175NNBHAjkwx1NPG0QrrdszxcItc+rEPP1dwI TcmC1ZLVL5Y5QTExyJ8wN9zBKnIomE/7VD6dploOHROdVuRYCTvKmbRzidB35HJV pKtjWtOxnw0d/BGk+G3oIbrAUm0OA+9Rcc69JZZxfz5Cj/7sO7xWBGb2vGhV3YBX Xuuf0l5PKRDeQ3Sf1D5V2WMrD6OUGRDPqXCMx4uo8gJow== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 5538a7a9 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <51358@debbugs.gnu.org>; Mon, 25 Oct 2021 22:06:48 +0000 (UTC) From: Julien Lepiller Date: Tue, 26 Oct 2021 00:06:39 +0200 Message-Id: <6309f0761c6c6eb56e103a12f8265f3f5bed5cbd.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-lacaml): Replace with... (ocaml-lacaml): ...this. Use latest ocaml package. --- gnu/packages/ocaml.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f640acca35..65f311f9bf 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,10 +6767,10 @@ (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") - (version "11.0.5") + (name "ocaml-lacaml") + (version "11.0.8") (source (origin (method git-fetch) @@ -6780,13 +6780,10 @@ (define-public ocaml4.07-lacaml (file-name (git-file-name name version)) (sha256 (base32 - "180yb79a3qgx067qcpm50q12hrimjygf06rgkzbish9d1zfm670c")))) + "115535kphchh2a434b48b408x9794j8zzrsdmacsgqdsrgy3rck4")))) (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 Mon Oct 25 22:06: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: 34049 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 3E24127BBE3; Mon, 25 Oct 2021 23:08:26 +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 041FD27BBE1 for ; Mon, 25 Oct 2021 23:08:26 +0100 (BST) Received: from localhost ([::1]:35630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mf88n-0001QC-3s for patchwork@mira.cbaines.net; Mon, 25 Oct 2021 18:08:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mf87T-0000Ju-5n for guix-patches@gnu.org; Mon, 25 Oct 2021 18:07:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32991) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mf87S-0004Ug-T7 for guix-patches@gnu.org; Mon, 25 Oct 2021 18:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mf87S-0004VW-Nn for guix-patches@gnu.org; Mon, 25 Oct 2021 18:07: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: Mon, 25 Oct 2021 22:07: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.163519961717291 (code B ref 51358); Mon, 25 Oct 2021 22:07:02 +0000 Received: (at 51358) by debbugs.gnu.org; 25 Oct 2021 22:06:57 +0000 Received: from localhost ([127.0.0.1]:44532 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mf87M-0004Uo-HA for submit@debbugs.gnu.org; Mon, 25 Oct 2021 18:06:56 -0400 Received: from lepiller.eu ([89.234.186.109]:36704) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mf87G-0004UG-TR for 51358@debbugs.gnu.org; Mon, 25 Oct 2021 18:06:51 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id ac001309 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=TOotlhFp8SEia4f2RcOCOO2Uj KWUyNWYYl2iroSs9h8=; b=VYha6U6CoKtSntOdW0IIYu8ZDI9eV4wAovcaymmwm 2rxOaiOhr0gp10gzWxwXvh+zKXPma+rEuzm/reH3W2NqnXJ4HnWbL8LNwEFN8e48 8Y8rw2MdTDu8SVCOJcK2cYwjOE2PYjRwqmVs9Ue80l+yzlkxMbespiMTEMIxxOZn HMhUt1h0g+4+v7H4Pj6v5QjdpUufyYZN24NwuGH4yPC3cUPns03ovPpAvRMyLI59 uGS/iWBM2AW73yfet10nW73msMv4kHc2CjJw9hG9/Y+TH5ZC0GuLaRddYL7lxOrK 3472xruK3JmOwo4qAMc3evK1ZuajZ8mC0wmXQmLIcL+uQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 1f183042 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <51358@debbugs.gnu.org>; Mon, 25 Oct 2021 22:06:49 +0000 (UTC) From: Julien Lepiller Date: Tue, 26 Oct 2021 00:06:40 +0200 Message-Id: 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-fftw3): Replace with... (ocaml-fftw3) ...this. Use latest ocaml package. --- gnu/packages/ocaml.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 65f311f9bf..f0469940aa 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,17 +6747,13 @@ (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))) (native-inputs - `(("ocaml-cppo" ,(package-with-ocaml4.07 ocaml-cppo)) - ("ocaml-lacaml" ,(package-with-ocaml4.07 ocaml-lacaml)))) + `(("ocaml-cppo" ,ocaml-cppo) + ("ocaml-lacaml" ,ocaml-lacaml))) (home-page "https://github.com/Chris00/fftw-ocaml") (synopsis 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 From patchwork Mon Oct 25 22:06: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: 34050 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 1636327BBE3; Mon, 25 Oct 2021 23:08:32 +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 C8B1827BBE1 for ; Mon, 25 Oct 2021 23:08:31 +0100 (BST) Received: from localhost ([::1]:35836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mf88s-0001Yi-TU for patchwork@mira.cbaines.net; Mon, 25 Oct 2021 18:08:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mf87T-0000LY-Ud for guix-patches@gnu.org; Mon, 25 Oct 2021 18:07:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32993) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mf87T-0004VF-LL 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-0004Vk-HN for guix-patches@gnu.org; Mon, 25 Oct 2021 18:07: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: 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.163519961717305 (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]:44536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mf87N-0004Uy-7G 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 1mf87I-0004UG-Fu for 51358@debbugs.gnu.org; Mon, 25 Oct 2021 18:06:53 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id a78ae008 for <51358@debbugs.gnu.org>; Mon, 25 Oct 2021 22:06: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=4VTcAQzNRmKVMqIcrj/4a8RBb duggKEHMa/nZRAi3BM=; b=D6g+LtVXV1PYtXdBRK6CeUo+I4JWCRiS2QsS6KiO1 AbnUVlfLgH5A7NqTxNrJAjh1+BctKJ5a4plE3nyI+keHcvQauDDFssjUCuC9Ogfr 2WlFrLAMD6ktHhIYHw8RGPq3RfPENwEMpTLIFY6z9UwOOFJpLiIZmI2UkLfAQVKE +f7PJ2NVAw0XVAVcxJVQ9Shuj9MGKsya4CXJMNEqLf/KwxJSHVKznB2r4JyW1hkE 2WxXb36GeO66uSvHZIcX8UBOei2HF8rJ3OsC52NbA7/vW4npuvbq+OECLSeavhJM WXjkxC1Tz9ubnZMHlzoZ4E2muvLUOQW+pVnyX+jTM0KUQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 5e3d661e (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:42 +0200 Message-Id: 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-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 a6e8af8bcf..c0bb1675a2 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")