From a450d2548a2e9e54fbdafa32aec89ddbd98c4c57 Mon Sep 17 00:00:00 2001 From: Hugo Buddelmeijer Date: Sun, 15 Feb 2026 23:39:01 +0100 Subject: [PATCH] gnu: tippecanoe: Fix build by updating to 2.79.0. * gnu/packages/geo.scm (tippecanoe): Update to 2.79.0. [arguments]: Switch to gexps. <#:test-target, #:tests?>: Disable for now. <#:phases>: Add 'patch-bash phase. Merges: https://codeberg.org/guix/guix/pulls/6467 Change-Id: I90f0336f03a6d136ce00c7a44268820c9d3d8880 Modified-by: Sharlatan Hellseher Signed-off-by: Sharlatan Hellseher --- gnu/packages/geo.scm | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 64982fe351..082a1d97ec 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2407,24 +2407,33 @@ map, geocoding with Nominatim, or general analysis.") (define-public tippecanoe (package (name "tippecanoe") - (version "2.17.0") + (version "2.79.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/felt/tippecanoe") - (commit version))) + (url "https://github.com/felt/tippecanoe") + (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1q2snvsbs10l9pjydid3zxkidlha5hav8gvb0p731m2pwg3xw0qr")))) + (base32 "0jfzk9sy79hf6nw0xvz6l34g3fxdpqqag8x17gcmwfanw9wa6hd0")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases (delete 'configure)) - #:test-target "test" - #:make-flags - (list (string-append "CC=" ,(cc-for-target)) - (string-append "PREFIX=" (assoc-ref %outputs "out"))))) + (list + ;; XXX: Tests are not stable, see: + ;; . + #:tests? #f + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ;no configure script + (add-after 'unpack 'patch-bash + (lambda* (#:key native-inputs #:allow-other-keys) + (substitute* "Makefile" + (("/bin/bash") + (search-input-file %build-inputs "/bin/bash")))))))) (inputs (list perl sqlite zlib)) (home-page "https://github.com/mapbox/tippecanoe")