Received: (at 46885) by debbugs.gnu.org; 17 Mar 2021 21:31:15 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Mar 17 17:31:15 2021 Received: from localhost ([127.0.0.1]:44327 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1lMdl5-0004hK-4B for submit <at> debbugs.gnu.org; Wed, 17 Mar 2021 17:31:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1lMdl4-0004h6-3l for 46885 <at> debbugs.gnu.org; Wed, 17 Mar 2021 17:31:14 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44162) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1lMdky-0004AL-JM; Wed, 17 Mar 2021 17:31:08 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=48796 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from <ludo@HIDDEN>) id 1lMdkx-0001xx-0k; Wed, 17 Mar 2021 17:31:07 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: =?utf-8?Q?L=C3=A9o?= Le Bouter <lle-bout@HIDDEN> Subject: Re: bug#46885: [PATCH] gnu: artanis: Update to 0.5. References: <20210303011502.15822-1-lle-bout@HIDDEN> Date: Wed, 17 Mar 2021 22:31:05 +0100 In-Reply-To: <20210303011502.15822-1-lle-bout@HIDDEN> (=?utf-8?Q?=22L?= =?utf-8?Q?=C3=A9o?= Le Bouter"'s message of "Wed, 3 Mar 2021 02:15:02 +0100") Message-ID: <87k0q5xyau.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 46885 Cc: 46885 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) Hi, L=C3=A9o Le Bouter <lle-bout@HIDDEN> skribis: > * gnu/packages/guile-xyz.scm (artanis): Update to 0.5. > [inputs]: Remove guile-2.2; add guile-3.0-latest and nspr. > [propagated-inputs]: Remove guile-json-1, guile2.2-readline, and guile2.2= -redis; add guile-json-3, guile-readline, and guile-redis. [...] > (inputs > - `(("guile" ,guile-2.2) > - ("nss" ,nss))) > + `(("guile" ,guile-3.0-latest) Just =E2=80=98guile-3.0=E2=80=99 (unless there=E2=80=99s a good reason to u= se =E2=80=98guile-3.0-latest=E2=80=99?). Otherwise LGTM! > (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"))) > + (scm (string-append out "/share/guile/site/3.0")) > + (go (string-append out "/lib/guile/3.0/site-ccache"))) > ;; Don't use (%site-dir) for site paths. > (list (string-append "MOD_PATH=3D" scm) > (string-append "MOD_COMPILED_PATH=3D" go))) > @@ -193,7 +194,7 @@ > (("\\(%site-dir\\)") > (string-append "\"" > (assoc-ref outputs "out") > - "/share/guile/site/2.2\""))))) > + "/share/guile/site/3.0\""))))) [...] > - (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/3.0")) > + (go (string-append out "/lib/guile/3.0/site-ccache"= ))) Perhaps for a separate patch, but it would be best to avoid hardcoding the Guile effective version number. The other packages show how to accomplish this. Ideally, Makefile.am & co. would refer to $(GUILE_EFFECTIVE_VERSION). When that=E2=80=99s not the= case (yet), we can patch them to do so, as is done for several packages in guile-xyz.scm. Thanks, Ludo=E2=80=99.
guix-patches@HIDDEN
:bug#46885
; Package guix-patches
.
Full text available.Received: (at submit) by debbugs.gnu.org; 3 Mar 2021 01:15:23 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 02 20:15:23 2021 Received: from localhost ([127.0.0.1]:54700 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1lHG6l-00052g-3d for submit <at> debbugs.gnu.org; Tue, 02 Mar 2021 20:15:23 -0500 Received: from lists.gnu.org ([209.51.188.17]:51510) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <lle-bout@HIDDEN>) id 1lHG6i-00052Y-Dd for submit <at> debbugs.gnu.org; Tue, 02 Mar 2021 20:15:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45912) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <lle-bout@HIDDEN>) id 1lHG6h-00071H-49 for guix-patches@HIDDEN; Tue, 02 Mar 2021 20:15:19 -0500 Received: from mail.zaclys.net ([178.33.93.72]:39849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <lle-bout@HIDDEN>) id 1lHG6d-0002im-9S for guix-patches@HIDDEN; Tue, 02 Mar 2021 20:15:18 -0500 Received: from localhost.localdomain (82-64-145-38.subs.proxad.net [82.64.145.38]) (authenticated bits=0) by mail.zaclys.net (8.14.7/8.14.7) with ESMTP id 1231FAAK058370 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Wed, 3 Mar 2021 02:15:10 +0100 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.zaclys.net 1231FAAK058370 Authentication-Results: mail.zaclys.net; dmarc=fail (p=reject dis=none) header.from=zaclys.net Authentication-Results: mail.zaclys.net; spf=fail smtp.mailfrom=lle-bout@HIDDEN DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zaclys.net; s=default; t=1614734110; bh=7JJeK7IZhRTT9/AYUKG9e5Ma7tOvEjIRXeicEp9SKmI=; h=From:To:Cc:Subject:Date:From; b=Nvw2ChmhCScBOug2bM7mQtAGRvovidkPz0VfbhNJjNYZjzKgyja3gx6cYFuHU3BzD T+lguD+FTTNQYm+IJZTsCYjEnXoxvtnU/jfXe6prZRkRKv0k1AXYLeT7rigVFF0+TZ ZW2Y8ZQfTld7sNkmrfFMLXtTvJGtxI7Bp0MkbGOw= From: =?UTF-8?q?L=C3=A9o=20Le=20Bouter?= <lle-bout@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH] gnu: artanis: Update to 0.5. Date: Wed, 3 Mar 2021 02:15:02 +0100 Message-Id: <20210303011502.15822-1-lle-bout@HIDDEN> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.33.93.72; envelope-from=lle-bout@HIDDEN; helo=mail.zaclys.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?L=C3=A9o=20Le=20Bouter?= <lle-bout@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.3 (--) * gnu/packages/guile-xyz.scm (artanis): Update to 0.5. [inputs]: Remove guile-2.2; add guile-3.0-latest and nspr. [propagated-inputs]: Remove guile-json-1, guile2.2-readline, and guile2.2-redis; add guile-json-3, guile-readline, and guile-redis. --- gnu/packages/guile-xyz.scm | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 45b3a82d00..9b3e0b04ec 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -122,14 +122,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 @@ -161,16 +161,17 @@ #t)))) (build-system gnu-build-system) (inputs - `(("guile" ,guile-2.2) - ("nss" ,nss))) + `(("guile" ,guile-3.0-latest) + ("nss" ,nss) + ("nspr" ,nspr))) ;; 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) @@ -179,8 +180,8 @@ '(#: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"))) + (scm (string-append out "/share/guile/site/3.0")) + (go (string-append out "/lib/guile/3.0/site-ccache"))) ;; Don't use (%site-dir) for site paths. (list (string-append "MOD_PATH=" scm) (string-append "MOD_COMPILED_PATH=" go))) @@ -193,7 +194,7 @@ (("\\(%site-dir\\)") (string-append "\"" (assoc-ref outputs "out") - "/share/guile/site/2.2\""))))) + "/share/guile/site/3.0\""))))) (add-after 'unpack 'patch-reference-to-libnss (lambda* (#:key inputs #:allow-other-keys) (substitute* "artanis/security/nss.scm" @@ -201,6 +202,11 @@ (string-append "ffi-binding \"" (assoc-ref inputs "nss") "/lib/nss/libnss3.so" + "\"")) + (("ffi-binding \"libssl3\"") + (string-append + "ffi-binding \"" + (assoc-ref inputs "nss") "/lib/nss/libssl3.so" "\""))) #t)) (add-before 'install 'substitute-root-dir @@ -216,8 +222,8 @@ (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (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/3.0")) + (go (string-append out "/lib/guile/3.0/site-ccache"))) (wrap-program (string-append bin "/art") `("GUILE_LOAD_PATH" ":" prefix (,scm ,(getenv "GUILE_LOAD_PATH"))) -- 2.30.1
Léo Le Bouter <lle-bout@HIDDEN>
:guix-patches@HIDDEN
.
Full text available.guix-patches@HIDDEN
:bug#46885
; Package guix-patches
.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.