From ba515dec26df406b4ffc903cb557ee40a6b5edae Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 6 Mar 2024 12:10:09 -0800
Subject: [PATCH 1/2] Avoid `with lib;` at the top level in
 maintainers/scripts/find-tarballs.nix

Tested with

```
nix-instantiate --readonly-mode --eval --strict --show-trace --json ./maintainers/scripts/find-tarballs.nix --arg expr 'import ./maintainers/scripts/all-tarballs.nix'
```
---
 maintainers/scripts/find-tarballs.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix
index c47b5168abd9..cae4bec201ce 100644
--- a/maintainers/scripts/find-tarballs.nix
+++ b/maintainers/scripts/find-tarballs.nix
@@ -1,11 +1,22 @@
 # This expression returns a list of all fetchurl calls used by ‘expr’.
 
-with import ../.. { };
-with lib;
-
-{ expr }:
+{ expr, lib ? import ../../lib }:
 
 let
+  inherit (lib)
+    addErrorContext
+    attrNames
+    concatLists
+    const
+    filter
+    genericClosure
+    isAttrs
+    isDerivation
+    isList
+    mapAttrsToList
+    optional
+    optionals
+    ;
 
   root = expr;
 

From 60de328a9ebad861174cb3b7f6ebc343f095d2f3 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 6 Mar 2024 12:21:00 -0800
Subject: [PATCH 2/2] Avoid top-level `with ...;` in
 maintainers/scripts/eval-release.nix

Tested with

```
nix-instantiate --eval --strict --show-trace ./maintainers/scripts/eval-release.nix
```
---
 maintainers/scripts/eval-release.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix
index 4f0ca2465025..10acfe328447 100644
--- a/maintainers/scripts/eval-release.nix
+++ b/maintainers/scripts/eval-release.nix
@@ -1,9 +1,8 @@
-# Evaluate `release.nix' like Hydra would.  Too bad nix-instantiate
-# can't to do this.
-
-with import ../../lib;
+# Evaluate `release.nix' like Hydra would. Too bad nix-instantiate can't to do this.
 
 let
+  inherit (import ../../lib) isDerivation mapAttrs;
+
   trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y);
 
   rel = removeAttrs (import ../../pkgs/top-level/release.nix { }) [ "tarball" "unstable" "xbursttools" ];