summaryrefslogtreecommitdiffstats
path: root/krebs/5pkgs/simple/default.nix
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2021-10-12 19:36:09 +0200
committerlassulus <lassulus@lassul.us>2021-10-12 20:53:45 +0200
commit77c3aab5b860a952e9d83db56aefe23ee04ccebc (patch)
treec1c57e5c2485f4613ff5ce3dd7df6c5eb5f23512 /krebs/5pkgs/simple/default.nix
parent780a04e991c46a111c38281fced75f9c38e972f8 (diff)
pkgs: use relative stockholm.lib
Diffstat (limited to 'krebs/5pkgs/simple/default.nix')
-rw-r--r--krebs/5pkgs/simple/default.nix15
1 files changed, 7 insertions, 8 deletions
diff --git a/krebs/5pkgs/simple/default.nix b/krebs/5pkgs/simple/default.nix
index 6ba4fec83..10458001e 100644
--- a/krebs/5pkgs/simple/default.nix
+++ b/krebs/5pkgs/simple/default.nix
@@ -1,18 +1,17 @@
-with import <stockholm/lib>;
-
self: super:
let
# This callPackage will try to detect obsolete overrides.
+ lib = import ../../../lib;
callPackage = path: args: let
override = self.callPackage path args;
- upstream = optionalAttrs (override ? "name")
- (super.${(parseDrvName override.name).name} or {});
+ upstream = lib.optionalAttrs (override ? "name")
+ (super.${(lib.parseDrvName override.name).name} or {});
in if upstream ? "name" &&
override ? "name" &&
- compareVersions upstream.name override.name != -1
- then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
+ lib.compareVersions upstream.name override.name != -1
+ then lib.trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
else override;
in
-
- mapNixDir (path: callPackage path {}) ./.
+ { stockholm.lib = lib; } //
+ lib.mapNixDir (path: callPackage path {}) ./.