Merge master into haskell-updates

3 files changed, 19 insertions, 9 deletions

diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix
index 4f0ca24650251..10acfe3284470 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" ];
diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix
index c47b5168abd9a..cae4bec201ce0 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;
 
diff --git a/maintainers/scripts/kde/generate-sources.py b/maintainers/scripts/kde/generate-sources.py
index e9f8c41ef4d70..380213ee6907c 100755
--- a/maintainers/scripts/kde/generate-sources.py
+++ b/maintainers/scripts/kde/generate-sources.py
@@ -101,7 +101,7 @@ def main(set: str, version: str, nixpkgs: pathlib.Path):
 
     set_dir.mkdir(parents=True, exist_ok=True)
     with (set_dir / "default.nix").open("w") as fd:
-        fd.write(ROOT_TEMPLATE.render(packages=results.keys()) + "\n")
+        fd.write(ROOT_TEMPLATE.render(packages=sorted(results.keys())) + "\n")
 
     sources_dir = generated_dir / "sources"
     sources_dir.mkdir(parents=True, exist_ok=True)