From 9236bed612d69edfca2fbdb08fc81cefa48bee11 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@dgnum.eu>
Date: Fri, 22 Dec 2023 23:53:55 +0100
Subject: [PATCH] feat(npins): Update nix-lib

---
 hive.nix                       | 13 +++++++++----
 modules/default.nix            |  4 ++--
 modules/krz-access-control.nix |  4 ++--
 npins/sources.json             |  6 +++---
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/hive.nix b/hive.nix
index fdc3708..8029a5c 100644
--- a/hive.nix
+++ b/hive.nix
@@ -2,7 +2,7 @@ let
   sources = import ./npins;
   metadata = import ./meta;
 
-  lib = import (sources.nix-lib + "/trivial.nix");
+  lib = import (sources.nix-lib + "/src/trivial.nix");
 
   mkNode = node: { name, nodes, ... }: {
     # Import the base configuration for each node
@@ -34,9 +34,14 @@ let
 
   mkNixpkgs' = node: import (mkNixpkgs node) { };
 
-  mkArgs = node: {
-    nix-lib = import sources.nix-lib { inherit ((mkNixpkgs' node)) lib; keysRoot = ./keys; };
-  };
+  mkArgs = node:
+    let lib' = (mkNixpkgs' node).lib;
+    in {
+      lib = import sources.nix-lib {
+        lib = lib';
+        keysRoot = ./keys;
+      };
+    };
 
   nodes = builtins.attrNames metadata.nodes;
 in
diff --git a/modules/default.nix b/modules/default.nix
index bc98724..4d862f7 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,7 +1,7 @@
-{ nix-lib, sources, ... }:
+{ lib, sources, ... }:
 
 {
-  imports = (nix-lib.mkImports ./. [
+  imports = (lib.extra.mkImports ./. [
     "krz-access-control"
     "krz-ssh"
   ]) ++ [
diff --git a/modules/krz-access-control.nix b/modules/krz-access-control.nix
index 55fd2a3..8de1a8a 100644
--- a/modules/krz-access-control.nix
+++ b/modules/krz-access-control.nix
@@ -1,4 +1,4 @@
-{ config, lib, nix-lib, meta, name, ... }:
+{ config, lib, meta, name, ... }:
 
 let
   inherit (lib)
@@ -39,7 +39,7 @@ in
     krz-access-control.users.root = mkDefault admins;
 
     users.users = builtins.mapAttrs
-      (u: members: { openssh.authorizedKeys.keys = nix-lib.getAllKeys members; })
+      (u: members: { openssh.authorizedKeys.keys = lib.extra.getAllKeys members; })
       cfg.users;
   };
 }
diff --git a/npins/sources.json b/npins/sources.json
index 1df8536..282dda0 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -21,10 +21,10 @@
       },
       "pre_releases": false,
       "version_upper_bound": null,
-      "version": "0.1.1",
-      "revision": "5db2443e2cb18335375ad84ffbc066a239c054de",
+      "version": "0.1.6",
+      "revision": "ffb3dfa4c146d48300bd4fa625acfe48e091a734",
       "url": null,
-      "hash": "18xzi2yn2vk7zq79pgz8z2s1ijhyjcx5866mp21rrdi9gz37yiif"
+      "hash": "1frsja071qqx6p7rjnijzhidqfylx0ipzqpmjdvj4jl89h34vrhr"
     },
     "nixos-23.05": {
       "type": "Channel",