From bad63ce0c2d919403bcfab372f4206b951a4ccdc Mon Sep 17 00:00:00 2001
From: Andrew Kvalheim <Andrew@Kvalhe.im>
Date: Wed, 8 Feb 2023 11:52:21 -0800
Subject: [PATCH] tasks/update: Manage filesystem artifacts

---
 .gitignore   |  5 -----
 default.nix  |  2 --
 tasks/update | 16 ++++++++++++++--
 3 files changed, 14 insertions(+), 9 deletions(-)
 delete mode 100644 default.nix

diff --git a/.gitignore b/.gitignore
index 325d16a..e10b0a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,3 @@
 # Local configuration
 local/
 *.local.nix
-
-# Package updates
-/packages/*.cmp
-/*.log
-/update-git-commits.txt
diff --git a/default.nix b/default.nix
deleted file mode 100644
index 851ad1b..0000000
--- a/default.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-# Used by ./tasks/update
-{}: import <nixpkgs> { overlays = [ (import ./common/packages.nix) ]; }
diff --git a/tasks/update b/tasks/update
index 1200937..8a9fffe 100755
--- a/tasks/update
+++ b/tasks/update
@@ -1,12 +1,24 @@
 #!/usr/bin/env bash
 # See https://discourse.nixos.org/t/25274
+set -Eeu
 
 root="$(readlink --canonicalize -- "$(dirname -- "$0")/..")"
-nixpkgs="$(nix-instantiate --eval --expr '<nixpkgs>')"
 
-exec nix-shell "$nixpkgs/maintainers/scripts/update.nix" \
+# Mock nixpkgs
+trap 'rm -f "$root/default.nix"' EXIT; cat > "$root/default.nix" << NIX
+{}: import <nixpkgs> { overlays = [ (import ./common/packages.nix) ]; }
+NIX
+
+# Run update scripts
+nixpkgs="$(nix-instantiate --eval --expr '<nixpkgs>')"
+nix-shell "$nixpkgs/maintainers/scripts/update.nix" \
   --arg include-overlays "(import $root { }).overlays" \
   --arg predicate "(
     let prefix = \"$root/packages/\"; prefixLen = builtins.stringLength prefix;
     in (_: p: (builtins.substring 0 prefixLen p.meta.position) == prefix)
   )"
+
+# Clean up
+if [[ -f "$root/update-git-commits.txt" ]]; then
+  cat "$root/update-git-commits.txt" && rm "$root/update-git-commits.txt"
+fi