From 7b78d6bf5469ac860abf0d4927c830f48499319b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Fri, 23 May 2025 10:53:48 +0200
Subject: [PATCH] overlays: drop the call argument to simplify

---
 nix/overlays/by-name.nix                        |  2 +-
 nix/overlays/by-name/agenix/overlay.nix         | 11 ++++++-----
 nix/overlays/by-name/disko/overlay.nix          | 15 ++++++++-------
 nix/overlays/by-name/emacs28/overlay.nix        | 17 +++++++++--------
 nix/overlays/by-name/nur/overlay.nix            | 17 +++++++++--------
 .../by-name/pin-isabelle-2023/overlay.nix       | 13 +++++++------
 nix/overlays/by-name/pin-wireshark/overlay.nix  | 15 ++++++++-------
 nix/overlays/by-name/wired-notify/overlay.nix   |  6 ++++--
 8 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/nix/overlays/by-name.nix b/nix/overlays/by-name.nix
index 432b01e0..256b7ff4 100644
--- a/nix/overlays/by-name.nix
+++ b/nix/overlays/by-name.nix
@@ -5,7 +5,7 @@ in
   lib.mapAttrs
   (
     name: _:
-      import (./by-name + "/${name}/overlay.nix") {inherit sources;}
+      import (./by-name + "/${name}/overlay.nix")
   )
   (
     lib.filterAttrs (_: type: type == "directory") (builtins.readDir ./by-name)
diff --git a/nix/overlays/by-name/agenix/overlay.nix b/nix/overlays/by-name/agenix/overlay.nix
index c517561a..e75b4bd9 100644
--- a/nix/overlays/by-name/agenix/overlay.nix
+++ b/nix/overlays/by-name/agenix/overlay.nix
@@ -1,5 +1,6 @@
-{sources}:
-#
-final: prev: {
-  inherit (final.callPackage sources.agenix {}) agenix;
-}
+let
+  sources = import ../../../sources.nix;
+in
+  final: prev: {
+    inherit (final.callPackage sources.agenix {}) agenix;
+  }
diff --git a/nix/overlays/by-name/disko/overlay.nix b/nix/overlays/by-name/disko/overlay.nix
index 92e12968..72755fb5 100644
--- a/nix/overlays/by-name/disko/overlay.nix
+++ b/nix/overlays/by-name/disko/overlay.nix
@@ -1,7 +1,8 @@
-{sources}:
-#
-final: _: {
-  disko =
-    final.callPackage (sources.disko + "/package.nix")
-    {diskoVersion = sources.disko.version;};
-}
+let
+  sources = import ../../../sources.nix;
+in
+  final: _: {
+    disko =
+      final.callPackage (sources.disko + "/package.nix")
+      {diskoVersion = sources.disko.version;};
+  }
diff --git a/nix/overlays/by-name/emacs28/overlay.nix b/nix/overlays/by-name/emacs28/overlay.nix
index d00933f8..6bb07768 100644
--- a/nix/overlays/by-name/emacs28/overlay.nix
+++ b/nix/overlays/by-name/emacs28/overlay.nix
@@ -1,8 +1,9 @@
-{sources}:
-#
-_: _: {
-  emacs28 = let
-    pkgs = import sources.pin-emacs28 {};
-  in
-    pkgs.emacs;
-}
+let
+  sources = import ../../../sources.nix;
+in
+  _: _: {
+    emacs28 = let
+      pkgs = import sources.pin-emacs28 {};
+    in
+      pkgs.emacs;
+  }
diff --git a/nix/overlays/by-name/nur/overlay.nix b/nix/overlays/by-name/nur/overlay.nix
index e4bc5308..6d4c4ca4 100644
--- a/nix/overlays/by-name/nur/overlay.nix
+++ b/nix/overlays/by-name/nur/overlay.nix
@@ -1,8 +1,9 @@
-{sources}:
-#
-_: prev: {
-  nur = import sources.nur {
-    nurpkgs = prev;
-    pkgs = prev;
-  };
-}
+let
+  sources = import ../../../sources.nix;
+in
+  _: prev: {
+    nur = import sources.nur {
+      nurpkgs = prev;
+      pkgs = prev;
+    };
+  }
diff --git a/nix/overlays/by-name/pin-isabelle-2023/overlay.nix b/nix/overlays/by-name/pin-isabelle-2023/overlay.nix
index 6084bf40..3778370a 100644
--- a/nix/overlays/by-name/pin-isabelle-2023/overlay.nix
+++ b/nix/overlays/by-name/pin-isabelle-2023/overlay.nix
@@ -1,6 +1,7 @@
-{sources}:
-#
-_: _: {
-  # Isabelle version 2023
-  isabelle-2023 = (import sources.pin-isabelle {}).isabelle;
-}
+let
+  sources = import ../../../sources.nix;
+in
+  _: _: {
+    # Isabelle version 2023
+    isabelle-2023 = (import sources.pin-isabelle {}).isabelle;
+  }
diff --git a/nix/overlays/by-name/pin-wireshark/overlay.nix b/nix/overlays/by-name/pin-wireshark/overlay.nix
index 499b2cfc..1280ecf6 100644
--- a/nix/overlays/by-name/pin-wireshark/overlay.nix
+++ b/nix/overlays/by-name/pin-wireshark/overlay.nix
@@ -1,7 +1,8 @@
-{sources}:
-#
-_: _: {
-  # Wireshark bug
-  # https://gitlab.com/wireshark/wireshark/-/issues/19574
-  inherit (import sources.pin-wireshark {}) wireshark;
-}
+let
+  sources = import ../../../sources.nix;
+in
+  _: _: {
+    # Wireshark bug
+    # https://gitlab.com/wireshark/wireshark/-/issues/19574
+    inherit (import sources.pin-wireshark {}) wireshark;
+  }
diff --git a/nix/overlays/by-name/wired-notify/overlay.nix b/nix/overlays/by-name/wired-notify/overlay.nix
index 507c90c6..81ec70c7 100644
--- a/nix/overlays/by-name/wired-notify/overlay.nix
+++ b/nix/overlays/by-name/wired-notify/overlay.nix
@@ -1,2 +1,4 @@
-{sources}:
-(import sources.wired-notify).overlays.default
+let
+  sources = import ../../../sources.nix;
+in
+  (import sources.wired-notify).overlays.default