tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 13:10:33 +02:00
Code Activity

gnu: hare: Update to 0.26.0.

Browse Source 
* 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 <jgart@dismail.de>
This commit is contained in:
Nemin
2026-02-13 16:02:56 +01:00
committed by jgart
parent df71a3602e
commit 533607369a
3 changed files with 7 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/local.mk
View File

@@ -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 \

15
gnu/packages/hare.scm
View File

@@ -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

72
gnu/packages/patches/hare-toolpath.patch
View File

@@ -1,72 +0,0 @@
From 98677305eba7acd487803b6670a1bd67e1fc2796 Mon Sep 17 00:00:00 2001
Message-ID: <98677305eba7acd487803b6670a1bd67e1fc2796.1754431105.git.lilah@lunabee.space>
From: Lilah Tascheter <lilah@lunabee.space>
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