diff options
| author | tv <tv@krebsco.de> | 2016-10-22 14:54:19 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-10-22 17:50:57 +0200 |
| commit | 30fe90d4c7f2aad36527accdc12a0718c02bd143 (patch) | |
| tree | 5da4c1a2f4984caf187089c8a0d0ab78966db8ad | |
| parent | 147df0c9048ec01691993f7ceef8e95d68814ddb (diff) | |
tv pkgs: callPackage all subdirs
| -rw-r--r-- | tv/5pkgs/default.nix | 24 | ||||
| -rw-r--r-- | tv/5pkgs/xmonad-tv/default.nix (renamed from tv/5pkgs/xmonad-tv.nix) | 0 |
2 files changed, 19 insertions, 5 deletions
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index ace3ed00f..4eb8a10b4 100644 --- a/tv/5pkgs/default.nix +++ b/tv/5pkgs/default.nix @@ -1,7 +1,24 @@ { config, pkgs, ... }: with import <stockholm/lib>; { - nixpkgs.config.packageOverrides = super: { + nixpkgs.config.packageOverrides = 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; + + in {} + // mapAttrs (_: flip callPackage {}) + (filterAttrs (_: dir: pathExists (dir + "/default.nix")) + (subdirsOf ./.)) + // { # TODO use XDG_RUNTIME_DIR? cr = pkgs.writeDashBin "cr" '' set -efu @@ -12,7 +29,7 @@ with import <stockholm/lib>; --disk-cache-size=50000000 \ "$@" ''; - ejabberd = pkgs.callPackage ./ejabberd { + ejabberd = callPackage ./ejabberd { erlang = pkgs.erlangR16; }; ff = pkgs.writeDashBin "ff" '' @@ -22,8 +39,5 @@ with import <stockholm/lib>; if elem config.krebs.build.host.name ["xu" "wu"] then super.gnupg21 else super.gnupg; - q = pkgs.callPackage ./q {}; - viljetic-pages = pkgs.callPackage ./viljetic-pages {}; - xmonad-tv = import ./xmonad-tv.nix { inherit pkgs; }; }; } diff --git a/tv/5pkgs/xmonad-tv.nix b/tv/5pkgs/xmonad-tv/default.nix index c6a622bd1..c6a622bd1 100644 --- a/tv/5pkgs/xmonad-tv.nix +++ b/tv/5pkgs/xmonad-tv/default.nix |