From 2798e3c7b300024716b2e881767e33b09b5c5023 Mon Sep 17 00:00:00 2001 From: Ivan Jager Date: Tue, 14 Jan 2025 22:42:39 -0600 Subject: [PATCH] update.sh: Use nix build from https://github.com/NixOS/nix/pull/12107 to work around regression of https://github.com/NixOS/nix/issues/9708 I got tired of manually running ``` /nix/store/bn0djaymav6qa4zg5vaskzcaija5nq2p-nix-2.26.0pre20241227_9111645/bin/nix flake update ``` for every update while waiting for the fix to make it upstreaam. --- stable | 2 +- unstable | 2 +- update.sh | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/stable b/stable index 67e9c88..a78c63a 160000 --- a/stable +++ b/stable @@ -1 +1 @@ -Subproject commit 67e9c880898889470f153157a96b595e758167fc +Subproject commit a78c63a084314c55196488cf2252c5f6ea5c67a4 diff --git a/unstable b/unstable index ba9f794..733994e 160000 --- a/unstable +++ b/unstable @@ -1 +1 @@ -Subproject commit ba9f7942037ac78a690eb7e2c15f4869c9515eb4 +Subproject commit 733994ea06585b76621073160e87b0bfac7fc5ae diff --git a/update.sh b/update.sh index 5c6cf07..b4a026c 100755 --- a/update.sh +++ b/update.sh @@ -28,7 +28,8 @@ function do_update () { git submodule update --remote # Update flake.lock to match -nix flake update +# Use nix build from https://github.com/NixOS/nix/pull/12107 to work around regression of https://github.com/NixOS/nix/issues/9708 +/nix/store/bn0djaymav6qa4zg5vaskzcaija5nq2p-nix-2.26.0pre20241227_9111645/bin/nix flake update # Test that everything still builds tests/machine-builds.sh