diff --git a/hive.nix b/hive.nix index 6e49eb7..e1451bf 100644 --- a/hive.nix +++ b/hive.nix @@ -50,12 +50,9 @@ let mkArgs = node: let lib' = (mkNixpkgs' node).lib; in { - lib = lib' // { - extra = import sources.nix-lib { - lib = lib'; - keysRoot = ./keys; - metaRoot = ./meta; - }; + lib = import sources.nix-lib { + lib = lib'; + keysRoot = ./keys; }; }; diff --git a/lib/default.nix b/lib/default.nix index c4fe4b2..d7a330c 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -3,12 +3,11 @@ _: let sources = import ../npins; - nix-lib = import sources.nix-lib { + nix-lib = (import sources.nix-lib { inherit ((import sources.nixpkgs { })) lib; keysRoot = ../keys; - metaRoot = ../meta; - }; + }).extra; in nix-lib // (with nix-lib; { # Get publickeys associated to a node diff --git a/npins/sources.json b/npins/sources.json index c326e43..91804d1 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -84,10 +84,10 @@ }, "pre_releases": false, "version_upper_bound": null, - "version": "0.1.5", - "revision": "5260bfd4e8aaffef455bfa0edf3d0a2db81de989", + "version": "0.1.6", + "revision": "ffb3dfa4c146d48300bd4fa625acfe48e091a734", "url": null, - "hash": "18c9mcjx1v4zlgl91dgiq4rrcayz05fy8v5pq00dlyfm3chrqvxx" + "hash": "1frsja071qqx6p7rjnijzhidqfylx0ipzqpmjdvj4jl89h34vrhr" }, "nix-patches": { "type": "GitRelease",