guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 7ab24dee34298e8da8ee63e56c15f95f9251a80d
Author: Anderson Torres <[email protected]>
AuthorDate: Mon Jun 1 16:17:46 2026 -0300
gnu: kawa: Use gexps.
* gnu/packages/scheme.scm: (kawa): Fetch from Git repository.
[source]: Use git fetch.
<snippet>: Delete autogen.sh; fix AM_INIT_AUTOMAKE duplication.
[arguments]: Use gexps.
[native-inputs]: Add autoconf, automake, texinfo.
Change-Id: I0d28e7881ff0c4e658019b5db716e8ab9134aec5
Signed-off-by: Ludovic Courtès <[email protected]>
Merges: #9001
---
gnu/packages/scheme.scm | 42 ++++++++++++++++++++++++++++++------------
1 file changed, 30 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 37361a2851..9094546a8e 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -1387,24 +1387,42 @@ application.")
(version "3.1.1")
(source
(origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/kawa/kawa-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/kashell/Kawa")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
- (base32 "06g015zjlfgsx0n4lb326czkbf1grlx0n6dx074m808hdg6m16lc"))))
+ (base32 "1qfd0dk4l4dccdhi6lmgv74g98m6mpdiif1qrzgwbj8awbb8x1jy"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin
+ ;; autogen.sh lacks shebang. Let's delete it, the default action
+ ;; of Guix is equivalent.
+ (delete-file "autogen.sh")
+ ;; This duplication of AM_INIT_AUTOMAKE was solved on commit
+ ;; 85f8e85cb50e79c163951c3d823bbbc7df3cee03 from kawa git repo,
+ ;; but it was not tagged yet.
+ (substitute* "bin/configure.ac"
+ (("AM_INIT_AUTOMAKE\n") ""))))))
(build-system gnu-build-system)
(arguments
- `(#:parallel-build? #f
- #:parallel-tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'install 'wrap-kawa
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (wrap-program (string-append out "/share/kawa/bin/kawa")
- `("JAVA_HOME" ":" = (,(assoc-ref inputs "icedtea"))))))))))
+ (list
+ #:parallel-build? #f
+ #:parallel-tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'wrap-kawa
+ (lambda* (#:key inputs #:allow-other-keys)
+ (wrap-program (string-append #$output "/share/kawa/bin/kawa")
+ `("JAVA_HOME" ":" = (,#$(this-package-input
"icedtea")))))))))
(inputs
(list bash-minimal
`(,icedtea-8 "jdk")))
+ (native-inputs
+ (list autoconf
+ automake
+ texinfo))
(home-page "https://www.gnu.org/software/kawa/")
(synopsis "Java framework and implementation of Scheme, Elisp, and more")
(description