From 0cf6d065f43c66efadd0a364c3414e6ecdae0004 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 11 Feb 2016 03:47:26 +0100
Subject: *: turn 5pkgs into a(n optional) module

---
 default.nix              |  6 +-----
 krebs/5pkgs/default.nix  | 50 +++++++++++++++++++++++++-----------------------
 lass/5pkgs/default.nix   | 21 ++++++++++----------
 makefu/5pkgs/default.nix | 12 +++++++-----
 miefda/5pkgs/default.nix |  1 -
 mv/5pkgs/default.nix     | 39 +++++++++++++++++++------------------
 shared/5pkgs/default.nix |  5 -----
 tv/5pkgs/default.nix     | 37 +++++++++++++++++++----------------
 8 files changed, 85 insertions(+), 86 deletions(-)
 delete mode 100644 miefda/5pkgs/default.nix
 delete mode 100644 shared/5pkgs/default.nix

diff --git a/default.nix b/default.nix
index b0ad60d8..2aa0a8e1 100644
--- a/default.nix
+++ b/default.nix
@@ -43,16 +43,12 @@ let stockholm = {
     imports = builtins.filter lib.dir.has-default-nix (lib.concatLists [
       (map (f: f "2configs") [ lib.upath ])
       (map (f: f "3modules") [ lib.kpath lib.upath ])
+      (map (f: f "5pkgs") [ lib.kpath lib.upath ])
     ]);
 
     krebs.current.enable = true;
     krebs.current.host = config.krebs.hosts.${current-host-name};
     krebs.current.user = config.krebs.users.${current-user-name};
-
-    nixpkgs.config.packageOverrides = pkgs: let
-      kpkgs = import (lib.kpath "5pkgs") { inherit lib pkgs; };
-      upkgs = import (lib.upath "5pkgs") { inherit lib; pkgs = pkgs // kpkgs; };
-    in kpkgs // upkgs;
   };
 
   eval = config: import (lib.npath "nixos/lib/eval-config.nix") {
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 89e19dff..1cf3de56 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -1,31 +1,33 @@
 { lib, pkgs, ... }@args:
 with lib;
 {
-  haskellPackages = pkgs.haskellPackages.override {
-    overrides = self: super:
-      mapAttrs (name: path: self.callPackage path {})
-        (mapAttrs'
-          (name: type:
-            if hasSuffix ".nix" name
-              then {
-                name = removeSuffix ".nix" name;
-                value = ./haskell-overrides + "/${name}";
-              }
-              else null)
-          (builtins.readDir ./haskell-overrides));
-  };
+  nixpkgs.config.packageOverrides = pkgs: {
+    haskellPackages = pkgs.haskellPackages.override {
+      overrides = self: super:
+        mapAttrs (name: path: self.callPackage path {})
+          (mapAttrs'
+            (name: type:
+              if hasSuffix ".nix" name
+                then {
+                  name = removeSuffix ".nix" name;
+                  value = ./haskell-overrides + "/${name}";
+                }
+                else null)
+            (builtins.readDir ./haskell-overrides));
+    };
 
-  push = pkgs.callPackage ./push {
-    inherit (subdirs) get jq;
-  };
+    push = pkgs.callPackage ./push {
+      inherit (subdirs) get jq;
+    };
 
-  ReaktorPlugins = pkgs.callPackage ./Reaktor/plugins.nix {};
+    ReaktorPlugins = pkgs.callPackage ./Reaktor/plugins.nix {};
 
-  test = {
-    infest-cac-centos7 = pkgs.callPackage ./test/infest-cac-centos7 {};
-  };
+    test = {
+      infest-cac-centos7 = pkgs.callPackage ./test/infest-cac-centos7 {};
+    };
+  }
+  // import ./builders.nix args
+  // mapAttrs (_: flip pkgs.callPackage {})
+              (filterAttrs (_: dir.has-default-nix)
+                           (subdirsOf ./.));
 }
-// import ./builders.nix args
-// mapAttrs (_: flip pkgs.callPackage {})
-            (filterAttrs (_: dir.has-default-nix)
-                         (subdirsOf ./.))
diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index 2b958291..fee4654a 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -3,15 +3,16 @@
 let
   inherit (pkgs) callPackage;
 in
-
-rec {
-  firefoxPlugins = {
-    noscript = callPackage ./firefoxPlugins/noscript.nix {};
-    ublock = callPackage ./firefoxPlugins/ublock.nix {};
-    vimperator = callPackage ./firefoxPlugins/vimperator.nix {};
+{
+  nixpkgs.config.packageOverrides = rec {
+    firefoxPlugins = {
+      noscript = callPackage ./firefoxPlugins/noscript.nix {};
+      ublock = callPackage ./firefoxPlugins/ublock.nix {};
+      vimperator = callPackage ./firefoxPlugins/vimperator.nix {};
+    };
+    newsbot-js = callPackage ./newsbot-js/default.nix {};
+    xmonad-lass =
+      let src = pkgs.writeNixFromCabal "xmonad-lass.nix" ./xmonad-lass; in
+      pkgs.haskellPackages.callPackage src {};
   };
-  newsbot-js = callPackage ./newsbot-js/default.nix {};
-  xmonad-lass =
-    let src = pkgs.writeNixFromCabal "xmonad-lass.nix" ./xmonad-lass; in
-    pkgs.haskellPackages.callPackage src {};
 }
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 436c52fc..c4a7f498 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -4,9 +4,11 @@ let
   inherit (pkgs) callPackage;
 in
 {
-  alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";};
-  alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
-  alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
-  awesomecfg = callPackage ./awesomecfg {};
-  tw-upload-plugin = callPackage ./tw-upload-plugin {};
+  nixpkgs.config.packageOverrides = rec {
+    alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";};
+    alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
+    alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
+    awesomecfg = callPackage ./awesomecfg {};
+    tw-upload-plugin = callPackage ./tw-upload-plugin {};
+  };
 }
diff --git a/miefda/5pkgs/default.nix b/miefda/5pkgs/default.nix
deleted file mode 100644
index 2eb33a15..00000000
--- a/miefda/5pkgs/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-_:{}
diff --git a/mv/5pkgs/default.nix b/mv/5pkgs/default.nix
index 0c72c450..882ac041 100644
--- a/mv/5pkgs/default.nix
+++ b/mv/5pkgs/default.nix
@@ -1,23 +1,24 @@
 { pkgs, ... }:
 
 {
-  # TODO use XDG_RUNTIME_DIR?
-  cr = pkgs.writeScriptBin "cr" ''
-    #! /bin/sh
-    set -efu
-    export LC_TIME=de_DE.utf8
-    exec ${pkgs.chromium}/bin/chromium \
-        --ssl-version-min=tls1 \
-        --disk-cache-dir=/tmp/chromium-disk-cache_"$LOGNAME" \
-        --disk-cache-size=50000000 \
-        "%@"
-  '';
-  ff = pkgs.writeScriptBin "ff" ''
-    #! /bin/sh
-    set -efu
-    exec ${pkgs.firefoxWrapper}/bin/firefox $(printf " %q" "$@")
-  '';
-  xmonad-tv =
-    let src = pkgs.writeNixFromCabal "xmonad-tv.nix" ./xmonad-tv; in
-    pkgs.haskellPackages.callPackage src {};
+  nixpkgs.config.packageOverrides = rec {
+    cr = pkgs.writeScriptBin "cr" ''
+      #! /bin/sh
+      set -efu
+      export LC_TIME=de_DE.utf8
+      exec ${pkgs.chromium}/bin/chromium \
+          --ssl-version-min=tls1 \
+          --disk-cache-dir=/tmp/chromium-disk-cache_"$LOGNAME" \
+          --disk-cache-size=50000000 \
+          "%@"
+    '';
+    ff = pkgs.writeScriptBin "ff" ''
+      #! /bin/sh
+      set -efu
+      exec ${pkgs.firefoxWrapper}/bin/firefox $(printf " %q" "$@")
+    '';
+    xmonad-tv =
+      let src = pkgs.writeNixFromCabal "xmonad-tv.nix" ./xmonad-tv; in
+      pkgs.haskellPackages.callPackage src {};
+  };
 }
diff --git a/shared/5pkgs/default.nix b/shared/5pkgs/default.nix
deleted file mode 100644
index fdcfbb20..00000000
--- a/shared/5pkgs/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-# TODO don't require 5pkgs
-_:
-
-{
-}
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index be10e91e..b520e1a3 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -1,22 +1,25 @@
 { pkgs, ... }:
 
 {
-  cr = pkgs.writeScriptBin "cr" ''
-    #! /bin/sh
-    set -efu
-    export LC_TIME=de_DE.utf8
-    exec ${pkgs.chromium}/bin/chromium \
-        --ssl-version-min=tls1 \
-        --disk-cache-dir=/tmp/chromium-disk-cache_"$LOGNAME" \
-        --disk-cache-size=50000000 \
-        "%@"
-  '';
-  ejabberd = pkgs.callPackage ./ejabberd {
-    erlang = pkgs.erlangR16;
+  nixpkgs.config.packageOverrides = {
+    # TODO use XDG_RUNTIME_DIR?
+    cr = pkgs.writeScriptBin "cr" ''
+      #! /bin/sh
+      set -efu
+      export LC_TIME=de_DE.utf8
+      exec ${pkgs.chromium}/bin/chromium \
+          --ssl-version-min=tls1 \
+          --disk-cache-dir=/tmp/chromium-disk-cache_"$LOGNAME" \
+          --disk-cache-size=50000000 \
+          "%@"
+    '';
+    ejabberd = pkgs.callPackage ./ejabberd {
+      erlang = pkgs.erlangR16;
+    };
+    ff = pkgs.callPackage ./ff {};
+    viljetic-pages = pkgs.callPackage ./viljetic-pages {};
+    xmonad-tv =
+      let src = pkgs.writeNixFromCabal "xmonad-tv.nix" ./xmonad-tv; in
+      pkgs.haskellPackages.callPackage src {};
   };
-  ff = pkgs.callPackage ./ff {};
-  viljetic-pages = pkgs.callPackage ./viljetic-pages {};
-  xmonad-tv =
-    let src = pkgs.writeNixFromCabal "xmonad-tv.nix" ./xmonad-tv; in
-    pkgs.haskellPackages.callPackage src {};
 }
-- 
cgit v1.2.3