From 311e837c9135270e4031caf4f7764fc07a100454 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 24 Jul 2015 23:16:48 +0200
Subject: [PATCH 1/4] Zpkgs krebs: add hashPassword

---
 Zpkgs/krebs/default.nix      |  1 +
 Zpkgs/krebs/hashPassword.nix | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 Zpkgs/krebs/hashPassword.nix

diff --git a/Zpkgs/krebs/default.nix b/Zpkgs/krebs/default.nix
index be8f72011..883890476 100644
--- a/Zpkgs/krebs/default.nix
+++ b/Zpkgs/krebs/default.nix
@@ -8,4 +8,5 @@ pkgs //
 {
   github-hosts-sync = callPackage ./github-hosts-sync.nix {};
   github-known_hosts = callPackage ./github-known_hosts.nix {};
+  hashPassword = callPackage ./hashPassword.nix {};
 }
diff --git a/Zpkgs/krebs/hashPassword.nix b/Zpkgs/krebs/hashPassword.nix
new file mode 100644
index 000000000..a10340cc4
--- /dev/null
+++ b/Zpkgs/krebs/hashPassword.nix
@@ -0,0 +1,16 @@
+{ lib, pkgs, ... }:
+
+pkgs.writeScriptBin "hashPassword" ''
+  #! /bin/sh
+  # usage: hashPassword
+  set -euf
+
+  export PATH=${lib.makeSearchPath "bin" (with pkgs; [
+    coreutils
+    mkpasswd
+    openssl
+  ])}
+
+  salt=$(openssl rand -base64 16 | tr -d '+=' | head -c 16)
+  exec mkpasswd -m sha-512 -S "$salt"
+''

From 103c00849e126aa592af0a7fb47c84312ca50304 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 24 Jul 2015 23:18:12 +0200
Subject: [PATCH 2/4] 1 tv wu: systemPackages += hashPassword

---
 1systems/tv/wu.nix   | 1 +
 Zpkgs/tv/default.nix | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index 4a74d552f..5ca64ce9e 100644
--- a/1systems/tv/wu.nix
+++ b/1systems/tv/wu.nix
@@ -28,6 +28,7 @@ in
         gnumake
         parallel
         Zpkgs.genid
+        Zpkgs.hashPassword
         Zpkgs.lentil
 
         # root
diff --git a/Zpkgs/tv/default.nix b/Zpkgs/tv/default.nix
index e3e12bd18..bad7e9d23 100644
--- a/Zpkgs/tv/default.nix
+++ b/Zpkgs/tv/default.nix
@@ -2,10 +2,10 @@
 
 let
   inherit (pkgs) callPackage;
+  krebs = import ../../Zpkgs/krebs { inherit pkgs; };
 in
 
-pkgs //
-{
+krebs // {
   charybdis = callPackage ./charybdis {};
   dic = callPackage ./dic.nix {};
   genid = callPackage ./genid.nix {};

From 78c12a8adca9f55e8faa5c86f102050c8a557b64 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 24 Jul 2015 23:19:49 +0200
Subject: [PATCH 3/4] Zpkgs {tv -> krebs} genid

---
 Zpkgs/krebs/default.nix       | 1 +
 Zpkgs/{tv => krebs}/genid.nix | 0
 Zpkgs/tv/default.nix          | 1 -
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename Zpkgs/{tv => krebs}/genid.nix (100%)

diff --git a/Zpkgs/krebs/default.nix b/Zpkgs/krebs/default.nix
index 883890476..e07b96b56 100644
--- a/Zpkgs/krebs/default.nix
+++ b/Zpkgs/krebs/default.nix
@@ -6,6 +6,7 @@ in
 
 pkgs //
 {
+  genid = callPackage ./genid.nix {};
   github-hosts-sync = callPackage ./github-hosts-sync.nix {};
   github-known_hosts = callPackage ./github-known_hosts.nix {};
   hashPassword = callPackage ./hashPassword.nix {};
diff --git a/Zpkgs/tv/genid.nix b/Zpkgs/krebs/genid.nix
similarity index 100%
rename from Zpkgs/tv/genid.nix
rename to Zpkgs/krebs/genid.nix
diff --git a/Zpkgs/tv/default.nix b/Zpkgs/tv/default.nix
index bad7e9d23..a8ca2b2ab 100644
--- a/Zpkgs/tv/default.nix
+++ b/Zpkgs/tv/default.nix
@@ -8,7 +8,6 @@ in
 krebs // {
   charybdis = callPackage ./charybdis {};
   dic = callPackage ./dic.nix {};
-  genid = callPackage ./genid.nix {};
   lentil = callPackage ./lentil {};
   much = callPackage ./much.nix {};
   viljetic-pages = callPackage ./viljetic-pages {};

From 99527e88aec089b4fea496248cf03f738bfed257 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 24 Jul 2015 23:24:46 +0200
Subject: [PATCH 4/4] Zpkgs {tv -> krebs} dic

---
 Zpkgs/krebs/default.nix     | 1 +
 Zpkgs/{tv => krebs}/dic.nix | 0
 Zpkgs/tv/default.nix        | 1 -
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename Zpkgs/{tv => krebs}/dic.nix (100%)

diff --git a/Zpkgs/krebs/default.nix b/Zpkgs/krebs/default.nix
index e07b96b56..231fda797 100644
--- a/Zpkgs/krebs/default.nix
+++ b/Zpkgs/krebs/default.nix
@@ -6,6 +6,7 @@ in
 
 pkgs //
 {
+  dic = callPackage ./dic.nix {};
   genid = callPackage ./genid.nix {};
   github-hosts-sync = callPackage ./github-hosts-sync.nix {};
   github-known_hosts = callPackage ./github-known_hosts.nix {};
diff --git a/Zpkgs/tv/dic.nix b/Zpkgs/krebs/dic.nix
similarity index 100%
rename from Zpkgs/tv/dic.nix
rename to Zpkgs/krebs/dic.nix
diff --git a/Zpkgs/tv/default.nix b/Zpkgs/tv/default.nix
index a8ca2b2ab..50625f868 100644
--- a/Zpkgs/tv/default.nix
+++ b/Zpkgs/tv/default.nix
@@ -7,7 +7,6 @@ in
 
 krebs // {
   charybdis = callPackage ./charybdis {};
-  dic = callPackage ./dic.nix {};
   lentil = callPackage ./lentil {};
   much = callPackage ./much.nix {};
   viljetic-pages = callPackage ./viljetic-pages {};