From patchwork Sat May 23 22:50:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jack Hill X-Patchwork-Id: 22323 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 C136527BBE3; Sat, 23 May 2020 23:51:07 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 ESMTP id 7B61727BBE1 for ; Sat, 23 May 2020 23:51:07 +0100 (BST) Received: from localhost ([::1]:37042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jccyx-0000IE-2R for patchwork@mira.cbaines.net; Sat, 23 May 2020 18:51:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jccys-0000I1-Pi for guix-patches@gnu.org; Sat, 23 May 2020 18:51:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52675) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jccys-0004TN-Gk for guix-patches@gnu.org; Sat, 23 May 2020 18:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jccys-0007zq-ES for guix-patches@gnu.org; Sat, 23 May 2020 18:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41389] [PATCH 1/2] gnu: guile-dsv: Wrap script. Resent-From: Jack Hill Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 May 2020 22:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41389 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41389@debbugs.gnu.org Cc: ludo@gnu.org Received: via spool by 41389-submit@debbugs.gnu.org id=B41389.159027425730719 (code B ref 41389); Sat, 23 May 2020 22:51:02 +0000 Received: (at 41389) by debbugs.gnu.org; 23 May 2020 22:50:57 +0000 Received: from localhost ([127.0.0.1]:35986 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jccym-0007zP-Oj for submit@debbugs.gnu.org; Sat, 23 May 2020 18:50:57 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:36266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jccyk-0007z6-EN for 41389@debbugs.gnu.org; Sat, 23 May 2020 18:50:54 -0400 Received: from [2001:470:8:9f5:f948:e83a:c72a:f39b] (helo=alperton.home.eronel.org) by minsky.hcoop.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1jccyf-00041i-6x; Sat, 23 May 2020 18:50:49 -0400 From: Jack Hill Date: Sat, 23 May 2020 18:50:38 -0400 Message-Id: <20200523225039.3207-1-jackhill@jackhill.us> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: 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/guile-xyz.scm (guile-dsv)[arguments]: Add "wrap program" phase. Import target-guile-effective-version from guile-build-system for use in new phase. --- gnu/packages/guile-xyz.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index a1deee32d1..b1c1fd0f62 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2019 Timothy Sample ;;; Copyright © 2019, 2020 Martin Becze ;;; Copyright © 2020 Evan Straw +;;; Copyright © 2020 Jack Hill ;;; ;;; This file is part of GNU Guix. ;;; @@ -467,7 +468,12 @@ you send to a FIFO file.") (inputs `(("guile" ,guile-2.2))) (propagated-inputs `(("guile2.2-lib" ,guile2.2-lib))) (arguments - '(#:phases (modify-phases %standard-phases + `(#:modules (((guix build guile-build-system) + #:select (target-guile-effective-version)) + ,@%gnu-build-system-modules) + #:imported-modules ((guix build guile-build-system) + ,@%gnu-build-system-modules) + #:phases (modify-phases %standard-phases (add-before 'configure 'set-guilesitedir (lambda _ (substitute* "Makefile.in" @@ -482,6 +488,24 @@ $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n")) (("^guilesitedir =.*$") "guilesitedir = \ $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n")) + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (guile-lib (assoc-ref inputs "guile2.2-lib")) + (version (target-guile-effective-version)) + (scm (string-append "/share/guile/site/" + version)) + (go (string-append "/lib/guile/" + version "/site-ccache"))) + (wrap-program (string-append bin "/dsv") + `("GUILE_LOAD_PATH" prefix + (,(string-append out scm) + ,(string-append guile-lib scm))) + `("GUILE_LOAD_COMPILED_PATH" prefix + (,(string-append out go) + ,(string-append guile-lib go))))) #t))))) (home-page "https://github.com/artyom-poptsov/guile-dsv") (synopsis "DSV module for Guile") From patchwork Sat May 23 22:50:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Hill X-Patchwork-Id: 22324 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 72BCD27BBE1; Sat, 23 May 2020 23:51:10 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 ESMTP id 6C95B27BBE3 for ; Sat, 23 May 2020 23:51:09 +0100 (BST) Received: from localhost ([::1]:37120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jccyz-0000Kl-1N for patchwork@mira.cbaines.net; Sat, 23 May 2020 18:51:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jccyt-0000I8-7q for guix-patches@gnu.org; Sat, 23 May 2020 18:51:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52676) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jccys-0004TS-VS for guix-patches@gnu.org; Sat, 23 May 2020 18:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jccys-0007zx-Tm for guix-patches@gnu.org; Sat, 23 May 2020 18:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41389] [PATCH 2/2] gnu: guile-dsv: Build with Guile 3.0. Resent-From: Jack Hill Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 May 2020 22:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41389 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41389@debbugs.gnu.org Cc: ludo@gnu.org Received: via spool by 41389-submit@debbugs.gnu.org id=B41389.159027426130731 (code B ref 41389); Sat, 23 May 2020 22:51:02 +0000 Received: (at 41389) by debbugs.gnu.org; 23 May 2020 22:51:01 +0000 Received: from localhost ([127.0.0.1]:35988 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jccyr-0007zb-2e for submit@debbugs.gnu.org; Sat, 23 May 2020 18:51:01 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:36270) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jccyl-0007z7-Ja for 41389@debbugs.gnu.org; Sat, 23 May 2020 18:50:56 -0400 Received: from [2001:470:8:9f5:f948:e83a:c72a:f39b] (helo=alperton.home.eronel.org) by minsky.hcoop.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1jccyf-00041i-DP; Sat, 23 May 2020 18:50:49 -0400 From: Jack Hill Date: Sat, 23 May 2020 18:50:39 -0400 Message-Id: <20200523225039.3207-2-jackhill@jackhill.us> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200523225039.3207-1-jackhill@jackhill.us> References: <20200523225039.3207-1-jackhill@jackhill.us> 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/guile-xyz.scm (guile-dsv)[inputs]: Replace guile-2.2 with guile-3.0. [propagated-inputs]: Replace guile2.2-lib with guile-lib. [arguments]: Add "configure support guile3.0" phase. (guile2.2-dsv): New variable. --- gnu/packages/guile-xyz.scm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index b1c1fd0f62..8dfce091ef 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -465,8 +465,8 @@ you send to a FIFO file.") ("automake" ,automake) ("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) - (inputs `(("guile" ,guile-2.2))) - (propagated-inputs `(("guile2.2-lib" ,guile2.2-lib))) + (inputs `(("guile" ,guile-3.0))) + (propagated-inputs `(("guile-lib" ,guile-lib))) (arguments `(#:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) @@ -474,6 +474,14 @@ you send to a FIFO file.") #:imported-modules ((guix build guile-build-system) ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases + ;; Support Guile 3.0 in configure from upstream commit + ;; 4c724577ccf19bb88580f72f2f6b166a0447ce3f + (add-before 'bootstrap 'configure-support-guile3.0 + (lambda _ + (substitute* "configure.ac" + (("GUILE_PKG.*") + "GUILE_PKG([3.0 2.0 2.2])")) + #t)) (add-before 'configure 'set-guilesitedir (lambda _ (substitute* "Makefile.in" @@ -493,7 +501,7 @@ $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n")) (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) - (guile-lib (assoc-ref inputs "guile2.2-lib")) + (guile-lib (assoc-ref inputs "guile-lib")) (version (target-guile-effective-version)) (scm (string-append "/share/guile/site/" version)) @@ -515,6 +523,13 @@ delimiter-separated values (DSV) data format. Guile-DSV supports the Unix-style DSV format and RFC 4180 format.") (license license:gpl3+))) +(define-public guile2.2-dsv + (package + (inherit guile-dsv) + (name "guile2.2-dsv") + (inputs `(("guile" ,guile-2.2))) + (propagated-inputs `(("guile-lib" ,guile2.2-lib))))) + (define-public guile-fibers (package (name "guile-fibers")