From patchwork Fri Aug 11 11:48:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Whatson X-Patchwork-Id: 52743 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 781E127BBEA; Fri, 11 Aug 2023 12:52:24 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 77B3A27BBE9 for ; Fri, 11 Aug 2023 12:52:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUQgc-0008Sk-8F; Fri, 11 Aug 2023 07:52:10 -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 1qUQgU-0008SE-BZ for guix-patches@gnu.org; Fri, 11 Aug 2023 07:52:02 -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 1qUQgU-0007ih-3W for guix-patches@gnu.org; Fri, 11 Aug 2023 07:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qUQgT-0004mm-OU for guix-patches@gnu.org; Fri, 11 Aug 2023 07:52:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65226] [PATCH v2] gnu: scsh: Fix version number and use gexps. Resent-From: Andrew Whatson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 11 Aug 2023 11:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65226 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65226@debbugs.gnu.org Cc: Andrew Whatson X-Debbugs-Original-To: guix-patches@gnu.org, 65226@debbugs.gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169175469418357 (code B ref -1); Fri, 11 Aug 2023 11:52:01 +0000 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-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 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 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-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: , Reply-to: Andrew Whatson X-ACL-Warn: , Andrew Whatson via Guix-patches X-Patchwork-Original-From: Andrew Whatson via Guix-patches via From: Andrew Whatson 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/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(-) base-commit: ad4520b92662e42d7d0b1e648b2068300dbb95c8 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