summaryrefslogtreecommitdiffstats
path: root/tv/5pkgs/default.nix
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-07-23 10:22:35 +0200
committerlassulus <lassulus@lassul.us>2017-07-23 10:22:35 +0200
commit65c2680f24b3200d78e4c2d23da832dde141bfe5 (patch)
tree3d6854a87da32fb573cfc3faf012808cddc8ef3c /tv/5pkgs/default.nix
parent241b943c3216073023b312b1a1297dc66dceb7af (diff)
parentccc7601a0e95d8adccf3a4a7db837aa9f1b3b3a6 (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/5pkgs/default.nix')
-rw-r--r--tv/5pkgs/default.nix31
1 files changed, 11 insertions, 20 deletions
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 02410e8e6..8a7a613ba 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -1,22 +1,18 @@
with import <stockholm/lib>;
-self: super: let
- # 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 {});
- in if upstream ? "name" &&
- override ? "name" &&
- compareVersions upstream.name override.name != -1
- then
- trace
- "Upstream `${upstream.name}' gets overridden by `${override.name}'."
- override
- else override;
+self: super:
-in {
+# Import files and subdirectories like they are overlays.
+foldl' mergeAttrs {}
+ (map
+ (name: import (./. + "/${name}") self super)
+ (filter
+ (name: name != "default.nix" && !hasPrefix "." name)
+ (attrNames (readDir ./.))))
+//
+
+{
# TODO use XDG_RUNTIME_DIR?
cr = self.writeDashBin "cr" ''
set -efu
@@ -42,9 +38,4 @@ in {
sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73";
}) {};
in nixpkgs-1509.wvdial;
-
}
-
-// mapAttrs (_: flip callPackage {})
- (filterAttrs (_: dir: pathExists (dir + "/default.nix"))
- (subdirsOf ./.))