summaryrefslogtreecommitdiffstats
path: root/lass/5pkgs
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2022-08-02 13:19:32 +0200
committerlassulus <lassulus@lassul.us>2022-08-02 13:19:32 +0200
commitb501b81041ab80fe8c4dedfc603ee09bf0428ae5 (patch)
treea6e4ba7a32b99d0470fc40d1b5f13f0ab50dd188 /lass/5pkgs
parent42e91b31915fd4f5e5bab5bb0045691975d223d5 (diff)
l 5: get rid of <stockholm>
Diffstat (limited to 'lass/5pkgs')
-rw-r--r--lass/5pkgs/default.nix18
1 files changed, 9 insertions, 9 deletions
diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index e4208f1c1..f090932e4 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -1,24 +1,24 @@
-with import <stockholm/lib>;
self: super: let
+ lib = super.lib;
# This callPackage will try to detect obsolete overrides.
callPackage = path: args: let
override = super.callPackage path args;
- upstream = optionalAttrs (override ? "name")
- (super.${(parseDrvName override.name).name} or {});
+ upstream = lib.optionalAttrs (override ? "name")
+ (super.${(builtins.parseDrvName override.name).name} or {});
in if upstream ? "name" &&
override ? "name" &&
- compareVersions upstream.name override.name != -1
+ lib.compareVersions upstream.name override.name != -1
then
- trace
+ builtins.trace
"Upstream `${upstream.name}' gets overridden by `${override.name}'."
override
else override;
subdirsOf = path:
- mapAttrs (name: _: path + "/${name}")
- (filterAttrs (_: eq "directory") (readDir path));
+ lib.mapAttrs (name: _: path + "/${name}")
+ (lib.filterAttrs (_: x: x == "directory") (builtins.readDir path));
-in mapAttrs (_: flip callPackage {})
- (filterAttrs (_: dir: pathExists (dir + "/default.nix"))
+in lib.mapAttrs (_: lib.flip callPackage {})
+ (lib.filterAttrs (_: dir: lib.pathExists (dir + "/default.nix"))
(subdirsOf ./.))