guix_mirror_bot pushed a commit to branch master
in repository guix.
commit d36fc31dfc1960597432ae9158d608ecfcfb81dd
Author: Patrick Delaney <[email protected]>
AuthorDate: Fri Oct 30 23:40:20 2026 -0700
gnu: chawan: Update to 0.5.1.
* gnu/packages/patches/chawan-0.4.4-tmp-nimcache.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Unregister patch.
* gnu/packages/web-browsers.scm (chawan): Update to 0.5.1.
[source]<patches>: Remove the deleted patch.
[arguments]<phases>{patch-shell-path}: Apply on all Nim source files.
Merges: https://codeberg.org/guix/guix/pulls/12215
Signed-off-by: Nguyễn Gia Phong <[email protected]>
---
gnu/local.mk | 1 -
.../patches/chawan-0.4.4-tmp-nimcache.patch | 42 ----------------------
gnu/packages/web-browsers.scm | 7 ++--
3 files changed, 3 insertions(+), 47 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index d785109e0c5..91eaee6574e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1119,7 +1119,6 @@ dist_patch_DATA =
\
%D%/packages/patches/cdrkit-libre-cross-compile.patch \
%D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \
%D%/packages/patches/cf-tool-add-languages.patch \
- %D%/packages/patches/chawan-0.4.4-tmp-nimcache.patch \
%D%/packages/patches/chmlib-inttypes.patch \
%D%/packages/patches/cl-ana-pr-49.patch \
%D%/packages/patches/cl-asdf-config-directories.patch \
diff --git a/gnu/packages/patches/chawan-0.4.4-tmp-nimcache.patch
b/gnu/packages/patches/chawan-0.4.4-tmp-nimcache.patch
deleted file mode 100644
index 1195ef7f85b..00000000000
--- a/gnu/packages/patches/chawan-0.4.4-tmp-nimcache.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-By default, Nim stores intermediate object files in ~/.cache/nim. patch moves
-the nimcache into the working directory of the guix build. This should not be
-needed past version 0.4.4 of Chawan.
-
-diff --git a/Makefile b/Makefile
-index 8f538522..6ffc8149 100644
---- a/Makefile
-+++ b/Makefile
-@@ -227,7 +227,7 @@ $(OUTDIR_LIBEXEC)/urldec: $(OUTDIR_LIBEXEC)/urlenc
-
- # Do not add FLAGS here, because that breaks cross-compilation.
- $(OBJDIR)/chac: src/chac.nim lib/monoucha0/monoucha/*
lib/monoucha0/monoucha/qjs/*
-- $(NIMC) -o:$@ $<
-+ $(NIMC) --nimcache:"$(OBJDIR)/chac_cache" -o:$@ $<
-
- $(OUTDIR_LIBEXEC)/%.jsb: src/%.js $(OBJDIR)/chac
- $(OBJDIR)/chac $(chac_flags) $< $@
-@@ -314,7 +314,7 @@ uninstall:
- for f in $(manpages1); do rm -f "$(DESTDIR)$(MANPREFIX1)/$$f"; done
-
- test/net/run: test/net/run.nim
-- $(NIMC) test/net/run.nim
-+ $(NIMC) --nimcache:"$(OBJDIR)/test_net" test/net/run.nim
-
- .PHONY: map
- map:
-@@ -351,12 +351,12 @@ test_flags = --verbosity:0
- .PHONY: test_charset
- test_charset: test/charset/run.sh $(OBJDIR)/chagashi_test
- (cd test/charset && ./run.sh)
-- $(NIM) r $(test_flags) test/charset/basic.nim
-- CGS_TESTDIR=$(OBJDIR)/chagashi_test $(NIM) r $(test_flags)
test/charset/data.nim
-+ $(NIM) r $(test_flags) --nimcache:"$(OBJDIR)/test_charset"
test/charset/basic.nim
-+ CGS_TESTDIR=$(OBJDIR)/chagashi_test $(NIM) r
--nimcache:"$(OBJDIR)/test_charset_data" $(test_flags) test/charset/data.nim
-
- .PHONY: test_nim
- test_nim: test/nim/ttwtstr.nim
-- (cd test/nim && $(NIM) r $(test_flags) ttwtstr.nim)
-+ (cd test/nim && $(NIM) r --nimcache:"$(OBJDIR)/test_twtstr"
$(test_flags) ttwtstr.nim)
-
- .PHONY: test
- test: test_js test_layout test_net test_md test_pager test_charset test_nim
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index ab032b8f33f..dad82e2150b 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -891,7 +891,7 @@ saved to a file for further viewing in another window.")
(define-public chawan
(package
(name "chawan")
- (version "0.4.4")
+ (version "0.5.1")
(source
(origin
(method git-fetch)
@@ -899,8 +899,7 @@ saved to a file for further viewing in another window.")
(url "https://git.sr.ht/~bptato/chawan")
(commit (string-append "v" version))))
(sha256
- (base32 "1il1z8hw9hyv8jq892mw9d8pkv2fbpr9ghkgsgqjdqah2fhckjp0"))
- (patches (search-patches "chawan-0.4.4-tmp-nimcache.patch"))
+ (base32 "0yha58x3phvjxvlrp791did2sd2iaqbg1yk4pmhqfwrarz0p4wwa"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
@@ -914,7 +913,7 @@ saved to a file for further viewing in another window.")
;; must override absolute shell path set by test configurations.
(add-after 'unpack 'patch-shell-path
(lambda* (#:key inputs #:allow-other-keys)
- (substitute* '("src/local/pager.nim" "adapter/protocol/man.nim")
+ (substitute* (find-files "." "\\.nim$")
(("\"/bin/sh\"")
(format #f "~s" (search-input-file inputs "bin/sh"))))))
(delete 'configure))))