From b07c44198798fdd9f51c9ba34dc4811b857e56d4 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 29 Jul 2024 00:19:46 +0200
Subject: [PATCH] shell.nix: Enable e.g. --arg nixpkgs ./.

This allows shell.nix to be run with the latest tools instead of
the pinned ones when desired, which is probably not very often,
but useful nonetheless.
---
 shell.nix | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/shell.nix b/shell.nix
index d9e94eb2816d..9913ff5dbc7d 100644
--- a/shell.nix
+++ b/shell.nix
@@ -4,17 +4,25 @@
 # because every time you change any file and do another `nix develop`,
 # it would create another copy of the entire ~500MB tree in the store.
 # See https://github.com/NixOS/nix/pull/6530 for the future
-{
-  system ? builtins.currentSystem,
-}:
+#
+# Note: We use a pinned Nixpkgs so that the tools are readily available even
+# when making changes that would otherwise require a new build of those tools.
+# If you'd like to test out changes to the tools themselves, you can pass
+#
+#     nix-shell --arg nixpkgs ./.
+#
 let
   pinnedNixpkgs = builtins.fromJSON (builtins.readFile ci/pinned-nixpkgs.json);
+in
+{
+  system ? builtins.currentSystem,
 
-  nixpkgs = fetchTarball {
+  nixpkgs ? fetchTarball {
     url = "https://github.com/NixOS/nixpkgs/archive/${pinnedNixpkgs.rev}.tar.gz";
     sha256 = pinnedNixpkgs.sha256;
-  };
-
+  },
+}:
+let
   pkgs = import nixpkgs {
     inherit system;
     config = {};