diff options
author | tv <tv@krebsco.de> | 2017-07-23 02:46:44 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2017-07-23 02:46:44 +0200 |
commit | dc7d8c6d10323f9d8d31a7b4e0b1cf92c14e5166 (patch) | |
tree | 0a2df0595118cc90fbe9f254daadb87400e14870 /tv/5pkgs | |
parent | d061da22d123030e651fda77ae8bccc5c1e373df (diff) |
tv pkgs: mimic krebs' simple overlay
Diffstat (limited to 'tv/5pkgs')
-rw-r--r-- | tv/5pkgs/default.nix | 31 | ||||
-rw-r--r-- | tv/5pkgs/simple/djbdns/default.nix (renamed from tv/5pkgs/djbdns/default.nix) | 0 | ||||
-rw-r--r-- | tv/5pkgs/simple/q/default.nix (renamed from tv/5pkgs/q/default.nix) | 0 | ||||
-rw-r--r-- | tv/5pkgs/simple/viljetic-pages/default.nix (renamed from tv/5pkgs/viljetic-pages/default.nix) | 0 | ||||
-rw-r--r-- | tv/5pkgs/simple/viljetic-pages/index.html (renamed from tv/5pkgs/viljetic-pages/index.html) | 0 | ||||
-rw-r--r-- | tv/5pkgs/simple/viljetic-pages/logo.xpm (renamed from tv/5pkgs/viljetic-pages/logo.xpm) | 0 | ||||
-rw-r--r-- | tv/5pkgs/simple/xmonad-tv/default.nix (renamed from tv/5pkgs/xmonad-tv/default.nix) | 0 |
7 files changed, 11 insertions, 20 deletions
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index 02410e8..8a7a613 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 ./.)) diff --git a/tv/5pkgs/djbdns/default.nix b/tv/5pkgs/simple/djbdns/default.nix index ad5a530..ad5a530 100644 --- a/tv/5pkgs/djbdns/default.nix +++ b/tv/5pkgs/simple/djbdns/default.nix diff --git a/tv/5pkgs/q/default.nix b/tv/5pkgs/simple/q/default.nix index 2e7aa5c..2e7aa5c 100644 --- a/tv/5pkgs/q/default.nix +++ b/tv/5pkgs/simple/q/default.nix diff --git a/tv/5pkgs/viljetic-pages/default.nix b/tv/5pkgs/simple/viljetic-pages/default.nix index 1ae55cc..1ae55cc 100644 --- a/tv/5pkgs/viljetic-pages/default.nix +++ b/tv/5pkgs/simple/viljetic-pages/default.nix diff --git a/tv/5pkgs/viljetic-pages/index.html b/tv/5pkgs/simple/viljetic-pages/index.html index c06b3f9..c06b3f9 100644 --- a/tv/5pkgs/viljetic-pages/index.html +++ b/tv/5pkgs/simple/viljetic-pages/index.html diff --git a/tv/5pkgs/viljetic-pages/logo.xpm b/tv/5pkgs/simple/viljetic-pages/logo.xpm index bb263da..bb263da 100644 --- a/tv/5pkgs/viljetic-pages/logo.xpm +++ b/tv/5pkgs/simple/viljetic-pages/logo.xpm diff --git a/tv/5pkgs/xmonad-tv/default.nix b/tv/5pkgs/simple/xmonad-tv/default.nix index 5ac8f83..5ac8f83 100644 --- a/tv/5pkgs/xmonad-tv/default.nix +++ b/tv/5pkgs/simple/xmonad-tv/default.nix |