646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
21 lines
675 B
Diff
21 lines
675 B
Diff
uname -s is used to determine the differences between the command line
|
|
utilities like stat or awk in linux and darwin. However, in nix, guilt
|
|
will be using the nix versions of this programs, not the ones
|
|
installed in the system. Therefore, guilt should use the command-line
|
|
parameters that the linux forms of these commands expect, even if it
|
|
is being run on Darwin.
|
|
|
|
diff --git a/guilt b/guilt
|
|
index bf50343..cfc9332 100755
|
|
--- a/guilt
|
|
+++ b/guilt
|
|
@@ -986,7 +986,7 @@ guards_file="$GUILT_DIR/$branch/guards"
|
|
pager="more"
|
|
[ ! -z "$PAGER" ] && pager="$PAGER"
|
|
|
|
-UNAME_S=`uname -s`
|
|
+UNAME_S="Linux"
|
|
|
|
if [ -r "$GUILT_PATH/os.$UNAME_S" ]; then
|
|
. "$GUILT_PATH/os.$UNAME_S"
|