From 0e8f752d799d0390448ab0d37d47c9cdd79b84ff Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@dgnum.eu>
Date: Wed, 10 Jul 2024 17:29:20 +0200
Subject: [PATCH] feat(shell): Update colmena to a version that understands
 sshOptions

---
 default.nix        | 8 ++++----
 npins/sources.json | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/default.nix b/default.nix
index 1c05102..04aad3d 100644
--- a/default.nix
+++ b/default.nix
@@ -81,10 +81,10 @@ in
             }))
             attic-client
           ]
-          ++ (builtins.map (p: callPackage p { }) [
-            (sources.disko + "/package.nix")
-            ./lib/colmena
-          ])
+          ++ [
+            (callPackage (sources.disko + "/package.nix") { })
+            (callPackage ./lib/colmena { inherit (import sources.nix-pkgs { inherit pkgs; }) colmena; })
+          ]
         )
         ++ (import ./scripts { inherit pkgs; });
 
diff --git a/npins/sources.json b/npins/sources.json
index cd203a8..fcacfe2 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -193,9 +193,9 @@
         "url": "https://git.hubrecht.ovh/hubrecht/nix-pkgs"
       },
       "branch": "main",
-      "revision": "1a0f0ad29565db768db52d92973f92993c7c16ed",
+      "revision": "20222847f9ed5ea7670dd2fdb1110b7b521c6237",
       "url": null,
-      "hash": "14yiyh6zg3kybnqh1dfmwcm7hydc1xvapsamf4hzbnfssfgzvvwk"
+      "hash": "1pyvhcglmsp9zgkm569gbd0fm96vxyxwwf3bk8smiiylld2avmqx"
     },
     "nixos-23.11": {
       "type": "Channel",