From 533607369ab23aa48423fb0bf7ed20adbf7d5783 Mon Sep 17 00:00:00 2001 From: Nemin Date: Fri, 13 Feb 2026 16:02:56 +0100 Subject: [PATCH] gnu: hare: Update to 0.26.0. * gnu/packages/hare.scm (harec): Update to 0.26.0. * gnu/packages/hare.scm (hare): Update to 0.26.0. [patches]: Remove hare-toolpath.patch. * gnu/packages/hare.scm (hare-update): Update to 0.26.0.0. * gnu/patches/hare-toolpath.patch: Delete file. * gnu/local.mk: Unregister patch. Change-Id: I6bdc9eeb6257832d01fb62e225e76e8831ba1b9d Signed-off-by: jgart --- gnu/local.mk | 1 - gnu/packages/hare.scm | 15 +++-- gnu/packages/patches/hare-toolpath.patch | 72 ------------------------ 3 files changed, 7 insertions(+), 81 deletions(-) delete mode 100644 gnu/packages/patches/hare-toolpath.patch diff --git a/gnu/local.mk b/gnu/local.mk index c99e30bc2a..f423792570 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1589,7 +1589,6 @@ dist_patch_DATA = \ %D%/packages/patches/gzdoom-search-in-installed-share.patch \ %D%/packages/patches/gzdoom-find-system-libgme.patch \ %D%/packages/patches/hare-fallback-cache.patch \ - %D%/packages/patches/hare-toolpath.patch \ %D%/packages/patches/hdf4-reproducibility.patch \ %D%/packages/patches/hdf4-shared-fortran.patch \ %D%/packages/patches/hdf5-config-date.patch \ diff --git a/gnu/packages/hare.scm b/gnu/packages/hare.scm index 20ffc0760f..9daff891d0 100644 --- a/gnu/packages/hare.scm +++ b/gnu/packages/hare.scm @@ -71,7 +71,7 @@ (define-public harec (package (name "harec") - (version "0.25.2") + (version "0.26.0") (source (origin (method git-fetch) (uri (git-reference @@ -80,7 +80,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0qyhni011116wc194kkybmiphmi1cak0n8kxgiq7v174xsh9irp7")))) + "1bzmd4j2q6kdgz8zxs6qwy57fzh7wh7xwps9rcmcrhwl5zngff3b")))) (build-system gnu-build-system) (arguments (list #:modules `((ice-9 format) ,@%default-gnu-modules) @@ -112,18 +112,17 @@ package.") (define-public hare (package (name "hare") - (version "0.25.2") + (version "0.26.0") (source (origin (method git-fetch) (uri (git-reference (url "https://git.sr.ht/~sircmpwn/hare") (commit version))) (file-name (git-file-name name version)) - (patches (search-patches "hare-fallback-cache.patch" - "hare-toolpath.patch")) + (patches (search-patches "hare-fallback-cache.patch")) (sha256 (base32 - "1kfvf1xk36w49dnqrkcahh35xdgilhgdn3q84r2101rz2iy4pbba")))) + "1iay401z2bl6rihjlgd50zq1d29l7k304r5jmwr55l8in2fy3nnw")))) (build-system gnu-build-system) (arguments (list #:modules `((ice-9 format) ,@%default-gnu-modules) @@ -174,7 +173,7 @@ static typing, manual memory management, and a minimal runtime.") (define-public hare-update (package (name "hare-update") - (version "0.25.2.0") + (version "0.26.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -183,7 +182,7 @@ static typing, manual memory management, and a minimal runtime.") (file-name (git-file-name name version)) (sha256 (base32 - "0hpcgiyg458v353g3wm2iaz2kszhc2n2rc40lnvxbg9q6i232m76")))) + "1pqlqgryjdcvzshj95p3gd8icpjgn01hcsfss8r3hd8xqr87v8qk")))) (build-system hare-build-system) (arguments (list #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/patches/hare-toolpath.patch b/gnu/packages/patches/hare-toolpath.patch deleted file mode 100644 index 872ae0ef55..0000000000 --- a/gnu/packages/patches/hare-toolpath.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 98677305eba7acd487803b6670a1bd67e1fc2796 Mon Sep 17 00:00:00 2001 -Message-ID: <98677305eba7acd487803b6670a1bd67e1fc2796.1754431105.git.lilah@lunabee.space> -From: Lilah Tascheter -Date: Tue, 5 Aug 2025 16:42:50 -0500 -Subject: [PATCH] cmd::hare::tool: Use HARE_TOOLPATH when available. - -Some distros, like Guix, do not have set search paths, and instead rely on -environment variables. Allow tools to be specified through a new variable, -HARE_TOOLPATH. ---- - cmd/hare/tool.ha | 35 +++++++++++++++++++++-------------- - 1 file changed, 21 insertions(+), 14 deletions(-) - -diff --git a/cmd/hare/tool.ha b/cmd/hare/tool.ha -index b14250fc..b7e4e2ff 100644 ---- a/cmd/hare/tool.ha -+++ b/cmd/hare/tool.ha -@@ -7,6 +7,7 @@ use getopt; - use os; - use os::exec; - use path; -+use strings; - - fn tool(name: str, cmd: *getopt::command) (void | error) = { - if (len(cmd.args) < 1) { -@@ -19,23 +20,29 @@ fn tool(name: str, cmd: *getopt::command) (void | error) = { - args = cmd.args[1..]; - }; - -- const path = path::init(TOOLDIR)?; -+ const paths = strings::tokenize(os::tryenv("HARE_TOOLPATH", TOOLDIR), ":"); - const tool = cmd.args[0]; - const name = fmt::asprintf("hare-{}", tool)!; - defer free(name); -- path::push(&path, name)?; -- -- const cmd = match (exec::cmd(path::string(&path), args...)) { -- case let cmd: exec::command => -- yield cmd; -- case errors::noentry => -- fmt::fatalf("hare tool {}: tool not found", tool); -- case let err: exec::error => -- return err; -+ -+ for(const segment => strings::next_token(&paths)) { -+ const path = path::init(segment)?; -+ path::push(&path, name)?; -+ -+ const cmd = match (exec::cmd(path::string(&path), args...)) { -+ case let cmd: exec::command => -+ yield cmd; -+ case errors::noentry => -+ continue; -+ case let err: exec::error => -+ return err; -+ }; -+ -+ const argv0 = fmt::asprintf("hare tool {}", tool)!; -+ exec::setname(&cmd, argv0)!; -+ const err = exec::exec(&cmd); -+ fmt::fatalf("exec {}: {}", path::string(&path), exec::strerror(err)); - }; - -- const argv0 = fmt::asprintf("hare tool {}", tool)!; -- exec::setname(&cmd, argv0)!; -- const err = exec::exec(&cmd); -- fmt::fatalf("exec {}: {}", path::string(&path), exec::strerror(err)); -+ fmt::fatalf("hare tool {}: tool not found", tool); - }; --- -2.50.0 -