From 8481e113683606e104eb8cc6f84bbb567c572087 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Tue, 12 Jul 2022 16:07:57 -0400
Subject: [PATCH] perhaps this way?
---
ci-tools/update-nixpkgs | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/ci-tools/update-nixpkgs b/ci-tools/update-nixpkgs
index 6fe5c16a..fa0791ff 100755
--- a/ci-tools/update-nixpkgs
+++ b/ci-tools/update-nixpkgs
@@ -10,7 +10,10 @@ nix-build -A morph -o result-before
git checkout "${TARGET_BRANCH}" || git checkout -b "${TARGET_BRANCH}"
-nix-shell ./tools/ --run update-nixpkgs
+# Spawn *another* nix-shell that has the *other* update-nixpkgs tool. Should
+# sort out this mess sooner rather than later...
+nix-shell ./shell.nix --run update-nixpkgs
+
nix-build -A morph -o result-after
diff=$(nix --extra-experimental-features nix-command store diff-closures ./result-before/ ./result-after/)
--
GitLab