From patchwork Fri May 9 16:03:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Z572 X-Patchwork-Id: 42484 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 43BE627BC4B; Fri, 9 May 2025 17:04:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AE3CA27BC49 for ; Fri, 9 May 2025 17:04:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uDQCy-0005uQ-Mn; Fri, 09 May 2025 12:04:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uDQCi-0005fo-Kj for guix-patches@gnu.org; Fri, 09 May 2025 12:04:09 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uDQCg-0004S6-VI for guix-patches@gnu.org; Fri, 09 May 2025 12:04:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=C6ZMXuWjlCbv1KsVztuYzNLJi93VZFMq+HuvNKRtUKk=; b=B5Ucwk9euPXODcWJQ6Wgx1k8iZsZNs7GECP24IGYgu7Ym9fmggO1VnPEBjdOQ+uBaMXSR47ou3oFzMkyRq2WFFSVEYnW+OsS+aaEgZdWb3fAJr8Q2FM4av6e4bbSxg7tVD2G/LqYGpCtr0uxSoj0uFdHFs9vzskcVQ/zAM0244V//InUwDhcIehi+NIdwoeQsrydzeX/+/1TSxvjq9Nft+AfE5/9M2gDEKjbqwH9kual/ZXRLbEv3qIEXYGjP2ydK/n6SzUx+nx1smPhZl8+HrEneQSJsuuMCeRHdiQ96rx0MvGjBkTJ9T9G116YFolwoeFn24zHp853E781G0IUIA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uDQCg-0004Si-KE for guix-patches@gnu.org; Fri, 09 May 2025 12:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78335] [PATCH] gnu: direnv: Update to 2.36.0. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 May 2025 16:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78335 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78335@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174680664017142 (code B ref -1); Fri, 09 May 2025 16:04:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 May 2025 16:04:00 +0000 Received: from localhost ([127.0.0.1]:38718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uDQCc-0004SP-Vn for submit@debbugs.gnu.org; Fri, 09 May 2025 12:03:59 -0400 Received: from lists.gnu.org ([2001:470:142::17]:38992) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uDQCY-0004Rm-4n for submit@debbugs.gnu.org; Fri, 09 May 2025 12:03:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uDQCQ-0004k4-B5 for guix-patches@gnu.org; Fri, 09 May 2025 12:03:46 -0400 Received: from mail.z572.online ([88.99.160.180]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uDQCO-0004KQ-DL for guix-patches@gnu.org; Fri, 09 May 2025 12:03:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=z572.online; s=me; t=1746807038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=C6ZMXuWjlCbv1KsVztuYzNLJi93VZFMq+HuvNKRtUKk=; b=Evk/QPJ1JC9bNT/FYtMFPRaLTkoJXqBQ/fAdnh+Fn4oc7lzvX2lj4hzs+vKx6DsoFfnjsv ag/HYVLtnoPgPlIvZE+QjwaQvbh81OiyrxJ2ccQurDioLDhox7b1wNRML1qg/LeAro8nVR aL9EUxI0Qg/eOAcuuR6KYtCEZ+KrwTM= Received: from m.tailaa68d.ts.net ( [61.174.159.83]) by mail.z572.online (OpenSMTPD) with ESMTPSA id da41c757 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 9 May 2025 16:10:37 +0000 (UTC) From: Zheng Junjie Date: Sat, 10 May 2025 00:03:33 +0800 Message-ID: <8520b2135d3f44697717d7bfcc53afdb0db9f53b.1746806613.git.z572@z572.online> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=88.99.160.180; envelope-from=z572@z572.online; helo=mail.z572.online X-Spam_score_int: 4 X-Spam_score: 0.4 X-Spam_bar: / X-Spam_report: (0.4 / 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, FROM_SUSPICIOUS_NTLD=0.5, FROM_SUSPICIOUS_NTLD_FP=0.001, PDS_OTHER_BAD_TLD=1.999, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/shellutils.scm (direnv): Update to 2.36.0. [arguments]: Use G-expressions. Change-Id: Icc3a96a8a5d44fa48b2ef3af68714776dd497102 --- gnu/packages/shellutils.scm | 55 ++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 28 deletions(-) base-commit: f348d2be2e019fcda44af8ab81073e2f04697a38 diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index ea6dcafbc94..6c1bd0dc17d 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -742,7 +742,7 @@ (define-public tran (define-public direnv (package (name "direnv") - (version "2.35.0") + (version "2.36.0") (source (origin (method git-fetch) (uri (git-reference @@ -751,35 +751,34 @@ (define-public direnv (file-name (git-file-name name version)) (sha256 (base32 - "0l9pziv5nxlq6dxbsqrfl6z4ibq171wfx6wmjs392cdn5w2n908b")))) + "0p6n9zi3p9frj3ndnpdc1cz51hq0nkyjc9b1rqg7967l8vhdr8f6")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/direnv/direnv" - #:phases - (modify-phases %standard-phases - (add-after 'install 'install-manpages - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (man (string-append out "/share/man/man1"))) - (mkdir-p man) - (with-directory-excursion "src/github.com/direnv/direnv" - (install-file "man/direnv.1" man) - (install-file "man/direnv-stdlib.1" man) - (install-file "man/direnv.toml.1" man))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "HOME" "/tmp") - (with-directory-excursion "src/github.com/direnv/direnv" - ;; The following file needs to be writable so it can be - ;; modified by the testsuite. - (make-file-writable "test/scenarios/base/.envrc") - ;; We need to manually run test because make test - ;; tries to use go modules - (invoke "go" "test" "./...") - ;; Clean up from the tests, especially so that the extra - ;; direnv executable that's generated is removed. - (invoke "make" "clean")))))))) + (list #:import-path "github.com/direnv/direnv" + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-manpages + (lambda _ + (let* ((man (string-append #$output "/share/man/man1"))) + (mkdir-p man) + (with-directory-excursion "src/github.com/direnv/direnv" + (install-file "man/direnv.1" man) + (install-file "man/direnv-stdlib.1" man) + (install-file "man/direnv.toml.1" man))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" "/tmp") + (with-directory-excursion "src/github.com/direnv/direnv" + ;; The following file needs to be writable so it can be + ;; modified by the testsuite. + (make-file-writable "test/scenarios/base/.envrc") + ;; We need to manually run test because make test + ;; tries to use go modules + (invoke "go" "test" "./...") + ;; Clean up from the tests, especially so that the extra + ;; direnv executable that's generated is removed. + (invoke "make" "clean")))))))) (native-inputs (list go-github-com-burntsushi-toml go-github-com-mattn-go-isatty