diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 9c938594..f71ac1e2 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -131,9 +131,10 @@ in [ }) (fetchpatch' { - # hare: hack in aarch64 support - saneCommit = "c147f81f374706aa286ac153668bbed8a44b1ad1"; - hash = "sha256-X9l4Gabr8iIcnoVGyePOHid5NCk5mp2USDrmn5dwGLQ="; + # hare: unstable-2023-03-15 -> unstable-2023-04-23 + # TODO: remove aarch64 block & then ship upstream + saneCommit = "ef2a506dac3258c51733c1f09889b85ad356d0dd"; + hash = "sha256-cYwen/8F0tK+g5rSuffDjNCOIIPbgzjDSaNyjtNW9ts="; }) # for raspberry pi: allow building u-boot for rpi 4{,00} diff --git a/pkgs/additional/bonsai/default.nix b/pkgs/additional/bonsai/default.nix index a6cb7f86..4bbb1160 100644 --- a/pkgs/additional/bonsai/default.nix +++ b/pkgs/additional/bonsai/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { export HARECACHE=$(mktemp -d) # FIX "ar: invalid option -- '/'" bug in older versions of hare. # should be safe to remove once updated past 2023/05/22-ish. - export ARFLAGS="-csr" + # export ARFLAGS="-csr" ''; installFlags = [ "PREFIX=" "DESTDIR=$(out)" ];