From patchwork Mon May 29 23:46:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kiasoc5 X-Patchwork-Id: 50476 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 0F74427BBE9; Tue, 30 May 2023 00:49:22 +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=unavailable 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 59F0E27BBE2 for ; Tue, 30 May 2023 00:49:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3mbo-0001bl-Ek; Mon, 29 May 2023 19:49:04 -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 1q3mbn-0001bW-6f for guix-patches@gnu.org; Mon, 29 May 2023 19:49:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q3mbm-0005v5-Uu for guix-patches@gnu.org; Mon, 29 May 2023 19:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3mbm-0004uw-CJ for guix-patches@gnu.org; Mon, 29 May 2023 19:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63795] [PATCH] gnu: blesh: Update to 0.4.0-devel3. Resent-From: kiasoc5 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 May 2023 23:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63795 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63795@debbugs.gnu.org Cc: kiasoc5 X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168540408818728 (code B ref -1); Mon, 29 May 2023 23:49:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 May 2023 23:48:08 +0000 Received: from localhost ([127.0.0.1]:59450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3mat-0004ry-Jk for submit@debbugs.gnu.org; Mon, 29 May 2023 19:48:08 -0400 Received: from lists.gnu.org ([209.51.188.17]:58692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3mar-0004rh-Of for submit@debbugs.gnu.org; Mon, 29 May 2023 19:48:06 -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 1q3mar-0001YG-Hb for guix-patches@gnu.org; Mon, 29 May 2023 19:48:05 -0400 Received: from knopi.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q3mam-0005lM-58 for guix-patches@gnu.org; Mon, 29 May 2023 19:48:05 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 3FB2D451CC; Tue, 30 May 2023 01:47:57 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id do2YfT1YNbVw; Tue, 30 May 2023 01:47:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1685404075; bh=WkQyv4smQP2o/2tHtbxW6a318mOkA3te6cXQKsHLKCQ=; h=From:To:Cc:Subject:Date; b=YbPPL9yW3Ux0pTWrDboNULUVlOrLqeUd/p4udikYxDxIPL/K7lGcZEIRhdHWQSNWR MwhIoFOxxMI3FF9mFniRExlqME1TKOqMXI3IGOQL3O+f9xJFe/VPa88h8KZ/ALheax Kw7kMARQSkMrn/7aXZT/oy10FbCElQslSIl4aBMsFtDhEzcBidoDjHJuSZSAioK2Qs 8sHVdg983aI6bBIqd8ghvfIRGFR3Cg76VkzSvaLywkxcVxEU44LDNn/6p+a1PVo14z uA0MI96yx+WATKiQEIqNIEf040iVWuiU0nTE2yZuPxeYEEuHFdlXyIZy29ksdrxWc9 VYyn14d2XQpdA== Date: Mon, 29 May 2023 19:46:53 -0400 Message-Id: MIME-Version: 1.0 Received-SPF: pass client-ip=178.21.23.139; envelope-from=kiasoc5@disroot.org; helo=knopi.disroot.org 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, T_SCC_BODY_TEXT_LINE=-0.01 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: , Reply-to: kiasoc5 X-ACL-Warn: , kiasoc5 via Guix-patches X-Patchwork-Original-From: kiasoc5 via Guix-patches via From: kiasoc5 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 I couldn't figure out how to get the commit hash of the git repo, as git-fetch doesn't make .git available in the build directory. For now I use #$version instead. * gnu/packages/bash.scm (blesh): Update to 0.4.0-devel3. [source]: Use recursive checkout. [phases]: Remove 'make-readlink-work. Rename 'pretend-contrib-.git-exists to 'pretend-.git-exists. Substitute commit_hash for package version. [native-inputs]: Add git. --- gnu/packages/bash.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) base-commit: b96b82bcd4bc24529941ff74a91432481f1a71b5 diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 43f38303f7..bb3359d5d1 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -445,28 +445,27 @@ (define-public bash-ctypes (define-public blesh (package (name "blesh") - (version "0.4.0-devel2") + (version "0.4.0-devel3") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/akinomyoga/ble.sh") - (commit (string-append "v" version)))) + (commit (string-append "v" version)) + (recursive? #t))) (file-name (git-file-name name version)) (sha256 (base32 - "02fdjyh4x6wr5hg3i86nsxhz8ysgjrvvxdmk6pqr0lm8ngw9p3sh")))) + "19y9rmj9srl7akx33gl34l5qgz2ww0vlmi4j2r11029p8sn4s418")))) (arguments (list #:make-flags #~(list (string-append "PREFIX=" #$output)) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'pretend-contrib-.git-exists - (lambda _ - (mkdir-p "contrib/.git"))) - (add-after 'unpack 'make-readlink-work + (add-after 'unpack 'pretend-.git-exists (lambda _ (substitute* "ble.pp" - (("PATH=/bin:/usr/bin readlink") - "readlink")))) + (("#%\\[commit_hash =.*") + (string-append "#%[commit_hash = " #$version "]\n"))) + (mkdir-p ".git"))) (delete 'configure) ;no configure (add-before 'check 'use-LANG-for-tests (lambda _ @@ -474,7 +473,7 @@ (define-public blesh (getenv "LC_ALL")) (unsetenv "LC_ALL")))))) (build-system gnu-build-system) - (native-inputs (list less)) + (native-inputs (list git less)) (home-page "https://github.com/akinomyoga/ble.sh") (synopsis "Bash Line Editor") (description