From cb264dfb9119de4fb6d081171473e4276cdbb9d5 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 5 Feb 2016 15:11:22 +0100
Subject: urlwatch: 2.0 -> 2.1

---
 krebs/5pkgs/urlwatch/default.nix | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/urlwatch/default.nix b/krebs/5pkgs/urlwatch/default.nix
index d9b595314..780ad24f5 100644
--- a/krebs/5pkgs/urlwatch/default.nix
+++ b/krebs/5pkgs/urlwatch/default.nix
@@ -1,29 +1,18 @@
 { stdenv, fetchurl, python3Packages }:
 
 python3Packages.buildPythonPackage rec {
-  name = "urlwatch-2.0";
+  name = "urlwatch-2.1";
 
   src = fetchurl {
     url = "https://thp.io/2008/urlwatch/${name}.tar.gz";
-    sha256 = "0j38qzw4jxw41vnnpi6j851hqpv8d6p1cbni6cv8r2vqf5307s3b";
+    sha256 = "0xn435cml9wjwk39117p1diqmvw3jbmv9ccr7230iaf7z59vf9v6";
   };
 
   propagatedBuildInputs = with python3Packages; [
-    pyyaml
     keyring
-    (python3Packages.buildPythonPackage rec {
-      name = "minidb-2.0.1";
-      src = fetchurl {
-        url = "https://thp.io/2010/minidb/${name}.tar.gz";
-        sha256 = "1x958zr9jc26vaqij451qb9m2l7apcpz34ir9fwfjg4fwv24z2dy";
-      };
-      meta = {
-        description = "A simple SQLite3-based store for Python objects";
-        homepage = https://thp.io/2010/minidb/;
-        license = stdenv.lib.licenses.isc;
-        maintainers = [ stdenv.lib.maintainers.tv ];
-      };
-    })
+    minidb
+    pyyaml
+    requests2
   ];
 
   postFixup = ''
@@ -36,4 +25,4 @@ python3Packages.buildPythonPackage rec {
     license = stdenv.lib.licenses.bsd3;
     maintainers = [ stdenv.lib.maintainers.tv ];
   };
-}#
+}
-- 
cgit v1.3.1


From 02ad327081f2315b9ab15733319b167f64180a0d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 7 Feb 2016 05:32:03 +0100
Subject: krebs.backup writeDash* -> pkgs

---
 krebs/3modules/backup.nix | 35 ++++++++++-------------------------
 krebs/5pkgs/default.nix   | 15 +++++++++++++++
 2 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/3modules/backup.nix b/krebs/3modules/backup.nix
index 0f85b4879..ae766fa9d 100644
--- a/krebs/3modules/backup.nix
+++ b/krebs/3modules/backup.nix
@@ -128,11 +128,11 @@ let
   };
 
   push = plan: let
-    # We use writeDashBin and return the absolute path so systemd will produce
-    # nice names in the log, i.e. without the Nix store hash.
+    # We use pkgs.writeDashBin and return the absolute path so systemd will
+    # produce nice names in the log, i.e. without the Nix store hash.
     out = "${main}/bin/${main.name}";
 
-    main = writeDashBin "backup.${plan.name}.push" ''
+    main = pkgs.writeDashBin "backup.${plan.name}.push" ''
       set -efu
       dst=${shell.escape plan.dst.path}
 
@@ -140,7 +140,7 @@ let
       exec flock -n "$dst" ${critical-section}
     '';
 
-    critical-section = writeDash "backup.${plan.name}.push.critical-section" ''
+    critical-section = pkgs.writeDash "backup.${plan.name}.push.critical-section" ''
       # TODO check if there is a previous
       set -efu
       identity=${shell.escape plan.src.host.ssh.privkey.path}
@@ -173,7 +173,7 @@ let
           env NOW="$NOW" /bin/sh < ${remote-snapshot}
     '';
 
-    remote-snapshot = writeDash "backup.${plan.name}.push.remote-snapshot" ''
+    remote-snapshot = pkgs.writeDash "backup.${plan.name}.push.remote-snapshot" ''
       set -efu
       dst=${shell.escape plan.dst.path}
 
@@ -191,11 +191,11 @@ let
 
   # TODO admit plan.dst.user and its ssh identity
   pull = plan: let
-    # We use writeDashBin and return the absolute path so systemd will produce
-    # nice names in the log, i.e. without the Nix store hash.
+    # We use pkgs.writeDashBin and return the absolute path so systemd will
+    # produce nice names in the log, i.e. without the Nix store hash.
     out = "${main}/bin/${main.name}";
 
-    main = writeDashBin "backup.${plan.name}.pull" ''
+    main = pkgs.writeDashBin "backup.${plan.name}.pull" ''
       set -efu
       dst=${shell.escape plan.dst.path}
 
@@ -203,7 +203,7 @@ let
       exec flock -n "$dst" ${critical-section}
     '';
 
-    critical-section = writeDash "backup.${plan.name}.pull.critical-section" ''
+    critical-section = pkgs.writeDash "backup.${plan.name}.pull.critical-section" ''
       # TODO check if there is a previous
       set -efu
       identity=${shell.escape plan.dst.host.ssh.privkey.path}
@@ -235,7 +235,7 @@ let
     '';
   in out;
 
-  take-snapshots = plan: writeDash "backup.${plan.name}.take-snapshots" ''
+  take-snapshots = plan: pkgs.writeDash "backup.${plan.name}.take-snapshots" ''
     set -efu
     NOW=''${NOW-$(date +%s)}
     dst=${shell.escape plan.dst.path}
@@ -280,21 +280,6 @@ let
       plan.snapshots)}
   '';
 
-  writeDash = name: text: pkgs.writeScript name ''
-    #! ${pkgs.dash}/bin/dash
-    ${text}
-  '';
-
-  writeDashBin = name: text: pkgs.writeTextFile {
-    executable = true;
-    destination = "/bin/${name}";
-    name = name;
-    text = ''
-      #! ${pkgs.dash}/bin/dash
-      ${text}
-    '';
-  };
-
   # XXX Is one ping enough to determine fastest address?
   # Note that we're using net.addrs4 instead of net.aliases because we define
   # ports only for addresses.  See krebs/3modules/default.nix
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index c4b1dafe4..a0ccdcf49 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -61,6 +61,21 @@ subdirs // rec {
     strip --strip-unneeded "$exe"
   '';
 
+  writeDash = name: text: pkgs.writeScript name ''
+    #! ${pkgs.dash}/bin/dash
+    ${text}
+  '';
+
+  writeDashBin = name: text: pkgs.writeTextFile {
+    executable = true;
+    destination = "/bin/${name}";
+    name = name;
+    text = ''
+      #! ${pkgs.dash}/bin/dash
+      ${text}
+    '';
+  };
+
   writeNixFromCabal = name: path: pkgs.runCommand name {} ''
     ${pkgs.cabal2nix}/bin/cabal2nix ${path} > $out
   '';
-- 
cgit v1.3.1


From 2b8b92cf751831cfbfbf56745871b5242e29c26a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 8 Feb 2016 00:43:24 +0100
Subject: posix-array: how could this ever work?

---
 krebs/5pkgs/posix-array/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/posix-array/default.nix b/krebs/5pkgs/posix-array/default.nix
index 456a3cc11..cfcdb29a7 100644
--- a/krebs/5pkgs/posix-array/default.nix
+++ b/krebs/5pkgs/posix-array/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchgit, ... }:
+{ fetchgit, lib, stdenv, ... }:
 
-with stdenv; stdenv.mkDerivation rec {
-  name = "posix-array";
+stdenv.mkDerivation rec {
+  name = "posix-array-${version}";
   version = "1.0.0";
 
   src = fetchgit {
@@ -16,16 +16,15 @@ with stdenv; stdenv.mkDerivation rec {
   ];
 
   installPhase = ''
-    mkdir -p "$out/bin"
+    mkdir -p $out/bin
     cp -a ./array $out/bin
-    rm *
   '';
 
   meta = {
-    description = "Posix-compliant array implementation";
+    description = "POSIX-compliant array implementation";
     url = https://github.com/makefu/array;
-    license = licenses.wtfpl;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ makefu ];
+    license = lib.licenses.wtfpl;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ makefu ];
   };
 }
-- 
cgit v1.3.1


From ec7dc8a5ace37cdf1005cabd5a8554f4dc73727e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 8 Feb 2016 00:46:17 +0100
Subject: krebs pkgs: callPackages only subdirs with a defaut.nix

---
 krebs/5pkgs/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index a0ccdcf49..cf81a96c5 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -2,8 +2,9 @@
 
 with lib;
 let
-  subdirs = mapAttrs (_: flip pkgs.callPackage {}) (subdirsOf ./.);
-  pkgs' = pkgs // subdirs;
+  subdirs = mapAttrs (_: flip pkgs.callPackage {})
+                     (filterAttrs (_: dir.has-default-nix)
+                                  (subdirsOf ./.));
 in
 
 subdirs // rec {
@@ -22,7 +23,7 @@ subdirs // rec {
           (builtins.readDir ./haskell-overrides));
   };
 
-  push = pkgs'.callPackage ./push {
+  push = pkgs.callPackage ./push {
     inherit (subdirs) get jq;
   };
 
-- 
cgit v1.3.1


From d98578e3e190463a341a94f2cc778ef886f9252d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 8 Feb 2016 01:07:03 +0100
Subject: rm krebs.build.target

---
 krebs/3modules/build.nix                  | 8 --------
 krebs/5pkgs/test/infest-cac-centos7/notes | 1 -
 makefu/1systems/gum.nix                   | 1 -
 makefu/1systems/vbob.nix                  | 1 -
 mv/1systems/stro.nix                      | 2 --
 shared/1systems/wolf.nix                  | 1 -
 tv/1systems/cd.nix                        | 1 -
 tv/1systems/mkdir.nix                     | 1 -
 tv/1systems/rmdir.nix                     | 2 --
 tv/2configs/default.nix                   | 1 -
 10 files changed, 19 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/3modules/build.nix b/krebs/3modules/build.nix
index 0da5dd38a..3530fd595 100644
--- a/krebs/3modules/build.nix
+++ b/krebs/3modules/build.nix
@@ -3,8 +3,6 @@
 with lib;
 
 let
-  target = config.krebs.build // { user.name = "root"; };
-
   out = {
     # TODO deprecate krebs.build.host
     options.krebs.build.host = mkOption {
@@ -17,12 +15,6 @@ let
       default = "/nix/var/nix/profiles/system";
     };
 
-    # TODO make krebs.build.target.host :: host
-    options.krebs.build.target = mkOption {
-      type = with types; nullOr str;
-      default = null;
-    };
-
     # TODO deprecate krebs.build.user
     options.krebs.build.user = mkOption {
       type = types.user;
diff --git a/krebs/5pkgs/test/infest-cac-centos7/notes b/krebs/5pkgs/test/infest-cac-centos7/notes
index b3beb392f..db80c0c6c 100755
--- a/krebs/5pkgs/test/infest-cac-centos7/notes
+++ b/krebs/5pkgs/test/infest-cac-centos7/notes
@@ -115,7 +115,6 @@ _: {
   users.extraUsers.root.openssh.authorizedKeys.keys = [
     "$(cat ${krebs_ssh}.pub)"
   ];
-  krebs.build.target = "$ip";
 }
 EOF
 
diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix
index c4dfbf4b7..fe800f251 100644
--- a/makefu/1systems/gum.nix
+++ b/makefu/1systems/gum.nix
@@ -26,7 +26,6 @@ in {
   nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
 
   ###### stable
-  krebs.build.target = "root@gum.krebsco.de";
   krebs.build.host = config.krebs.hosts.gum;
   krebs.retiolum.extraConfig = ''
     ListenAddress = ${external-ip} 53
diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix
index 90b490802..20301795f 100644
--- a/makefu/1systems/vbob.nix
+++ b/makefu/1systems/vbob.nix
@@ -4,7 +4,6 @@
 { lib, config, pkgs, ... }:
 {
   krebs.build.host = config.krebs.hosts.vbob;
-  krebs.build.target = "root@10.10.10.220";
   imports =
     [ # Include the results of the hardware scan.
       <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>
diff --git a/mv/1systems/stro.nix b/mv/1systems/stro.nix
index 38d4b4bc6..3915219b7 100644
--- a/mv/1systems/stro.nix
+++ b/mv/1systems/stro.nix
@@ -8,8 +8,6 @@ with lib;
   krebs.build.source.git.nixpkgs.rev =
     "7ae05edcdd14f6ace83ead9bf0d114e97c89a83a";
 
-  krebs.build.target = "lolwat";
-
   imports = [
     ../2configs/hw/x220.nix
     ../2configs/git.nix
diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix
index bcfbd6810..9a514428a 100644
--- a/shared/1systems/wolf.nix
+++ b/shared/1systems/wolf.nix
@@ -45,7 +45,6 @@ in
   # uninteresting stuff
   #####################
   krebs.build.host = config.krebs.hosts.wolf;
-  krebs.build.target = "wolf";
 
   boot.kernel.sysctl = {
     # Enable IPv6 Privacy Extensions
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 8297a56df..b96548d61 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -4,7 +4,6 @@ with lib;
 
 {
   krebs.build.host = config.krebs.hosts.cd;
-  krebs.build.target = "root@cd.internet";
 
   imports = [
     ../2configs/hw/CAC-Developer-2.nix
diff --git a/tv/1systems/mkdir.nix b/tv/1systems/mkdir.nix
index 79e5f73b9..2010dcd57 100644
--- a/tv/1systems/mkdir.nix
+++ b/tv/1systems/mkdir.nix
@@ -17,7 +17,6 @@ in
 
 {
   krebs.build.host = config.krebs.hosts.mkdir;
-  krebs.build.target = "root@${primary-addr4}";
 
   imports = [
     ../2configs/hw/CAC-Developer-1.nix
diff --git a/tv/1systems/rmdir.nix b/tv/1systems/rmdir.nix
index 6fd79c596..4005b5e6f 100644
--- a/tv/1systems/rmdir.nix
+++ b/tv/1systems/rmdir.nix
@@ -18,8 +18,6 @@ in
 {
   krebs.build.host = config.krebs.hosts.rmdir;
 
-  krebs.build.target = "root@rmdir.internet";
-
   imports = [
     ../2configs/hw/CAC-Developer-1.nix
     ../2configs/fs/CAC-CentOS-7-64bit.nix
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 52d85f856..b5639af51 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -7,7 +7,6 @@ with lib;
 
   krebs.build = {
     user = config.krebs.users.tv;
-    target = mkDefault "root@${config.krebs.build.host.name}";
     source = mapAttrs (_: mkDefault) ({
       nixos-config = "symlink:stockholm/tv/1systems/${config.krebs.build.host.name}.nix";
       nixpkgs = symlink:stockholm/nixpkgs;
-- 
cgit v1.3.1


From 7f7256a76f5698a9f8599ce71780f47ab13590f4 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 8 Feb 2016 01:23:06 +0100
Subject: krebs pkgs: move builders to dedicated file

---
 krebs/5pkgs/builders.nix | 51 ++++++++++++++++++++++++++++++++++++++
 krebs/5pkgs/default.nix  | 64 +++++-------------------------------------------
 2 files changed, 57 insertions(+), 58 deletions(-)
 create mode 100644 krebs/5pkgs/builders.nix

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/builders.nix b/krebs/5pkgs/builders.nix
new file mode 100644
index 000000000..b3cb1c943
--- /dev/null
+++ b/krebs/5pkgs/builders.nix
@@ -0,0 +1,51 @@
+{ lib, pkgs, ... }:
+with lib;
+{
+  execve = name: { filename, argv, envp ? {}, destination ? "" }:
+    writeC name { inherit destination; } ''
+      #include <unistd.h>
+      int main () {
+        const char *filename = ${toC filename};
+        char *const argv[] = ${toC (argv ++ [null])};
+        char *const envp[] = ${toC (
+          mapAttrsToList (k: v: "${k}=${v}") envp ++ [null]
+        )};
+        execve(filename, argv, envp);
+        return -1;
+      }
+    '';
+
+  execveBin = name: cfg: execve name (cfg // { destination = "/bin/${name}"; });
+
+  writeC = name: { destination ? "" }: src: pkgs.runCommand name {} ''
+    PATH=${makeSearchPath "bin" (with pkgs; [
+      binutils
+      coreutils
+      gcc
+    ])}
+    src=${pkgs.writeText "${name}.c" src}
+    exe=$out${destination}
+    mkdir -p "$(dirname "$exe")"
+    gcc -O -Wall -o "$exe" $src
+    strip --strip-unneeded "$exe"
+  '';
+
+  writeDash = name: text: pkgs.writeScript name ''
+    #! ${pkgs.dash}/bin/dash
+    ${text}
+  '';
+
+  writeDashBin = name: text: pkgs.writeTextFile {
+    executable = true;
+    destination = "/bin/${name}";
+    name = name;
+    text = ''
+      #! ${pkgs.dash}/bin/dash
+      ${text}
+    '';
+  };
+
+  writeNixFromCabal = name: path: pkgs.runCommand name {} ''
+    ${pkgs.cabal2nix}/bin/cabal2nix ${path} > $out
+  '';
+}
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index cf81a96c5..89e19dffd 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -1,14 +1,6 @@
-{ lib, pkgs, ... }:
-
+{ lib, pkgs, ... }@args:
 with lib;
-let
-  subdirs = mapAttrs (_: flip pkgs.callPackage {})
-                     (filterAttrs (_: dir.has-default-nix)
-                                  (subdirsOf ./.));
-in
-
-subdirs // rec {
-
+{
   haskellPackages = pkgs.haskellPackages.override {
     overrides = self: super:
       mapAttrs (name: path: self.callPackage path {})
@@ -29,55 +21,11 @@ subdirs // rec {
 
   ReaktorPlugins = pkgs.callPackage ./Reaktor/plugins.nix {};
 
-  execve = name: { filename, argv, envp ? {}, destination ? "" }:
-    writeC name { inherit destination; } ''
-      #include <unistd.h>
-      int main () {
-        const char *filename = ${toC filename};
-        char *const argv[] = ${toC (argv ++ [null])};
-        char *const envp[] = ${toC (
-          mapAttrsToList (k: v: "${k}=${v}") envp ++ [null]
-        )};
-        execve(filename, argv, envp);
-        return -1;
-      }
-    '';
-
   test = {
     infest-cac-centos7 = pkgs.callPackage ./test/infest-cac-centos7 {};
   };
-
-  execveBin = name: cfg: execve name (cfg // { destination = "/bin/${name}"; });
-
-  writeC = name: { destination ? "" }: src: pkgs.runCommand name {} ''
-    PATH=${makeSearchPath "bin" (with pkgs; [
-      binutils
-      coreutils
-      gcc
-    ])}
-    src=${pkgs.writeText "${name}.c" src}
-    exe=$out${destination}
-    mkdir -p "$(dirname "$exe")"
-    gcc -O -Wall -o "$exe" $src
-    strip --strip-unneeded "$exe"
-  '';
-
-  writeDash = name: text: pkgs.writeScript name ''
-    #! ${pkgs.dash}/bin/dash
-    ${text}
-  '';
-
-  writeDashBin = name: text: pkgs.writeTextFile {
-    executable = true;
-    destination = "/bin/${name}";
-    name = name;
-    text = ''
-      #! ${pkgs.dash}/bin/dash
-      ${text}
-    '';
-  };
-
-  writeNixFromCabal = name: path: pkgs.runCommand name {} ''
-    ${pkgs.cabal2nix}/bin/cabal2nix ${path} > $out
-  '';
 }
+// import ./builders.nix args
+// mapAttrs (_: flip pkgs.callPackage {})
+            (filterAttrs (_: dir.has-default-nix)
+                         (subdirsOf ./.))
-- 
cgit v1.3.1


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

(limited to 'krebs/5pkgs')

diff --git a/default.nix b/default.nix
index b0ad60d8a..2aa0a8e14 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 89e19dffd..1cf3de56e 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 2b9582912..fee4654ae 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 436c52fcd..c4a7f498f 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 2eb33a153..000000000
--- a/miefda/5pkgs/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-_:{}
diff --git a/mv/5pkgs/default.nix b/mv/5pkgs/default.nix
index 0c72c450e..882ac0413 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 fdcfbb209..000000000
--- 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 be10e91eb..b520e1a32 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.3.1


From 7b3b839cc7a2af73dee9858e6ebcc7be831eb481 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 11 Feb 2016 18:19:56 +0100
Subject: cac-api: PATH += gnugrep (how could this ever pass full-tests?! :D)

---
 krebs/5pkgs/cac-api/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/cac-api/default.nix b/krebs/5pkgs/cac-api/default.nix
index 9ab6ac8b2..30c0168f3 100644
--- a/krebs/5pkgs/cac-api/default.nix
+++ b/krebs/5pkgs/cac-api/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, bc, cac-cert, coreutils, curl, dash, gnused, inotifyTools, jq, ncurses, openssh, sshpass, ... }:
+{ stdenv, fetchgit, bc, cac-cert, coreutils, curl, dash, gnugrep, gnused, inotifyTools, jq, ncurses, openssh, sshpass, ... }:
 
 stdenv.mkDerivation {
   name = "cac-api-1.1.0";
@@ -22,6 +22,7 @@ stdenv.mkDerivation {
       bc
       coreutils
       curl
+      gnugrep
       gnused
       inotifyTools
       jq
-- 
cgit v1.3.1