From f0b98bd0114df1e1ebb82ff300f9532d86b3eb18 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 24 May 2017 01:43:50 +0200
Subject: [PATCH 1/8] krebs/5pkgs: move simple pkgs to a subdir

---
 krebs/5pkgs/default.nix                               | 11 ++++-------
 krebs/5pkgs/{ => simple}/Reaktor/default.nix          |  0
 krebs/5pkgs/{ => simple}/Reaktor/plugins.nix          |  0
 .../{ => simple}/Reaktor/scripts/random-emoji.sh      |  0
 .../{ => simple}/Reaktor/scripts/random-issue.sh      |  0
 .../5pkgs/{ => simple}/Reaktor/scripts/sed-plugin.py  |  0
 .../{ => simple}/Reaktor/scripts/shack-correct.sh     |  0
 krebs/5pkgs/{ => simple}/apt-cacher-ng/default.nix    |  0
 .../5pkgs/{ => simple}/bepasty-client-cli/default.nix |  0
 krebs/5pkgs/{ => simple}/buildbot/default.nix         |  0
 krebs/5pkgs/{ => simple}/buildbot/worker.nix          |  0
 krebs/5pkgs/{ => simple}/cac-api/default.nix          |  0
 krebs/5pkgs/{ => simple}/cac-cert/cac.pem             |  0
 krebs/5pkgs/{ => simple}/cac-cert/default.nix         |  0
 krebs/5pkgs/{ => simple}/cac-panel/default.nix        |  0
 .../{ => simple}/collectd-connect-time/default.nix    |  0
 krebs/5pkgs/simple/default.nix                        | 10 ++++++++++
 krebs/5pkgs/{ => simple}/dic/default.nix              |  0
 .../{ => simple}/drivedroid-gen-repo/default.nix      |  0
 krebs/5pkgs/{ => simple}/fortclientsslvpn/default.nix |  0
 krebs/5pkgs/{ => simple}/games-user-env/default.nix   |  0
 krebs/5pkgs/{ => simple}/get/default.nix              |  0
 krebs/5pkgs/{ => simple}/git-hooks/default.nix        |  0
 .../5pkgs/{ => simple}/github-hosts-sync/default.nix  |  0
 krebs/5pkgs/{ => simple}/go-shortener/default.nix     |  0
 krebs/5pkgs/{ => simple}/go-shortener/packages.nix    |  0
 krebs/5pkgs/{ => simple}/goify/default.nix            |  0
 krebs/5pkgs/{ => simple}/hashPassword/default.nix     |  0
 krebs/5pkgs/{ => simple}/htgen/default.nix            |  0
 krebs/5pkgs/{ => simple}/irc-announce/default.nix     |  0
 krebs/5pkgs/{ => simple}/kpaste/default.nix           |  0
 krebs/5pkgs/{ => simple}/krebspaste/default.nix       |  0
 krebs/5pkgs/{ => simple}/krebszones/default.nix       |  0
 krebs/5pkgs/{ => simple}/logf/default.nix             |  0
 krebs/5pkgs/{ => simple}/much/cabal.nix               |  0
 krebs/5pkgs/{ => simple}/much/default.nix             |  0
 krebs/5pkgs/{ => simple}/netcup/default.nix           |  0
 krebs/5pkgs/{ => simple}/newsbot-js/default.nix       |  0
 krebs/5pkgs/{ => simple}/newsbot-js/packages.nix      |  0
 krebs/5pkgs/{ => simple}/noVNC/default.nix            |  0
 krebs/5pkgs/{ => simple}/painload/default.nix         |  0
 krebs/5pkgs/{ => simple}/passwdqc-utils/default.nix   |  0
 krebs/5pkgs/{ => simple}/populate/default.nix         |  0
 krebs/5pkgs/{ => simple}/posix-array/default.nix      |  0
 krebs/5pkgs/{ => simple}/pssh/default.nix             |  0
 krebs/5pkgs/{ => simple}/push/default.nix             |  0
 krebs/5pkgs/{ => simple}/realwallpaper/default.nix    |  0
 krebs/5pkgs/{ => simple}/repo-sync/default.nix        |  0
 .../5pkgs/{ => simple}/retiolum-bootstrap/default.nix |  0
 krebs/5pkgs/{ => simple}/rutorrent/default.nix        |  0
 krebs/5pkgs/{ => simple}/tarantool/default.nix        |  0
 krebs/5pkgs/{ => simple}/tinc_graphs/default.nix      |  0
 krebs/5pkgs/{ => simple}/translate-shell/default.nix  |  0
 krebs/5pkgs/{ => simple}/treq/default.nix             |  0
 krebs/5pkgs/{ => simple}/untilport/default.nix        |  0
 krebs/5pkgs/{ => simple}/urlwatch/default.nix         |  0
 krebs/5pkgs/{ => simple}/weechat/default.nix          |  0
 krebs/5pkgs/{ => simple}/whatsupnix/default.nix       |  0
 krebs/5pkgs/{ => simple}/whatsupnix/whatsupnix.bash   |  0
 krebs/5pkgs/{ => simple}/with-tmpdir/default.nix      |  0
 krebs/5pkgs/{ => simple}/youtube-tools/default.nix    |  0
 krebs/5pkgs/{ => simple}/zandronum-bin/default.nix    |  0
 62 files changed, 14 insertions(+), 7 deletions(-)
 rename krebs/5pkgs/{ => simple}/Reaktor/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/Reaktor/plugins.nix (100%)
 rename krebs/5pkgs/{ => simple}/Reaktor/scripts/random-emoji.sh (100%)
 rename krebs/5pkgs/{ => simple}/Reaktor/scripts/random-issue.sh (100%)
 rename krebs/5pkgs/{ => simple}/Reaktor/scripts/sed-plugin.py (100%)
 rename krebs/5pkgs/{ => simple}/Reaktor/scripts/shack-correct.sh (100%)
 rename krebs/5pkgs/{ => simple}/apt-cacher-ng/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/bepasty-client-cli/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/buildbot/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/buildbot/worker.nix (100%)
 rename krebs/5pkgs/{ => simple}/cac-api/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/cac-cert/cac.pem (100%)
 rename krebs/5pkgs/{ => simple}/cac-cert/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/cac-panel/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/collectd-connect-time/default.nix (100%)
 create mode 100644 krebs/5pkgs/simple/default.nix
 rename krebs/5pkgs/{ => simple}/dic/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/drivedroid-gen-repo/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/fortclientsslvpn/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/games-user-env/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/get/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/git-hooks/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/github-hosts-sync/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/go-shortener/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/go-shortener/packages.nix (100%)
 rename krebs/5pkgs/{ => simple}/goify/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/hashPassword/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/htgen/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/irc-announce/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/kpaste/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/krebspaste/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/krebszones/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/logf/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/much/cabal.nix (100%)
 rename krebs/5pkgs/{ => simple}/much/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/netcup/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/newsbot-js/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/newsbot-js/packages.nix (100%)
 rename krebs/5pkgs/{ => simple}/noVNC/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/painload/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/passwdqc-utils/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/populate/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/posix-array/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/pssh/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/push/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/realwallpaper/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/repo-sync/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/retiolum-bootstrap/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/rutorrent/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/tarantool/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/tinc_graphs/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/translate-shell/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/treq/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/untilport/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/urlwatch/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/weechat/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/whatsupnix/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/whatsupnix/whatsupnix.bash (100%)
 rename krebs/5pkgs/{ => simple}/with-tmpdir/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/youtube-tools/default.nix (100%)
 rename krebs/5pkgs/{ => simple}/zandronum-bin/default.nix (100%)

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 81481e14b..5af541258 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -12,10 +12,8 @@ with import <stockholm/lib>;
       then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
       else override;
   in {}
+  // import ./simple pkgs oldpkgs
   // import ./writers.nix pkgs oldpkgs
-  // mapAttrs (_: flip callPackage {})
-              (filterAttrs (_: dir: pathExists (dir + "/default.nix"))
-                           (subdirsOf ./.))
   // {
     empty = pkgs.runCommand "empty-1.0.0" {} "mkdir $out";
 
@@ -33,13 +31,12 @@ with import <stockholm/lib>;
             (builtins.readDir ./haskell-overrides));
     };
 
-    ReaktorPlugins = callPackage ./Reaktor/plugins.nix {};
+    ReaktorPlugins = callPackage ./simple/Reaktor/plugins.nix {};
 
-    buildbot = callPackage ./buildbot {};
-    buildbot-full = callPackage ./buildbot {
+    buildbot-full = callPackage ./simple/buildbot {
       plugins = with pkgs.buildbot-plugins; [ www console-view waterfall-view ];
     };
-    buildbot-worker = callPackage ./buildbot/worker.nix {};
+    buildbot-worker = callPackage ./simple/buildbot/worker.nix {};
 
     # https://github.com/proot-me/PRoot/issues/106
     proot = pkgs.writeDashBin "proot" ''
diff --git a/krebs/5pkgs/Reaktor/default.nix b/krebs/5pkgs/simple/Reaktor/default.nix
similarity index 100%
rename from krebs/5pkgs/Reaktor/default.nix
rename to krebs/5pkgs/simple/Reaktor/default.nix
diff --git a/krebs/5pkgs/Reaktor/plugins.nix b/krebs/5pkgs/simple/Reaktor/plugins.nix
similarity index 100%
rename from krebs/5pkgs/Reaktor/plugins.nix
rename to krebs/5pkgs/simple/Reaktor/plugins.nix
diff --git a/krebs/5pkgs/Reaktor/scripts/random-emoji.sh b/krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh
similarity index 100%
rename from krebs/5pkgs/Reaktor/scripts/random-emoji.sh
rename to krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh
diff --git a/krebs/5pkgs/Reaktor/scripts/random-issue.sh b/krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh
similarity index 100%
rename from krebs/5pkgs/Reaktor/scripts/random-issue.sh
rename to krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh
diff --git a/krebs/5pkgs/Reaktor/scripts/sed-plugin.py b/krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py
similarity index 100%
rename from krebs/5pkgs/Reaktor/scripts/sed-plugin.py
rename to krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py
diff --git a/krebs/5pkgs/Reaktor/scripts/shack-correct.sh b/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh
similarity index 100%
rename from krebs/5pkgs/Reaktor/scripts/shack-correct.sh
rename to krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh
diff --git a/krebs/5pkgs/apt-cacher-ng/default.nix b/krebs/5pkgs/simple/apt-cacher-ng/default.nix
similarity index 100%
rename from krebs/5pkgs/apt-cacher-ng/default.nix
rename to krebs/5pkgs/simple/apt-cacher-ng/default.nix
diff --git a/krebs/5pkgs/bepasty-client-cli/default.nix b/krebs/5pkgs/simple/bepasty-client-cli/default.nix
similarity index 100%
rename from krebs/5pkgs/bepasty-client-cli/default.nix
rename to krebs/5pkgs/simple/bepasty-client-cli/default.nix
diff --git a/krebs/5pkgs/buildbot/default.nix b/krebs/5pkgs/simple/buildbot/default.nix
similarity index 100%
rename from krebs/5pkgs/buildbot/default.nix
rename to krebs/5pkgs/simple/buildbot/default.nix
diff --git a/krebs/5pkgs/buildbot/worker.nix b/krebs/5pkgs/simple/buildbot/worker.nix
similarity index 100%
rename from krebs/5pkgs/buildbot/worker.nix
rename to krebs/5pkgs/simple/buildbot/worker.nix
diff --git a/krebs/5pkgs/cac-api/default.nix b/krebs/5pkgs/simple/cac-api/default.nix
similarity index 100%
rename from krebs/5pkgs/cac-api/default.nix
rename to krebs/5pkgs/simple/cac-api/default.nix
diff --git a/krebs/5pkgs/cac-cert/cac.pem b/krebs/5pkgs/simple/cac-cert/cac.pem
similarity index 100%
rename from krebs/5pkgs/cac-cert/cac.pem
rename to krebs/5pkgs/simple/cac-cert/cac.pem
diff --git a/krebs/5pkgs/cac-cert/default.nix b/krebs/5pkgs/simple/cac-cert/default.nix
similarity index 100%
rename from krebs/5pkgs/cac-cert/default.nix
rename to krebs/5pkgs/simple/cac-cert/default.nix
diff --git a/krebs/5pkgs/cac-panel/default.nix b/krebs/5pkgs/simple/cac-panel/default.nix
similarity index 100%
rename from krebs/5pkgs/cac-panel/default.nix
rename to krebs/5pkgs/simple/cac-panel/default.nix
diff --git a/krebs/5pkgs/collectd-connect-time/default.nix b/krebs/5pkgs/simple/collectd-connect-time/default.nix
similarity index 100%
rename from krebs/5pkgs/collectd-connect-time/default.nix
rename to krebs/5pkgs/simple/collectd-connect-time/default.nix
diff --git a/krebs/5pkgs/simple/default.nix b/krebs/5pkgs/simple/default.nix
new file mode 100644
index 000000000..2f6799759
--- /dev/null
+++ b/krebs/5pkgs/simple/default.nix
@@ -0,0 +1,10 @@
+with import <stockholm/lib>;
+
+self: super:
+listToAttrs
+  (map
+    (name: nameValuePair (removeSuffix ".nix" name)
+                         (super.callPackage (./. + "/${name}") {}))
+    (filter
+      (name: name != "default.nix" && !hasPrefix "." name)
+      (attrNames (readDir ./.))))
diff --git a/krebs/5pkgs/dic/default.nix b/krebs/5pkgs/simple/dic/default.nix
similarity index 100%
rename from krebs/5pkgs/dic/default.nix
rename to krebs/5pkgs/simple/dic/default.nix
diff --git a/krebs/5pkgs/drivedroid-gen-repo/default.nix b/krebs/5pkgs/simple/drivedroid-gen-repo/default.nix
similarity index 100%
rename from krebs/5pkgs/drivedroid-gen-repo/default.nix
rename to krebs/5pkgs/simple/drivedroid-gen-repo/default.nix
diff --git a/krebs/5pkgs/fortclientsslvpn/default.nix b/krebs/5pkgs/simple/fortclientsslvpn/default.nix
similarity index 100%
rename from krebs/5pkgs/fortclientsslvpn/default.nix
rename to krebs/5pkgs/simple/fortclientsslvpn/default.nix
diff --git a/krebs/5pkgs/games-user-env/default.nix b/krebs/5pkgs/simple/games-user-env/default.nix
similarity index 100%
rename from krebs/5pkgs/games-user-env/default.nix
rename to krebs/5pkgs/simple/games-user-env/default.nix
diff --git a/krebs/5pkgs/get/default.nix b/krebs/5pkgs/simple/get/default.nix
similarity index 100%
rename from krebs/5pkgs/get/default.nix
rename to krebs/5pkgs/simple/get/default.nix
diff --git a/krebs/5pkgs/git-hooks/default.nix b/krebs/5pkgs/simple/git-hooks/default.nix
similarity index 100%
rename from krebs/5pkgs/git-hooks/default.nix
rename to krebs/5pkgs/simple/git-hooks/default.nix
diff --git a/krebs/5pkgs/github-hosts-sync/default.nix b/krebs/5pkgs/simple/github-hosts-sync/default.nix
similarity index 100%
rename from krebs/5pkgs/github-hosts-sync/default.nix
rename to krebs/5pkgs/simple/github-hosts-sync/default.nix
diff --git a/krebs/5pkgs/go-shortener/default.nix b/krebs/5pkgs/simple/go-shortener/default.nix
similarity index 100%
rename from krebs/5pkgs/go-shortener/default.nix
rename to krebs/5pkgs/simple/go-shortener/default.nix
diff --git a/krebs/5pkgs/go-shortener/packages.nix b/krebs/5pkgs/simple/go-shortener/packages.nix
similarity index 100%
rename from krebs/5pkgs/go-shortener/packages.nix
rename to krebs/5pkgs/simple/go-shortener/packages.nix
diff --git a/krebs/5pkgs/goify/default.nix b/krebs/5pkgs/simple/goify/default.nix
similarity index 100%
rename from krebs/5pkgs/goify/default.nix
rename to krebs/5pkgs/simple/goify/default.nix
diff --git a/krebs/5pkgs/hashPassword/default.nix b/krebs/5pkgs/simple/hashPassword/default.nix
similarity index 100%
rename from krebs/5pkgs/hashPassword/default.nix
rename to krebs/5pkgs/simple/hashPassword/default.nix
diff --git a/krebs/5pkgs/htgen/default.nix b/krebs/5pkgs/simple/htgen/default.nix
similarity index 100%
rename from krebs/5pkgs/htgen/default.nix
rename to krebs/5pkgs/simple/htgen/default.nix
diff --git a/krebs/5pkgs/irc-announce/default.nix b/krebs/5pkgs/simple/irc-announce/default.nix
similarity index 100%
rename from krebs/5pkgs/irc-announce/default.nix
rename to krebs/5pkgs/simple/irc-announce/default.nix
diff --git a/krebs/5pkgs/kpaste/default.nix b/krebs/5pkgs/simple/kpaste/default.nix
similarity index 100%
rename from krebs/5pkgs/kpaste/default.nix
rename to krebs/5pkgs/simple/kpaste/default.nix
diff --git a/krebs/5pkgs/krebspaste/default.nix b/krebs/5pkgs/simple/krebspaste/default.nix
similarity index 100%
rename from krebs/5pkgs/krebspaste/default.nix
rename to krebs/5pkgs/simple/krebspaste/default.nix
diff --git a/krebs/5pkgs/krebszones/default.nix b/krebs/5pkgs/simple/krebszones/default.nix
similarity index 100%
rename from krebs/5pkgs/krebszones/default.nix
rename to krebs/5pkgs/simple/krebszones/default.nix
diff --git a/krebs/5pkgs/logf/default.nix b/krebs/5pkgs/simple/logf/default.nix
similarity index 100%
rename from krebs/5pkgs/logf/default.nix
rename to krebs/5pkgs/simple/logf/default.nix
diff --git a/krebs/5pkgs/much/cabal.nix b/krebs/5pkgs/simple/much/cabal.nix
similarity index 100%
rename from krebs/5pkgs/much/cabal.nix
rename to krebs/5pkgs/simple/much/cabal.nix
diff --git a/krebs/5pkgs/much/default.nix b/krebs/5pkgs/simple/much/default.nix
similarity index 100%
rename from krebs/5pkgs/much/default.nix
rename to krebs/5pkgs/simple/much/default.nix
diff --git a/krebs/5pkgs/netcup/default.nix b/krebs/5pkgs/simple/netcup/default.nix
similarity index 100%
rename from krebs/5pkgs/netcup/default.nix
rename to krebs/5pkgs/simple/netcup/default.nix
diff --git a/krebs/5pkgs/newsbot-js/default.nix b/krebs/5pkgs/simple/newsbot-js/default.nix
similarity index 100%
rename from krebs/5pkgs/newsbot-js/default.nix
rename to krebs/5pkgs/simple/newsbot-js/default.nix
diff --git a/krebs/5pkgs/newsbot-js/packages.nix b/krebs/5pkgs/simple/newsbot-js/packages.nix
similarity index 100%
rename from krebs/5pkgs/newsbot-js/packages.nix
rename to krebs/5pkgs/simple/newsbot-js/packages.nix
diff --git a/krebs/5pkgs/noVNC/default.nix b/krebs/5pkgs/simple/noVNC/default.nix
similarity index 100%
rename from krebs/5pkgs/noVNC/default.nix
rename to krebs/5pkgs/simple/noVNC/default.nix
diff --git a/krebs/5pkgs/painload/default.nix b/krebs/5pkgs/simple/painload/default.nix
similarity index 100%
rename from krebs/5pkgs/painload/default.nix
rename to krebs/5pkgs/simple/painload/default.nix
diff --git a/krebs/5pkgs/passwdqc-utils/default.nix b/krebs/5pkgs/simple/passwdqc-utils/default.nix
similarity index 100%
rename from krebs/5pkgs/passwdqc-utils/default.nix
rename to krebs/5pkgs/simple/passwdqc-utils/default.nix
diff --git a/krebs/5pkgs/populate/default.nix b/krebs/5pkgs/simple/populate/default.nix
similarity index 100%
rename from krebs/5pkgs/populate/default.nix
rename to krebs/5pkgs/simple/populate/default.nix
diff --git a/krebs/5pkgs/posix-array/default.nix b/krebs/5pkgs/simple/posix-array/default.nix
similarity index 100%
rename from krebs/5pkgs/posix-array/default.nix
rename to krebs/5pkgs/simple/posix-array/default.nix
diff --git a/krebs/5pkgs/pssh/default.nix b/krebs/5pkgs/simple/pssh/default.nix
similarity index 100%
rename from krebs/5pkgs/pssh/default.nix
rename to krebs/5pkgs/simple/pssh/default.nix
diff --git a/krebs/5pkgs/push/default.nix b/krebs/5pkgs/simple/push/default.nix
similarity index 100%
rename from krebs/5pkgs/push/default.nix
rename to krebs/5pkgs/simple/push/default.nix
diff --git a/krebs/5pkgs/realwallpaper/default.nix b/krebs/5pkgs/simple/realwallpaper/default.nix
similarity index 100%
rename from krebs/5pkgs/realwallpaper/default.nix
rename to krebs/5pkgs/simple/realwallpaper/default.nix
diff --git a/krebs/5pkgs/repo-sync/default.nix b/krebs/5pkgs/simple/repo-sync/default.nix
similarity index 100%
rename from krebs/5pkgs/repo-sync/default.nix
rename to krebs/5pkgs/simple/repo-sync/default.nix
diff --git a/krebs/5pkgs/retiolum-bootstrap/default.nix b/krebs/5pkgs/simple/retiolum-bootstrap/default.nix
similarity index 100%
rename from krebs/5pkgs/retiolum-bootstrap/default.nix
rename to krebs/5pkgs/simple/retiolum-bootstrap/default.nix
diff --git a/krebs/5pkgs/rutorrent/default.nix b/krebs/5pkgs/simple/rutorrent/default.nix
similarity index 100%
rename from krebs/5pkgs/rutorrent/default.nix
rename to krebs/5pkgs/simple/rutorrent/default.nix
diff --git a/krebs/5pkgs/tarantool/default.nix b/krebs/5pkgs/simple/tarantool/default.nix
similarity index 100%
rename from krebs/5pkgs/tarantool/default.nix
rename to krebs/5pkgs/simple/tarantool/default.nix
diff --git a/krebs/5pkgs/tinc_graphs/default.nix b/krebs/5pkgs/simple/tinc_graphs/default.nix
similarity index 100%
rename from krebs/5pkgs/tinc_graphs/default.nix
rename to krebs/5pkgs/simple/tinc_graphs/default.nix
diff --git a/krebs/5pkgs/translate-shell/default.nix b/krebs/5pkgs/simple/translate-shell/default.nix
similarity index 100%
rename from krebs/5pkgs/translate-shell/default.nix
rename to krebs/5pkgs/simple/translate-shell/default.nix
diff --git a/krebs/5pkgs/treq/default.nix b/krebs/5pkgs/simple/treq/default.nix
similarity index 100%
rename from krebs/5pkgs/treq/default.nix
rename to krebs/5pkgs/simple/treq/default.nix
diff --git a/krebs/5pkgs/untilport/default.nix b/krebs/5pkgs/simple/untilport/default.nix
similarity index 100%
rename from krebs/5pkgs/untilport/default.nix
rename to krebs/5pkgs/simple/untilport/default.nix
diff --git a/krebs/5pkgs/urlwatch/default.nix b/krebs/5pkgs/simple/urlwatch/default.nix
similarity index 100%
rename from krebs/5pkgs/urlwatch/default.nix
rename to krebs/5pkgs/simple/urlwatch/default.nix
diff --git a/krebs/5pkgs/weechat/default.nix b/krebs/5pkgs/simple/weechat/default.nix
similarity index 100%
rename from krebs/5pkgs/weechat/default.nix
rename to krebs/5pkgs/simple/weechat/default.nix
diff --git a/krebs/5pkgs/whatsupnix/default.nix b/krebs/5pkgs/simple/whatsupnix/default.nix
similarity index 100%
rename from krebs/5pkgs/whatsupnix/default.nix
rename to krebs/5pkgs/simple/whatsupnix/default.nix
diff --git a/krebs/5pkgs/whatsupnix/whatsupnix.bash b/krebs/5pkgs/simple/whatsupnix/whatsupnix.bash
similarity index 100%
rename from krebs/5pkgs/whatsupnix/whatsupnix.bash
rename to krebs/5pkgs/simple/whatsupnix/whatsupnix.bash
diff --git a/krebs/5pkgs/with-tmpdir/default.nix b/krebs/5pkgs/simple/with-tmpdir/default.nix
similarity index 100%
rename from krebs/5pkgs/with-tmpdir/default.nix
rename to krebs/5pkgs/simple/with-tmpdir/default.nix
diff --git a/krebs/5pkgs/youtube-tools/default.nix b/krebs/5pkgs/simple/youtube-tools/default.nix
similarity index 100%
rename from krebs/5pkgs/youtube-tools/default.nix
rename to krebs/5pkgs/simple/youtube-tools/default.nix
diff --git a/krebs/5pkgs/zandronum-bin/default.nix b/krebs/5pkgs/simple/zandronum-bin/default.nix
similarity index 100%
rename from krebs/5pkgs/zandronum-bin/default.nix
rename to krebs/5pkgs/simple/zandronum-bin/default.nix

From 17df5f0c453d891b29dbb6a9d189fc8dcf88fac0 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 24 May 2017 01:49:36 +0200
Subject: [PATCH 2/8] empty: move to krebs/5pkgs/simple

---
 krebs/5pkgs/default.nix      | 2 --
 krebs/5pkgs/simple/empty.nix | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 krebs/5pkgs/simple/empty.nix

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 5af541258..9fe2fea3c 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -15,8 +15,6 @@ with import <stockholm/lib>;
   // import ./simple pkgs oldpkgs
   // import ./writers.nix pkgs oldpkgs
   // {
-    empty = pkgs.runCommand "empty-1.0.0" {} "mkdir $out";
-
     haskellPackages = oldpkgs.haskellPackages.override {
       overrides = self: super:
         mapAttrs (name: path: self.callPackage path {})
diff --git a/krebs/5pkgs/simple/empty.nix b/krebs/5pkgs/simple/empty.nix
new file mode 100644
index 000000000..a45723b65
--- /dev/null
+++ b/krebs/5pkgs/simple/empty.nix
@@ -0,0 +1,2 @@
+{ pkgs }:
+pkgs.runCommand "empty-1.0.0" {} "mkdir $out"

From eae210f8ff05b7f59ab62ba161c86971dbd7f50e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 24 May 2017 01:57:28 +0200
Subject: [PATCH 3/8] krebs/5pkgs: move haskell stuff to a subdir

---
 krebs/5pkgs/default.nix                           | 15 +--------------
 .../{haskell-overrides => haskell}/blessings.nix  |  0
 krebs/5pkgs/haskell/default.nix                   | 15 +++++++++++++++
 .../email-header.nix                              |  0
 .../hyphenation.nix                               |  0
 .../5pkgs/{haskell-overrides => haskell}/kirk.nix |  0
 .../5pkgs/{haskell-overrides => haskell}/news.nix |  0
 .../{haskell-overrides => haskell}/scanner.nix    |  0
 .../xmonad-stockholm.nix                          |  0
 9 files changed, 16 insertions(+), 14 deletions(-)
 rename krebs/5pkgs/{haskell-overrides => haskell}/blessings.nix (100%)
 create mode 100644 krebs/5pkgs/haskell/default.nix
 rename krebs/5pkgs/{haskell-overrides => haskell}/email-header.nix (100%)
 rename krebs/5pkgs/{haskell-overrides => haskell}/hyphenation.nix (100%)
 rename krebs/5pkgs/{haskell-overrides => haskell}/kirk.nix (100%)
 rename krebs/5pkgs/{haskell-overrides => haskell}/news.nix (100%)
 rename krebs/5pkgs/{haskell-overrides => haskell}/scanner.nix (100%)
 rename krebs/5pkgs/{haskell-overrides => haskell}/xmonad-stockholm.nix (100%)

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 9fe2fea3c..eab059165 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -12,23 +12,10 @@ with import <stockholm/lib>;
       then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
       else override;
   in {}
+  // import ./haskell pkgs oldpkgs
   // import ./simple pkgs oldpkgs
   // import ./writers.nix pkgs oldpkgs
   // {
-    haskellPackages = oldpkgs.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));
-    };
-
     ReaktorPlugins = callPackage ./simple/Reaktor/plugins.nix {};
 
     buildbot-full = callPackage ./simple/buildbot {
diff --git a/krebs/5pkgs/haskell-overrides/blessings.nix b/krebs/5pkgs/haskell/blessings.nix
similarity index 100%
rename from krebs/5pkgs/haskell-overrides/blessings.nix
rename to krebs/5pkgs/haskell/blessings.nix
diff --git a/krebs/5pkgs/haskell/default.nix b/krebs/5pkgs/haskell/default.nix
new file mode 100644
index 000000000..1120356a7
--- /dev/null
+++ b/krebs/5pkgs/haskell/default.nix
@@ -0,0 +1,15 @@
+with import <stockholm/lib>;
+
+self: super:
+{
+  haskellPackages = super.haskellPackages.override {
+    overrides = self: super:
+      listToAttrs
+        (map
+          (name: nameValuePair (removeSuffix ".nix" name)
+                               (self.callPackage (./. + "/${name}") {}))
+          (filter
+            (name: name != "default.nix" && !hasPrefix "." name)
+            (attrNames (readDir ./.))));
+  };
+}
diff --git a/krebs/5pkgs/haskell-overrides/email-header.nix b/krebs/5pkgs/haskell/email-header.nix
similarity index 100%
rename from krebs/5pkgs/haskell-overrides/email-header.nix
rename to krebs/5pkgs/haskell/email-header.nix
diff --git a/krebs/5pkgs/haskell-overrides/hyphenation.nix b/krebs/5pkgs/haskell/hyphenation.nix
similarity index 100%
rename from krebs/5pkgs/haskell-overrides/hyphenation.nix
rename to krebs/5pkgs/haskell/hyphenation.nix
diff --git a/krebs/5pkgs/haskell-overrides/kirk.nix b/krebs/5pkgs/haskell/kirk.nix
similarity index 100%
rename from krebs/5pkgs/haskell-overrides/kirk.nix
rename to krebs/5pkgs/haskell/kirk.nix
diff --git a/krebs/5pkgs/haskell-overrides/news.nix b/krebs/5pkgs/haskell/news.nix
similarity index 100%
rename from krebs/5pkgs/haskell-overrides/news.nix
rename to krebs/5pkgs/haskell/news.nix
diff --git a/krebs/5pkgs/haskell-overrides/scanner.nix b/krebs/5pkgs/haskell/scanner.nix
similarity index 100%
rename from krebs/5pkgs/haskell-overrides/scanner.nix
rename to krebs/5pkgs/haskell/scanner.nix
diff --git a/krebs/5pkgs/haskell-overrides/xmonad-stockholm.nix b/krebs/5pkgs/haskell/xmonad-stockholm.nix
similarity index 100%
rename from krebs/5pkgs/haskell-overrides/xmonad-stockholm.nix
rename to krebs/5pkgs/haskell/xmonad-stockholm.nix

From e6b7fe74c1ec4ff42967e7bd79d7fe669451d047 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 24 May 2017 02:03:46 +0200
Subject: [PATCH 4/8] krebs/5pkgs: detect simple obsolete overrides

---
 krebs/5pkgs/default.nix        | 21 +++++----------------
 krebs/5pkgs/simple/default.nix | 28 +++++++++++++++++++++-------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index eab059165..ea14e02a4 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -1,27 +1,16 @@
 pkgs: oldpkgs:
 with import <stockholm/lib>;
-  let
-    # This callPackage will try to detect obsolete overrides.
-    callPackage = path: args: let
-      override = pkgs.callPackage path args;
-      upstream = optionalAttrs (override ? "name")
-        (oldpkgs.${(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 {}
+  {}
   // import ./haskell pkgs oldpkgs
   // import ./simple pkgs oldpkgs
   // import ./writers.nix pkgs oldpkgs
   // {
-    ReaktorPlugins = callPackage ./simple/Reaktor/plugins.nix {};
+    ReaktorPlugins = pkgs.callPackage ./simple/Reaktor/plugins.nix {};
 
-    buildbot-full = callPackage ./simple/buildbot {
+    buildbot-full = pkgs.callPackage ./simple/buildbot {
       plugins = with pkgs.buildbot-plugins; [ www console-view waterfall-view ];
     };
-    buildbot-worker = callPackage ./simple/buildbot/worker.nix {};
+    buildbot-worker = pkgs.callPackage ./simple/buildbot/worker.nix {};
 
     # https://github.com/proot-me/PRoot/issues/106
     proot = pkgs.writeDashBin "proot" ''
@@ -35,6 +24,6 @@ with import <stockholm/lib>;
     in if typeOf x != "lambda" then x else oldpkgs.symlinkJoin name paths;
 
     test = {
-      infest-cac-centos7 = callPackage ./test/infest-cac-centos7 {};
+      infest-cac-centos7 = pkgs.callPackage ./test/infest-cac-centos7 {};
     };
   }
diff --git a/krebs/5pkgs/simple/default.nix b/krebs/5pkgs/simple/default.nix
index 2f6799759..1b9d8c235 100644
--- a/krebs/5pkgs/simple/default.nix
+++ b/krebs/5pkgs/simple/default.nix
@@ -1,10 +1,24 @@
 with import <stockholm/lib>;
 
 self: super:
-listToAttrs
-  (map
-    (name: nameValuePair (removeSuffix ".nix" name)
-                         (super.callPackage (./. + "/${name}") {}))
-    (filter
-      (name: name != "default.nix" && !hasPrefix "." name)
-      (attrNames (readDir ./.))))
+
+let
+  # This callPackage will try to detect obsolete overrides.
+  callPackage = path: args: let
+    override = self.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
+
+  listToAttrs
+    (map
+      (name: nameValuePair (removeSuffix ".nix" name)
+                           (callPackage (./. + "/${name}") {}))
+      (filter
+        (name: name != "default.nix" && !hasPrefix "." name)
+        (attrNames (readDir ./.))))

From 98741092302a796554b727f54cef1316b405562d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 24 May 2017 02:12:02 +0200
Subject: [PATCH 5/8] krebs/5pkgs: move test stuff to a subdir

---
 krebs/5pkgs/default.nix      | 5 +----
 krebs/5pkgs/test/default.nix | 9 +++++++++
 2 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 krebs/5pkgs/test/default.nix

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index ea14e02a4..6dbb0954f 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -3,6 +3,7 @@ with import <stockholm/lib>;
   {}
   // import ./haskell pkgs oldpkgs
   // import ./simple pkgs oldpkgs
+  // import ./test pkgs oldpkgs
   // import ./writers.nix pkgs oldpkgs
   // {
     ReaktorPlugins = pkgs.callPackage ./simple/Reaktor/plugins.nix {};
@@ -22,8 +23,4 @@ with import <stockholm/lib>;
     symlinkJoin = { name, paths, ... }@args: let
       x = oldpkgs.symlinkJoin args;
     in if typeOf x != "lambda" then x else oldpkgs.symlinkJoin name paths;
-
-    test = {
-      infest-cac-centos7 = pkgs.callPackage ./test/infest-cac-centos7 {};
-    };
   }
diff --git a/krebs/5pkgs/test/default.nix b/krebs/5pkgs/test/default.nix
new file mode 100644
index 000000000..5ee8f913b
--- /dev/null
+++ b/krebs/5pkgs/test/default.nix
@@ -0,0 +1,9 @@
+with import <stockholm/lib>;
+
+self: super:
+
+{
+  test = {
+    infest-cac-centos7 = self.callPackage ./infest-cac-centos7 {};
+  };
+}

From 00b9970aae4e2cb472c793b9809bfb18fff8a37f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 24 May 2017 02:25:21 +0200
Subject: [PATCH 6/8] krebs/5pkgs: import directory contents as overlays

---
 krebs/5pkgs/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 6dbb0954f..820f0cdc8 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -1,10 +1,13 @@
 pkgs: oldpkgs:
 with import <stockholm/lib>;
-  {}
-  // import ./haskell pkgs oldpkgs
-  // import ./simple pkgs oldpkgs
-  // import ./test pkgs oldpkgs
-  // import ./writers.nix pkgs oldpkgs
+
+  foldl' mergeAttrs {}
+    (map
+      (name: import (./. + "/${name}") pkgs oldpkgs)
+      (filter
+        (name: name != "default.nix" && !hasPrefix "." name)
+        (attrNames (readDir ./.))))
+
   // {
     ReaktorPlugins = pkgs.callPackage ./simple/Reaktor/plugins.nix {};
 

From e733b7e07d091593ebbe9274be0e71e541db4c06 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 24 May 2017 02:28:37 +0200
Subject: [PATCH 7/8] krebs/5pkgs: reformat

---
 krebs/5pkgs/default.nix | 50 ++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 820f0cdc8..39e89a4b6 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -1,29 +1,33 @@
-pkgs: oldpkgs:
 with import <stockholm/lib>;
 
-  foldl' mergeAttrs {}
-    (map
-      (name: import (./. + "/${name}") pkgs oldpkgs)
-      (filter
-        (name: name != "default.nix" && !hasPrefix "." name)
-        (attrNames (readDir ./.))))
+self: super:
 
-  // {
-    ReaktorPlugins = pkgs.callPackage ./simple/Reaktor/plugins.nix {};
+# 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 ./.))))
 
-    buildbot-full = pkgs.callPackage ./simple/buildbot {
-      plugins = with pkgs.buildbot-plugins; [ www console-view waterfall-view ];
-    };
-    buildbot-worker = pkgs.callPackage ./simple/buildbot/worker.nix {};
+//
 
-    # https://github.com/proot-me/PRoot/issues/106
-    proot = pkgs.writeDashBin "proot" ''
-      export PROOT_NO_SECCOMP=1
-      exec ${oldpkgs.proot}/bin/proot "$@"
-    '';
+{
+  ReaktorPlugins = self.callPackage ./simple/Reaktor/plugins.nix {};
 
-    # XXX symlinkJoin changed arguments somewhere around nixpkgs d541e0d
-    symlinkJoin = { name, paths, ... }@args: let
-      x = oldpkgs.symlinkJoin args;
-    in if typeOf x != "lambda" then x else oldpkgs.symlinkJoin name paths;
-  }
+  buildbot-full = self.callPackage ./simple/buildbot {
+    plugins = with self.buildbot-plugins; [ www console-view waterfall-view ];
+  };
+  buildbot-worker = self.callPackage ./simple/buildbot/worker.nix {};
+
+  # https://github.com/proot-me/PRoot/issues/106
+  proot = self.writeDashBin "proot" ''
+    export PROOT_NO_SECCOMP=1
+    exec ${super.proot}/bin/proot "$@"
+  '';
+
+  # XXX symlinkJoin changed arguments somewhere around nixpkgs d541e0d
+  symlinkJoin = { name, paths, ... }@args: let
+    x = super.symlinkJoin args;
+  in if typeOf x != "lambda" then x else super.symlinkJoin name paths;
+}

From 4d1de57df5800879e7fcfcc38e5a10f0c1b993d7 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 24 May 2017 02:32:39 +0200
Subject: [PATCH 8/8] {lass,makefu}: fix path to simple pkgs

---
 lass/1systems/iso.nix    | 2 +-
 makefu/1systems/iso.nix  | 2 +-
 makefu/5pkgs/default.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lass/1systems/iso.nix b/lass/1systems/iso.nix
index 30fc674bc..eaeb1991f 100644
--- a/lass/1systems/iso.nix
+++ b/lass/1systems/iso.nix
@@ -16,7 +16,7 @@ with import <stockholm/lib>;
       # /dev/pts is empty except for 1 file
       # my life sucks
       nixpkgs.config.packageOverrides = super: {
-        irc-announce = super.callPackage <stockholm/krebs/5pkgs/irc-announce> {
+        irc-announce = super.callPackage <stockholm/krebs/5pkgs/simple/irc-announce> {
           pkgs = pkgs // { coreutils = pkgs.concat "coreutils-hack" [
             pkgs.coreutils
             (pkgs.writeDashBin "tee" ''
diff --git a/makefu/1systems/iso.nix b/makefu/1systems/iso.nix
index ee1046f79..1e4f9c55f 100644
--- a/makefu/1systems/iso.nix
+++ b/makefu/1systems/iso.nix
@@ -31,7 +31,7 @@ with import <stockholm/lib>;
   systemd.services.sshd.wantedBy = lib.mkForce [ "multi-user.target" ];
   # hack `tee` behavior
   nixpkgs.config.packageOverrides = super: {
-    irc-announce = super.callPackage <stockholm/krebs/5pkgs/irc-announce> {
+    irc-announce = super.callPackage <stockholm/krebs/5pkgs/simple/irc-announce> {
       pkgs = pkgs // { coreutils = pkgs.concat "coreutils-hack" [
         pkgs.coreutils
         (pkgs.writeDashBin "tee" ''
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 25ae2fe4b..d1b8fcc42 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -25,7 +25,7 @@ with import <stockholm/lib>;
     alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
     inherit (callPackage ./devpi {}) devpi-web devpi-server devpi-client;
     nodemcu-uploader = callPackage ./nodemcu-uploader {};
-    pwqgen-ger = callPackage ../../krebs/5pkgs/passwdqc-utils {
+    pwqgen-ger = callPackage <stockholm/krebs/5pkgs/simple/passwdqc-utils> {
       wordset-file = pkgs.fetchurl {
         url = https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c ;
         sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb";