From 1f53bc3cd775e14509aad4079ef85f94da3ae244 Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Tue, 2 Jun 2026 20:20:19 +0200
Subject: pkgs/*/flake.nix: Actually instantiate `nixpkgs` instead of just
 loading

---
 npins/full.nix                            | 6 ++----
 pkgs/by-name/fu/fupdate/flake.nix         | 2 +-
 pkgs/by-name/lf/lf-make-map/flake.nix     | 2 +-
 pkgs/by-name/mp/mpdpopm/flake.nix         | 2 +-
 pkgs/by-name/no/notify-run/flake.nix      | 2 +-
 pkgs/by-name/ri/river-mk-keymap/flake.nix | 2 +-
 pkgs/by-name/ts/tskm/flake.nix            | 2 +-
 7 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/npins/full.nix b/npins/full.nix
index 547b32cf..0fb56679 100644
--- a/npins/full.nix
+++ b/npins/full.nix
@@ -1,10 +1,8 @@
 _: let
   sources = import ../unflake.nix;
-  load = input: sources."${input}";
-  loadFlake = load;
+  loadFlake = input: sources."${input}";
 
   # loadFlake = flakeInput: (import sources.flake-compat {src = sources."${flakeInput}";}).outputs;
-  # load = input: import sources."${input}" {};
 in {
-  inherit sources load loadFlake;
+  inherit sources loadFlake;
 }
diff --git a/pkgs/by-name/fu/fupdate/flake.nix b/pkgs/by-name/fu/fupdate/flake.nix
index cac507c8..22b0957f 100644
--- a/pkgs/by-name/fu/fupdate/flake.nix
+++ b/pkgs/by-name/fu/fupdate/flake.nix
@@ -16,7 +16,7 @@
     system = "x86_64-linux";
     sources = import ../../../../npins/full.nix {};
 
-    pkgs = sources.load "nixpkgs";
+    pkgs = (sources.loadFlake "nixpkgs").legacyPackages."${system}";
   in {
     devShells."${system}".default = pkgs.mkShell {
       packages = [
diff --git a/pkgs/by-name/lf/lf-make-map/flake.nix b/pkgs/by-name/lf/lf-make-map/flake.nix
index 5e191e7b..2d1e93a2 100644
--- a/pkgs/by-name/lf/lf-make-map/flake.nix
+++ b/pkgs/by-name/lf/lf-make-map/flake.nix
@@ -16,7 +16,7 @@
     system = "x86_64-linux";
     sources = import ../../../../npins/full.nix {};
 
-    pkgs = sources.load "nixpkgs";
+    pkgs = (sources.loadFlake "nixpkgs").legacyPackages."${system}";
   in {
     devShells."${system}".default = pkgs.mkShell {
       packages = [
diff --git a/pkgs/by-name/mp/mpdpopm/flake.nix b/pkgs/by-name/mp/mpdpopm/flake.nix
index 444d841c..d672bd1b 100644
--- a/pkgs/by-name/mp/mpdpopm/flake.nix
+++ b/pkgs/by-name/mp/mpdpopm/flake.nix
@@ -17,7 +17,7 @@
     system = "x86_64-linux";
     sources = import ../../../../npins/full.nix {};
 
-    pkgs = sources.load "nixpkgs";
+    pkgs = (sources.loadFlake "nixpkgs").legacyPackages."${system}";
     treefmt-nix = sources.loadFlake "treefmt-nix";
 
     treefmtEval = import ./treefmt.nix {inherit treefmt-nix pkgs;};
diff --git a/pkgs/by-name/no/notify-run/flake.nix b/pkgs/by-name/no/notify-run/flake.nix
index 286f179e..ea5fecb2 100644
--- a/pkgs/by-name/no/notify-run/flake.nix
+++ b/pkgs/by-name/no/notify-run/flake.nix
@@ -17,7 +17,7 @@
     system = "x86_64-linux";
     sources = import ../../../../npins/full.nix {};
 
-    pkgs = sources.load "nixpkgs";
+    pkgs = (sources.loadFlake "nixpkgs").legacyPackages."${system}";
   in {
     devShells."${system}".default = pkgs.mkShell {
       packages = [
diff --git a/pkgs/by-name/ri/river-mk-keymap/flake.nix b/pkgs/by-name/ri/river-mk-keymap/flake.nix
index 75855a04..d1467506 100644
--- a/pkgs/by-name/ri/river-mk-keymap/flake.nix
+++ b/pkgs/by-name/ri/river-mk-keymap/flake.nix
@@ -17,7 +17,7 @@
     system = "x86_64-linux";
 
     sources = import ../../../../npins/full.nix {};
-    pkgs = sources.load "nixpkgs";
+    pkgs = (sources.loadFlake "nixpkgs").legacyPackages."${system}";
 
     nativeBuildInputs = [
       pkgs.pkg-config
diff --git a/pkgs/by-name/ts/tskm/flake.nix b/pkgs/by-name/ts/tskm/flake.nix
index ac28eb83..e4d22c09 100644
--- a/pkgs/by-name/ts/tskm/flake.nix
+++ b/pkgs/by-name/ts/tskm/flake.nix
@@ -17,7 +17,7 @@
     system = "x86_64-linux";
 
     sources = import ../../../../npins/full.nix {};
-    pkgs = sources.load "nixpkgs";
+    pkgs = (sources.loadFlake "nixpkgs").legacyPackages."${system}";
   in {
     devShells."${system}".default = pkgs.mkShell {
       buildInputs = [
-- 
cgit v1.3.1