From: kiasoc5 via Guix-patches via <guix-patches@gnu.org>
To: 63795@debbugs.gnu.org
Cc: kiasoc5 <kiasoc5@disroot.org>
Subject: [bug#63795] [PATCH] gnu: blesh: Update to 0.4.0-devel3.
Date: Mon, 29 May 2023 19:46:53 -0400 [thread overview]
Message-ID: <ba0eb3f6f133ec9807913ef47fbbcb3f54f04edf.1685404012.git.kiasoc5@disroot.org> (raw)
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(-)
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
base-commit: b96b82bcd4bc24529941ff74a91432481f1a71b5
--
2.40.1
next reply other threads:[~2023-05-29 23:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-29 23:46 kiasoc5 via Guix-patches via [this message]
2023-06-24 15:08 ` bug#63795: [PATCH] gnu: blesh: Update to 0.4.0-devel3 Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ba0eb3f6f133ec9807913ef47fbbcb3f54f04edf.1685404012.git.kiasoc5@disroot.org \
--to=guix-patches@gnu.org \
--cc=63795@debbugs.gnu.org \
--cc=kiasoc5@disroot.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.