From a43e10d77d36a105fcc3ffee6bea384aac7242f0 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@dgnum.eu>
Date: Thu, 11 Jul 2024 10:33:01 +0200
Subject: [PATCH] fix(npins): Update the version used

---
 default.nix | 37 +++++++++++++++++--------------------
 shell.nix   |  2 +-
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/default.nix b/default.nix
index 04aad3d..fdc3ad0 100644
--- a/default.nix
+++ b/default.nix
@@ -34,10 +34,13 @@
   termes.
 */
 
-let
-  sources = import ./npins;
-  pkgs = import sources.nixpkgs { };
+{
+  sources ? import ./npins,
+  pkgs ? import sources.nixpkgs { },
+  nix-pkgs ? import sources.nix-pkgs { inherit pkgs; },
+}:
 
+let
   pre-commit-check = (import sources.pre-commit-hooks).run {
     src = ./.;
 
@@ -70,23 +73,17 @@ in
     default = pkgs.mkShell {
       name = "dgnum-infra";
 
-      packages =
-        (
-          with pkgs;
-          [
-            npins
-            (nixos-generators.overrideAttrs (_: {
-              version = "1.8.0-unstable";
-              src = builtins.storePath sources.nixos-generators;
-            }))
-            attic-client
-          ]
-          ++ [
-            (callPackage (sources.disko + "/package.nix") { })
-            (callPackage ./lib/colmena { inherit (import sources.nix-pkgs { inherit pkgs; }) colmena; })
-          ]
-        )
-        ++ (import ./scripts { inherit pkgs; });
+      packages = [
+        (pkgs.nixos-generators.overrideAttrs (_: {
+          version = "1.8.0-unstable";
+          src = builtins.storePath sources.nixos-generators;
+        }))
+        pkgs.attic-client
+        nix-pkgs.npins
+
+        (pkgs.callPackage (sources.disko + "/package.nix") { })
+        (pkgs.callPackage ./lib/colmena { inherit (nix-pkgs) colmena; })
+      ] ++ (import ./scripts { inherit pkgs; });
 
       shellHook = ''
         ${pre-commit-check.shellHook}
diff --git a/shell.nix b/shell.nix
index 2d126bb..0076170 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1 +1 @@
-(import ./.).shells.default
+(import ./. { }).shells.default