From unknown Sat Jun 21 10:43:09 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#65226 <65226@debbugs.gnu.org> To: bug#65226 <65226@debbugs.gnu.org> Subject: Status: [PATCH] gnu: scsh: Fix version number and use gexps. Reply-To: bug#65226 <65226@debbugs.gnu.org> Date: Sat, 21 Jun 2025 17:43:09 +0000 retitle 65226 [PATCH] gnu: scsh: Fix version number and use gexps. reassign 65226 guix-patches submitter 65226 Andrew Whatson severity 65226 normal tag 65226 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 11 07:40:36 2023 Received: (at submit) by debbugs.gnu.org; 11 Aug 2023 11:40:36 +0000 Received: from localhost ([127.0.0.1]:45089 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUQVQ-0004Os-8p for submit@debbugs.gnu.org; Fri, 11 Aug 2023 07:40:36 -0400 Received: from lists.gnu.org ([2001:470:142::17]:55070) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUQVL-0004Ob-Qx for submit@debbugs.gnu.org; Fri, 11 Aug 2023 07:40:34 -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 1qUQVG-0005Dj-Hy for guix-patches@gnu.org; Fri, 11 Aug 2023 07:40:26 -0400 Received: from bentleigheast.hosting-cloud.net ([103.146.113.30]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qUQVC-0005WM-3z for guix-patches@gnu.org; Fri, 11 Aug 2023 07:40:26 -0400 X-Mailborder-Info: host=console.hosting-cloud.net, gmt_time=1691754010, scan_time=2.85s X-Mailborder-Spam-Score: 1.3 X-Mailborder-Spam-X: x X-Mailborder-Spam-Report: ALL_TRUSTED, BAYES_05, DKIM_SIGNED, DKIM_INVALID, KAM_DMARC_QUARANTINE, KAM_DMARC_STATUS, X-Sender-id: user_650765867 X-Sender-id: user_650765867 Received: from cp61.hosting-cloud.net (cp61.hosting-cloud.net [103.119.110.239]) (Authenticated sender: user_650765867) by smtp.hosting-cloud.net (Postfix) with ESMTPSA id 1ACBD7CC67 for ; Fri, 11 Aug 2023 21:40:05 +1000 (AEST) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.hosting-cloud.net 1ACBD7CC67 Authentication-Results: smtp.hosting-cloud.net; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=tailcall.au header.i=@tailcall.au header.a=rsa-sha256 header.s=x header.b=VBws8gfR; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tailcall.au ; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject:Cc:To :From:Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date :Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=6RdLze5yBP46wC32l8xbXXZltEZYBWVhHzQYzN1vrCM=; b=V Bws8gfRdRYGHgdjzmGlhOPRnq2//Quoy/wfKOTHWrbyxzSte4nW32B1r01wpH8LfP9zIPtg330B4H JNrb8XyYLFtsrIvXBg8+Wcv+bU/4e9jsW1/d7r/KBFNf6SU2gcrtjljW38zA/uA4vk8Od7mROLjon 62lPhHtfGc7mWtfV5kPDryyxRHWCnm54VSufqy9ABFKu6dhwBLUC9HAuBk7us8KYxiaDmazVT91gp 83MItgH8O41zfxX5bL+S7PieA97ahI/FROtO9QnL5H7HRnKrKSdcompumQy0IQVQ7IXNV+YKnZL5M hWrnHN9D8oVtfyWOWqCc+bLedKe0UyjbA==; X-Spam-Status: No X-HostingCloud-MailScanner-From: whatson@tailcall.au X-HostingCloud-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-2.899, required 4, autolearn=not spam, ALL_TRUSTED -1.00, BAYES_00 -1.90, TVD_RCVD_IP 0.00) X-HostingCloud-MailScanner: Found to be clean X-HostingCloud-MailScanner-ID: 1qUQUp-002vha-0A X-HostingCloud-MailScanner-Information: Please contact the ISP for more information Received: from 121-44-82-37.tpgi.com.au ([121.44.82.37] helo=fumo.fritz.box) by cp61.hosting-cloud.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1qUQUp-002vha-0A; Fri, 11 Aug 2023 21:39:59 +1000 From: Andrew Whatson To: guix-patches@gnu.org Subject: [PATCH] gnu: scsh: Fix version number and use gexps. Date: Fri, 11 Aug 2023 21:39:43 +1000 Message-ID: <2ba7955e538aada24450172a8f05d3b854e6a76d.1691753983.git.whatson@tailcall.au> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AuthUser: whatson@tailcall.au Received-SPF: pass client-ip=103.146.113.30; envelope-from=whatson@tailcall.au; helo=bentleigheast.hosting-cloud.net X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: Andrew Whatson X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) * gnu/packages/shells.scm (scsh)[version] Use latest upstream commit. Use git-version. Correct base version number to 0.7. [arguments]: Use gexps and remove trailing #t in phases. --- gnu/packages/shells.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index aef22efd01..ca0f4c9ee0 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -602,11 +602,11 @@ (define-public xonsh (license license:bsd-2))) (define-public scsh - (let ((commit "114432435e4eadd54334df6b37fcae505079b49f") - (revision "1")) + (let ((commit "4acf6e4ed7b65b46186ef0c9c2a1e10bef8dc052") + (revision "0")) (package (name "scsh") - (version (string-append "0.0.0-" revision "." (string-take commit 7))) + (version (git-version "0.7" revision commit)) (source (origin (method git-fetch) @@ -616,22 +616,22 @@ (define-public scsh (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1ghk08akiz7hff1pndi8rmgamgcrn2mv9asbss9l79d3c2iaav3q")) + "1czrp808v5gs0ci5lmkp3wr3gfkrb3vd5b2iw2hz1bpqgaf6bxpv")) (patches (search-patches "scsh-nonstring-search-path.patch")))) (build-system gnu-build-system) (arguments - `(#:test-target "test" - #:phases - (modify-phases %standard-phases - (add-before 'configure 'replace-rx - (lambda* (#:key inputs #:allow-other-keys) - (let* ((rx (assoc-ref inputs "scheme48-rx")) - (rxpath (string-append rx "/share/scheme48-" - ,(package-version scheme48) + (list + #:test-target "test" + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'replace-rx + (lambda _ + (let ((rxpath (string-append #$scheme48-rx + "/share/scheme48-" + #$(package-version scheme48) "/rx"))) - (delete-file-recursively "rx") - (symlink rxpath "rx")) - #t))))) + (delete-file-recursively "rx") + (symlink rxpath "rx"))))))) (inputs (list scheme48 scheme48-rx)) (native-inputs base-commit: ad4520b92662e42d7d0b1e648b2068300dbb95c8 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 11 07:51:33 2023 Received: (at submit) by debbugs.gnu.org; 11 Aug 2023 11:51:34 +0000 Received: from localhost ([127.0.0.1]:45103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUQg1-0004m1-C8 for submit@debbugs.gnu.org; Fri, 11 Aug 2023 07:51:33 -0400 Received: from lists.gnu.org ([2001:470:142::17]:47494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUQfw-0004lW-GN for submit@debbugs.gnu.org; Fri, 11 Aug 2023 07:51:31 -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 1qUQfp-0008Kd-3J for guix-patches@gnu.org; Fri, 11 Aug 2023 07:51:21 -0400 Received: from shepparton.hosting-cloud.net ([103.146.113.21]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qUQfk-0007Zk-Gd for guix-patches@gnu.org; Fri, 11 Aug 2023 07:51:20 -0400 X-Mailborder-Info: host=console.hosting-cloud.net, gmt_time=1691754669, scan_time=3.81s X-Mailborder-Spam-Score: 1.3 X-Mailborder-Spam-X: x X-Mailborder-Spam-Report: ALL_TRUSTED, BAYES_05, DKIM_SIGNED, DKIM_INVALID, KAM_DMARC_QUARANTINE, KAM_DMARC_STATUS, X-Sender-id: user_650765867 X-Sender-id: user_650765867 Received: from cp61.hosting-cloud.net (cp61.hosting-cloud.net [103.119.110.239]) (Authenticated sender: user_650765867) by smtp.hosting-cloud.net (Postfix) with ESMTPSA id 854127CC67; Fri, 11 Aug 2023 21:51:04 +1000 (AEST) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.hosting-cloud.net 854127CC67 Authentication-Results: smtp.hosting-cloud.net; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=tailcall.au header.i=@tailcall.au header.a=rsa-sha256 header.s=x header.b=WHquaOTk; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tailcall.au ; s=x; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: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=Qy+S+aFuX3GSRK9dft9TS/E7fcbvDDx5B7nqkhk2ohQ=; b=WHquaOTkKmb1L/e3KkLiYbR/3W C4WcrcvROW8XlRWTa9Pbj3s5YJNIGoY+YnHnubqCtdWS8XRMvi8fK5bhxHaJ4DTjHcnDF6qSUU63e Ydp0XjHrKAypqStIoFBDt1d+1MANLDcs42AnBW8TsGU87jwdfIp+97LQ99728U+OZs5s+OEkABn2l zI2WXGFIZbPsUwJgvao34xoi+RkBlLYMszbqINGc6IcGRgH9pQcUPb6hq3bgszKEsARwiSmOA8scl CkzIlF/XtKYaMNPcvuiiPkk7PldXRzln0reltWwY/UgDNmHlX5u8Yr7uW/Fiuvkgxj/gQm+He6okF EIEzkGhg==; X-Spam-Status: No X-HostingCloud-MailScanner-From: whatson@tailcall.au X-HostingCloud-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-2.899, required 4, autolearn=not spam, ALL_TRUSTED -1.00, BAYES_00 -1.90, TVD_RCVD_IP 0.00) X-HostingCloud-MailScanner: Found to be clean X-HostingCloud-MailScanner-ID: 1qUQfS-003Gm8-2d X-HostingCloud-MailScanner-Information: Please contact the ISP for more information Received: from 121-44-82-37.tpgi.com.au ([121.44.82.37] helo=fumo.fritz.box) by cp61.hosting-cloud.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1qUQfS-003Gm8-2d; Fri, 11 Aug 2023 21:50:58 +1000 From: Andrew Whatson To: guix-patches@gnu.org, 65226@debbugs.gnu.org Subject: [PATCH v2] gnu: scsh: Fix version number and use gexps. Date: Fri, 11 Aug 2023 21:48:40 +1000 Message-ID: <0380706921f8f64cf116af4f7479d6dfebb951ab.1691754518.git.whatson@tailcall.au> X-Mailer: git-send-email 2.41.0 In-Reply-To: <2ba7955e538aada24450172a8f05d3b854e6a76d.1691753983.git.whatson@tailcall.au> References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AuthUser: whatson@tailcall.au Received-SPF: pass client-ip=103.146.113.21; envelope-from=whatson@tailcall.au; helo=shepparton.hosting-cloud.net X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: Andrew Whatson X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) * gnu/packages/shells.scm (scsh)[version] Use latest upstream commit. Use git-version. Correct base version number to 0.7. [source]: Use git-file-name. [arguments]: Use gexps and remove trailing #t in phases. --- gnu/packages/shells.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index aef22efd01..62b682496e 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -602,36 +602,36 @@ (define-public xonsh (license license:bsd-2))) (define-public scsh - (let ((commit "114432435e4eadd54334df6b37fcae505079b49f") - (revision "1")) + (let ((commit "4acf6e4ed7b65b46186ef0c9c2a1e10bef8dc052") + (revision "0")) (package (name "scsh") - (version (string-append "0.0.0-" revision "." (string-take commit 7))) + (version (git-version "0.7" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/scheme/scsh") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 - "1ghk08akiz7hff1pndi8rmgamgcrn2mv9asbss9l79d3c2iaav3q")) + "1czrp808v5gs0ci5lmkp3wr3gfkrb3vd5b2iw2hz1bpqgaf6bxpv")) (patches (search-patches "scsh-nonstring-search-path.patch")))) (build-system gnu-build-system) (arguments - `(#:test-target "test" - #:phases - (modify-phases %standard-phases - (add-before 'configure 'replace-rx - (lambda* (#:key inputs #:allow-other-keys) - (let* ((rx (assoc-ref inputs "scheme48-rx")) - (rxpath (string-append rx "/share/scheme48-" - ,(package-version scheme48) + (list + #:test-target "test" + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'replace-rx + (lambda _ + (let ((rxpath (string-append #$scheme48-rx + "/share/scheme48-" + #$(package-version scheme48) "/rx"))) - (delete-file-recursively "rx") - (symlink rxpath "rx")) - #t))))) + (delete-file-recursively "rx") + (symlink rxpath "rx"))))))) (inputs (list scheme48 scheme48-rx)) (native-inputs base-commit: ad4520b92662e42d7d0b1e648b2068300dbb95c8 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 12 17:14:41 2023 Received: (at 65226-done) by debbugs.gnu.org; 12 Aug 2023 21:14:41 +0000 Received: from localhost ([127.0.0.1]:57679 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUvwW-0003eB-VO for submit@debbugs.gnu.org; Sat, 12 Aug 2023 17:14:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41130) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUvwU-0003dv-IW for 65226-done@debbugs.gnu.org; Sat, 12 Aug 2023 17:14:39 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qUvwL-0007VP-LF; Sat, 12 Aug 2023 17:14:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=4senHkBwN9x84gVfHTZ6Fu5+PXoMcYJHK1lXuEnByBE=; b=Wi65Hgzmt68eDz0tzZRK JG4DOkgN7OzOPuJUOFVlau7/cG5j3h3AO6z1he2mAAZsc/XiptYTr7gh+9V6eXvVN0v4RSzxK5dw1 oMKQZ0b24+2Kag/YkU1Tu8GGTS4Vwd0HliJ3/yeoPBjNQ0MWjYr5QSz1iqvDwdKM7JnLhpFH1Mguv YX2K81B+LbhMqeRl9mW0aKZf92q3BINo1HjmfTuCTltQj8sH073yQSQ2aP4GJc7RtD5BJBgta0exr QFz/bvrgoz3GQ+Z6XaRjrjAJjmSX4RHXfMUIRSO7w5cc32afvXB70DpnY39SQaiC1IQq5xQhXOKIh d7nAJVyJ2f8Vpw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Andrew Whatson Subject: Re: bug#65226: [PATCH] gnu: scsh: Fix version number and use gexps. References: <0380706921f8f64cf116af4f7479d6dfebb951ab.1691754518.git.whatson@tailcall.au> Date: Sat, 12 Aug 2023 23:14:27 +0200 In-Reply-To: <0380706921f8f64cf116af4f7479d6dfebb951ab.1691754518.git.whatson@tailcall.au> (Andrew Whatson's message of "Fri, 11 Aug 2023 21:48:40 +1000") Message-ID: <87zg2warpo.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65226-done Cc: 65226-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Andrew Whatson skribis: > * gnu/packages/shells.scm (scsh)[version] Use latest upstream commit. > Use git-version. Correct base version number to 0.7. > [source]: Use git-file-name. > [arguments]: Use gexps and remove trailing #t in phases. Applied, thanks! Ludo=E2=80=99. From unknown Sat Jun 21 10:43:09 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 10 Sep 2023 11:24:10 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator