From patchwork Tue Aug 24 20:33:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 32245 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 AD7DB27BC82; Tue, 24 Aug 2021 21:34: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 3742127BC78 for ; Tue, 24 Aug 2021 21:34:14 +0100 (BST) Received: from localhost ([::1]:48782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mId7d-00047j-AL for patchwork@mira.cbaines.net; Tue, 24 Aug 2021 16:34:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mId7S-00046x-S2 for guix-patches@gnu.org; Tue, 24 Aug 2021 16:34:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33760) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mId7S-0003fe-Kn for guix-patches@gnu.org; Tue, 24 Aug 2021 16:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mId7S-0008S8-GF for guix-patches@gnu.org; Tue, 24 Aug 2021 16:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#46885] [PATCH v2 1/2] gnu: artanis: Remove hard-coded guile effective version. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 24 Aug 2021 20:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: Arun Isaac , 46885@debbugs.gnu.org Received: via spool by 46885-submit@debbugs.gnu.org id=B46885.162983720132425 (code B ref 46885); Tue, 24 Aug 2021 20:34:02 +0000 Received: (at 46885) by debbugs.gnu.org; 24 Aug 2021 20:33:21 +0000 Received: from localhost ([127.0.0.1]:45302 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mId6i-0008Qc-DK for submit@debbugs.gnu.org; Tue, 24 Aug 2021 16:33:20 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:46306) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mId6f-0008QK-CZ for 46885@debbugs.gnu.org; Tue, 24 Aug 2021 16:33:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=BkjW8yiz4tec2zj+pf6Fn7OFMPN8Fgv3lGfRACEDufU=; b=W5xLJkdf9dHbSapKQyH6/lgCJ7 gTeAVgd7/rQlCDmeoH7b3HLApb3Sc4vKx0/rl3V0KOk9AYKOBh5qZDPjpH1KIguKhmXQQAkMkxcHM xoKBycR8UJs0DGYp593jjJtTJY14Qe6i7ZWHBKBHPpArBfn8BiVsSlXKl68qmqCQq3G6vuJwA0ciC 58ZDDxA8pflax+rYJGYh/Gv6b9qj/CUev0rABIxl2QqZ0/vdux52fuL2RDGmBXPwDZaGpZv43mGu0 fvKDzitOVanF85y+lwDjuCQw4vrb2glIM48ckna822H+O2XeEa2WUr9VeOSFuaCH1VczJVoGH/xIP q1Gq1lCg==; Received: from [192.168.2.1] (port=5698 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mId6c-000JIt-Eq; Wed, 25 Aug 2021 02:03:10 +0530 From: Arun Isaac Date: Wed, 25 Aug 2021 02:03:07 +0530 Message-Id: <20210824203308.8402-2-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.32.0 In-Reply-To: <87k0q5xyau.fsf@gnu.org> References: <87k0q5xyau.fsf@gnu.org> 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 (artanis)[arguments]: Import target-guile-effective-version from (guix build guile-build-system). Use target-guile-effective-version to determine the guile effective version. --- gnu/packages/guile-xyz.scm | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index db31ada7b9..5f457d8ae4 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2017 Nikita ;;; Copyright © 2017, 2018, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2021 Maxim Cournoyer -;;; Copyright © 2018, 2019, 2020 Arun Isaac +;;; Copyright © 2018, 2019, 2020, 2021 Arun Isaac ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2019 swedebugia @@ -182,11 +182,20 @@ ("pkgconfig" ,pkg-config) ("util-linux" ,util-linux))) ;for the `script' command (arguments - '(#:make-flags + `(#: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) + #:make-flags ;; TODO: The documentation must be built with the `docs' target. (let* ((out (assoc-ref %outputs "out")) - (scm (string-append out "/share/guile/site/2.2")) - (go (string-append out "/lib/guile/2.2/site-ccache"))) + ;; We pass guile explicitly here since this executes before the + ;; set-paths phase and therefore guile is not yet in PATH. + (effective-version (target-guile-effective-version + (assoc-ref %build-inputs "guile"))) + (scm (string-append out "/share/guile/site/" effective-version)) + (go (string-append out "/lib/guile/" effective-version "/site-ccache"))) ;; Don't use (%site-dir) for site paths. (list (string-append "MOD_PATH=" scm) (string-append "MOD_COMPILED_PATH=" go))) @@ -199,7 +208,9 @@ (("\\(%site-dir\\)") (string-append "\"" (assoc-ref outputs "out") - "/share/guile/site/2.2\""))))) + "/share/guile/site/" + (target-guile-effective-version) + "\""))))) (add-after 'unpack 'patch-reference-to-libnss (lambda* (#:key inputs #:allow-other-keys) (substitute* "artanis/security/nss.scm" @@ -221,9 +232,11 @@ (add-after 'install 'wrap-art (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) + (effective-version (target-guile-effective-version)) (bin (string-append out "/bin")) - (scm (string-append out "/share/guile/site/2.2")) - (go (string-append out "/lib/guile/2.2/site-ccache"))) + (scm (string-append out "/share/guile/site/" effective-version)) + (go (string-append out "/lib/guile/" effective-version + "/site-ccache"))) (wrap-program (string-append bin "/art") `("GUILE_LOAD_PATH" ":" prefix (,scm ,(getenv "GUILE_LOAD_PATH"))) From patchwork Tue Aug 24 20:33:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 32246 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 1621627BC78; Tue, 24 Aug 2021 21:34: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 9F21027BC6B for ; Tue, 24 Aug 2021 21:34:14 +0100 (BST) Received: from localhost ([::1]:48800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mId7d-00048h-LW for patchwork@mira.cbaines.net; Tue, 24 Aug 2021 16:34:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46090) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mId7T-000475-7O for guix-patches@gnu.org; Tue, 24 Aug 2021 16:34:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33761) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mId7S-0003g4-VL for guix-patches@gnu.org; Tue, 24 Aug 2021 16:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mId7S-0008SF-T0 for guix-patches@gnu.org; Tue, 24 Aug 2021 16:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#46885] [PATCH v2 2/2] gnu: artanis: Update to 0.5. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 24 Aug 2021 20:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: =?utf-8?q?L=C3=A9o?= Le Bouter , 46885@debbugs.gnu.org, Arun Isaac Received: via spool by 46885-submit@debbugs.gnu.org id=B46885.162983720232433 (code B ref 46885); Tue, 24 Aug 2021 20:34:02 +0000 Received: (at 46885) by debbugs.gnu.org; 24 Aug 2021 20:33:22 +0000 Received: from localhost ([127.0.0.1]:45305 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mId6o-0008R2-1z for submit@debbugs.gnu.org; Tue, 24 Aug 2021 16:33:22 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:46310) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mId6j-0008Qj-8S for 46885@debbugs.gnu.org; Tue, 24 Aug 2021 16:33:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=eqAmki2dYOyksh1hA2co2vb8WGujk5ebxlcdrA51YBY=; b=Cr5CwWonLm0VluosuW+zUtb3UA t2BjWq5jR5DldBz1WVgXzSl7cnJvCRt7qNpjEo1G+sdsCml4EIJT/vmOEgVMVGYvxA666tR3DNSb8 lAgGKc2RW3IPzpymVOMyS/c4Afv6LhAz1YmP3g/TDRqjFId5TctMEupNmF36sd96M8A3Ga1HUGVox PuS4cnNF9/Kw8LaELhAlP4DX9lTu/t+uNSyt42sKSTo9soNDNP1AT5xgLTa+FjSpIAVD1bChbLNWN i6FpBaBZWzRGi2oRzpX+U9XxkccGvuZiFuTqhqdNB1/w0F0YgvP+AsvjfPxx5OWIC0KXNDvYM75Iu EdQ40nBg==; Received: from [192.168.2.1] (port=5698 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mId6c-000JIt-Jf; Wed, 25 Aug 2021 02:03:10 +0530 From: Arun Isaac Date: Wed, 25 Aug 2021 02:03:08 +0530 Message-Id: <20210824203308.8402-3-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.32.0 In-Reply-To: <87k0q5xyau.fsf@gnu.org> References: <87k0q5xyau.fsf@gnu.org> 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 From: Léo Le Bouter * gnu/packages/guile-xyz.scm (artanis): Update to 0.5. [inputs]: Replace guile-2.2 with guile-3.0. Add nspr. [propagated-inputs]: Replace guile-json-1 with guile-json-3, guile2.2-readline with guile-readline, and guile2.2-redis with guile-redis. [arguments]: Do not return #t from custom phases. Signed-off-by: Arun Isaac --- gnu/packages/guile-xyz.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 5f457d8ae4..06576fd7dc 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -128,14 +128,14 @@ (define-public artanis (package (name "artanis") - (version "0.4.1") + (version "0.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/artanis/artanis-" version ".tar.gz")) (sha256 (base32 - "0nnmdfx5xwcc3kck64var7msz7g3qk817d7bv9l159nkmic0v9w4")) + "1vk1kp2xhz35xa5n27cxlq9c88wk6qm7fqaac8rb0pb6k9pvsv7v")) (modules '((guix build utils))) (snippet '(begin @@ -167,16 +167,17 @@ #t)))) (build-system gnu-build-system) (inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) + ("nspr" ,nspr) ("nss" ,nss))) ;; FIXME the bundled csv contains one more exported procedure ;; (sxml->csv-string) than guile-csv. The author is maintainer of both ;; projects. ;; TODO: Add guile-dbi and guile-dbd optional dependencies. (propagated-inputs - `(("guile-json" ,guile-json-1) ; This is already using guile-2.2. - ("guile-readline" ,guile2.2-readline) - ("guile-redis" ,guile2.2-redis))) + `(("guile-json" ,guile-json-3) + ("guile-readline" ,guile-readline) + ("guile-redis" ,guile-redis))) (native-inputs `(("bash" ,bash) ;for the `source' builtin ("pkgconfig" ,pkg-config) @@ -218,8 +219,10 @@ (string-append "ffi-binding \"" (assoc-ref inputs "nss") "/lib/nss/libnss3.so" - "\""))) - #t)) + "\"")) + (("ffi-binding \"libssl3\"") + (string-append + "ffi-binding \"" (assoc-ref inputs "nss") "/lib/nss/libssl3.so\""))))) (add-before 'install 'substitute-root-dir (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -227,8 +230,7 @@ ((" /etc/bash.bashrc") " /dev/null")) (substitute* "Makefile" ;set the root of config files to OUT ((" /etc") (string-append " " out "/etc"))) - (mkdir-p (string-append out "/bin")) ;for the `art' executable - #t))) + (mkdir-p (string-append out "/bin")) ))) (add-after 'install 'wrap-art (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -241,8 +243,7 @@ `("GUILE_LOAD_PATH" ":" prefix (,scm ,(getenv "GUILE_LOAD_PATH"))) `("GUILE_LOAD_COMPILED_PATH" ":" prefix - (,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))) - #t)))))) + (,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))))))))) (synopsis "Web application framework written in Guile") (description "GNU Artanis is a web application framework written in Guile Scheme. A web application framework (WAF) is a software framework that is