From patchwork Wed Mar 3 01:15:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?L=C3=A9o_Le_Bouter?= X-Patchwork-Id: 27418 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 B8C3227BC4F; Wed, 3 Mar 2021 01:16:13 +0000 (GMT) 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_H3,RCVD_IN_MSPIKE_WL,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 C988327BC50 for ; Wed, 3 Mar 2021 01:16:12 +0000 (GMT) Received: from localhost ([::1]:49918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHG7X-00076G-VX for patchwork@mira.cbaines.net; Tue, 02 Mar 2021 20:16:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHG7O-00075z-OT for guix-patches@gnu.org; Tue, 02 Mar 2021 20:16:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43154) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lHG7O-0002qv-Fy for guix-patches@gnu.org; Tue, 02 Mar 2021 20:16:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lHG7O-00053c-Bv for guix-patches@gnu.org; Tue, 02 Mar 2021 20:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46885] [PATCH] gnu: artanis: Update to 0.5. Resent-From: =?utf-8?q?L=C3=A9o?= Le Bouter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Mar 2021 01:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46885@debbugs.gnu.org Cc: =?utf-8?q?L=C3=A9o?= Le Bouter X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161473412319390 (code B ref -1); Wed, 03 Mar 2021 01:16:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Mar 2021 01:15:23 +0000 Received: from localhost ([127.0.0.1]:54700 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lHG6l-00052g-3d for submit@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 ) id 1lHG6i-00052Y-Dd for submit@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 ) id 1lHG6h-00071H-49 for guix-patches@gnu.org; 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 ) id 1lHG6d-0002im-9S for guix-patches@gnu.org; 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@zaclys.net 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= Date: Wed, 3 Mar 2021 02:15:02 +0100 Message-Id: <20210303011502.15822-1-lle-bout@zaclys.net> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Received-SPF: pass client-ip=178.33.93.72; envelope-from=lle-bout@zaclys.net; 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-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" Reply-to: =?utf-8?q?L=C3=A9o?= Le Bouter X-ACL-Warn: , =?utf-8?q?L=C3=A9o?= Le Bouter via Guix-patches X-Patchwork-Original-From: =?utf-8?q?L=C3=A9o?= Le Bouter via Guix-patches via From: =?utf-8?q?L=C3=A9o_Le_Bouter?= X-getmail-retrieved-from-mailbox: Patches * 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")))