Merge branch 'staging/jeschli' of prism.r:stockholm into staging/jeschli

1 files changed, 31 insertions, 32 deletions

diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index a158cd3c6..28482eb91 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -1,40 +1,39 @@
-{ config, pkgs, ... }@args:
+with import <stockholm/lib>;
+self: super: let
 
-{
-  nixpkgs.config.packageOverrides = rec {
-    acronym = pkgs.callPackage ./acronym/default.nix {};
-    dpass = pkgs.callPackage ./dpass {};
-    firefoxPlugins = {
-      noscript = pkgs.callPackage ./firefoxPlugins/noscript.nix {};
-      ublock = pkgs.callPackage ./firefoxPlugins/ublock.nix {};
-      vimperator = pkgs.callPackage ./firefoxPlugins/vimperator.nix {};
-    };
-    init = pkgs.callPackage ./init/default.nix args;
-    logify = pkgs.callPackage ./logify/default.nix {};
-    mk_sql_pair = pkgs.callPackage ./mk_sql_pair/default.nix {};
-    mpv-poll = pkgs.callPackage ./mpv-poll/default.nix {};
-    pop = pkgs.callPackage ./pop/default.nix {};
-    q = pkgs.callPackage ./q {};
-    rs = pkgs.callPackage ./rs/default.nix {};
-    urban = pkgs.callPackage ./urban/default.nix {};
-    xml2json = pkgs.callPackage ./xml2json/default.nix {};
-    xmonad-lass = import ./xmonad-lass.nix { inherit config pkgs; };
-    yt-next = pkgs.callPackage ./yt-next/default.nix {};
+  # 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;
 
-    bank = pkgs.writeDashBin "bank" ''
+   subdirsOf = path:
+     mapAttrs (name: _: path + "/${name}")
+              (filterAttrs (_: eq "directory") (readDir path));
+
+in {
+    bank = self.writeDashBin "bank" ''
       tmp=$(mktemp)
-      ${pkgs.pass}/bin/pass show hledger > $tmp
-      ${pkgs.hledger}/bin/hledger --file=$tmp "$@"
-      ${pkgs.pass}/bin/pass show hledger | if ${pkgs.diffutils}/bin/diff $tmp -; then
+      ${self.pass}/bin/pass show hledger > $tmp
+      ${self.hledger}/bin/hledger --file=$tmp "$@"
+      ${self.pass}/bin/pass show hledger | if ${self.diffutils}/bin/diff $tmp -; then
         exit 0
       else
-        ${pkgs.coreutils}/bin/cat $tmp | ${pkgs.pass}/bin/pass insert -m hledger
+        ${self.coreutils}/bin/cat $tmp | ${self.pass}/bin/pass insert -m hledger
       fi
-      ${pkgs.coreutils}/bin/rm $tmp
-    '';
-    screengrab = pkgs.writeDashBin "screengrab" ''
-      resolution="$(${pkgs.xorg.xrandr}/bin/xrandr | ${pkgs.gnugrep}/bin/grep '*' | ${pkgs.gawk}/bin/awk '{print $1}')"
-      ${pkgs.ffmpeg}/bin/ffmpeg -f x11grab -r 25 -i :${toString config.services.xserver.display} -s $resolution -c:v huffyuv $1
+      ${self.coreutils}/bin/rm $tmp
     '';
-  };
+    rtl8814au = callPackage ./custom/rtl8814au { kernel = self.linux; };
 }
+
+// mapAttrs (_: flip callPackage {})
+            (filterAttrs (_: dir: pathExists (dir + "/default.nix"))
+                         (subdirsOf ./.))