From de6564e5f5caf394db8fe22d1ecfee22cb6155d3 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 17 Aug 2015 15:35:27 +0200
Subject: krebs 5: add youtube-tools

---
 krebs/5pkgs/default.nix       |  1 +
 krebs/5pkgs/youtube-tools.nix | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 krebs/5pkgs/youtube-tools.nix

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 89872f1e..062f0a51 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -13,4 +13,5 @@ pkgs //
   github-known_hosts = callPackage ./github-known_hosts.nix {};
   hashPassword = callPackage ./hashPassword.nix {};
   posix-array = callPackage ./posix-array.nix {};
+  youtube-tools = callPackage ./youtube-tools.nix {};
 }
diff --git a/krebs/5pkgs/youtube-tools.nix b/krebs/5pkgs/youtube-tools.nix
new file mode 100644
index 00000000..29142b8b
--- /dev/null
+++ b/krebs/5pkgs/youtube-tools.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchgit, ... }:
+
+stdenv.mkDerivation {
+  name = "youtube-tools";
+
+  src = fetchgit {
+    url = https://github.com/Lassulus/the_playlist;
+    rev = "323a66775168b6addb3acddaee0a8ff227ea4bd4";
+    sha256 = "1y1fs2p3xj2yrqpw0h5kd0f3c5p1y70xk1hjnw99sr33r67s9c35";
+  };
+
+  phases = [
+    "unpackPhase"
+    "installPhase"
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp bin/* $out/bin/
+  '';
+}
-- 
cgit v1.2.3


From 7f11bbcfc0b0c53d9d2838d253d7bd48af8a4b7e Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 17 Aug 2015 16:18:57 +0200
Subject: krebs 5 youtube-tools: bump rev

---
 krebs/5pkgs/youtube-tools.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/youtube-tools.nix b/krebs/5pkgs/youtube-tools.nix
index 29142b8b..d767728b 100644
--- a/krebs/5pkgs/youtube-tools.nix
+++ b/krebs/5pkgs/youtube-tools.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = https://github.com/Lassulus/the_playlist;
-    rev = "323a66775168b6addb3acddaee0a8ff227ea4bd4";
-    sha256 = "1y1fs2p3xj2yrqpw0h5kd0f3c5p1y70xk1hjnw99sr33r67s9c35";
+    rev = "9218b163f2d8bc965b853ed9fc9e13d15a703456";
+    sha256 = "ae5db4be652d015a518e57e4ed2de34b9127e77d9272af3049832bb134e96e4d";
   };
 
   phases = [
-- 
cgit v1.2.3


From e8da585cfaf78e060d62df0d0bc7dbd9720496c3 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Thu, 27 Aug 2015 20:35:50 +0200
Subject: krebs pkgs nq: init at 0eae839cb1

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

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 89872f1e..2149b6f1 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -12,5 +12,6 @@ pkgs //
   github-hosts-sync = callPackage ./github-hosts-sync.nix {};
   github-known_hosts = callPackage ./github-known_hosts.nix {};
   hashPassword = callPackage ./hashPassword.nix {};
+  nq = callPackage ./nq.nix {};
   posix-array = callPackage ./posix-array.nix {};
 }
diff --git a/krebs/5pkgs/nq.nix b/krebs/5pkgs/nq.nix
new file mode 100644
index 00000000..0f397a43
--- /dev/null
+++ b/krebs/5pkgs/nq.nix
@@ -0,0 +1,16 @@
+{ fetchgit, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "nq-${rev}";
+  rev = "0eae839cb1";
+
+  src = fetchgit {
+    url = https://github.com/chneukirchen/nq;
+    inherit rev;
+    sha256 = "1150274750cde934932d65bd6053d7a0ba2404a59eadfb87fc6bd8a4fb70febb";
+  };
+
+  configurePhase = ''
+    sed -i "s:^PREFIX=.*:PREFIX=$out:" Makefile
+  '';
+}
-- 
cgit v1.2.3


From c1aaaca7f7febe0c587342ae74e7045bb9a67c5a Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 28 Aug 2015 21:31:59 +0200
Subject: krebs += pkgs.writeC lib.toC

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

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 2149b6f1..c8fb1d2d 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   inherit (pkgs) callPackage;
@@ -14,4 +14,15 @@ pkgs //
   hashPassword = callPackage ./hashPassword.nix {};
   nq = callPackage ./nq.nix {};
   posix-array = callPackage ./posix-array.nix {};
+
+  writeC = name: {}: src: pkgs.runCommand name {} ''
+    PATH=${lib.makeSearchPath "bin" (with pkgs; [
+      binutils
+      coreutils
+      gcc
+    ])}
+    in=${pkgs.writeText "${name}.c" src}
+    gcc -O -Wall -o $out $in
+    strip --strip-unneeded $out
+  '';
 }
-- 
cgit v1.2.3


From 8827469a35852a0623d8353c22b481a15328254a Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 28 Aug 2015 21:43:16 +0200
Subject: krebs pkgs += execve

---
 krebs/5pkgs/default.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index c8fb1d2d..406bd15e 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -1,11 +1,13 @@
 { lib, pkgs, ... }:
 
+with import ../4lib { inherit lib; };
+
 let
   inherit (pkgs) callPackage;
 in
 
 pkgs //
-{
+rec {
   cac = callPackage ./cac.nix {};
   dic = callPackage ./dic.nix {};
   genid = callPackage ./genid.nix {};
@@ -15,6 +17,20 @@ pkgs //
   nq = callPackage ./nq.nix {};
   posix-array = callPackage ./posix-array.nix {};
 
+  execve = name: { filename, argv, envp }:
+    writeC name {} ''
+      #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;
+      }
+    '';
+
   writeC = name: {}: src: pkgs.runCommand name {} ''
     PATH=${lib.makeSearchPath "bin" (with pkgs; [
       binutils
-- 
cgit v1.2.3


From 642c761bd015f5766a75cf5688b50d42efdb96c3 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 28 Aug 2015 22:13:17 +0200
Subject: krebs pkgs += execveBin

---
 krebs/5pkgs/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 3658c43e..54604382 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -18,8 +18,8 @@ rec {
   posix-array = callPackage ./posix-array.nix {};
   youtube-tools = callPackage ./youtube-tools.nix {};
 
-  execve = name: { filename, argv, envp }:
-    writeC name {} ''
+  execve = name: { filename, argv, envp ? {}, destination ? "" }:
+    writeC name { inherit destination; } ''
       #include <unistd.h>
       int main () {
         const char *filename = ${toC filename};
@@ -32,14 +32,18 @@ rec {
       }
     '';
 
-  writeC = name: {}: src: pkgs.runCommand name {} ''
+  execveBin = name: cfg: execve name (cfg // { destination = "/bin/${name}"; });
+
+  writeC = name: { destination ? "" }: src: pkgs.runCommand name {} ''
     PATH=${lib.makeSearchPath "bin" (with pkgs; [
       binutils
       coreutils
       gcc
     ])}
-    in=${pkgs.writeText "${name}.c" src}
-    gcc -O -Wall -o $out $in
-    strip --strip-unneeded $out
+    src=${pkgs.writeText "${name}.c" src}
+    exe=$out${destination}
+    mkdir -p "$(dirname "$exe")"
+    gcc -O -Wall -o "$exe" $src
+    strip --strip-unneeded "$exe"
   '';
 }
-- 
cgit v1.2.3


From 81eaf7a9e7b083c169828590d0d848cf933b32e0 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sat, 29 Aug 2015 00:17:25 +0200
Subject: one pkgs to rule them all

---
 krebs/5pkgs/default.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 54604382..2f7a24ed 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -6,7 +6,6 @@ let
   inherit (pkgs) callPackage;
 in
 
-pkgs //
 rec {
   cac = callPackage ./cac.nix {};
   dic = callPackage ./dic.nix {};
-- 
cgit v1.2.3


From 22a171f3e0405d504e8c8c3b32f73a8087a5ed66 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sat, 29 Aug 2015 00:36:50 +0200
Subject: krebs pkgs += charybdis lentil much

While there, put everything into subdirectories.
---
 krebs/5pkgs/cac.nix                        | 38 ------------------
 krebs/5pkgs/cac/default.nix                | 38 ++++++++++++++++++
 krebs/5pkgs/charybdis/default.nix          | 34 ++++++++++++++++
 krebs/5pkgs/charybdis/remove-setenv.patch  | 12 ++++++
 krebs/5pkgs/default.nix                    | 21 +++++-----
 krebs/5pkgs/dic.nix                        | 36 -----------------
 krebs/5pkgs/dic/default.nix                | 36 +++++++++++++++++
 krebs/5pkgs/genid.nix                      | 22 ----------
 krebs/5pkgs/genid/default.nix              | 22 ++++++++++
 krebs/5pkgs/github-hosts-sync.nix          | 40 -------------------
 krebs/5pkgs/github-hosts-sync/default.nix  | 40 +++++++++++++++++++
 krebs/5pkgs/github-known_hosts.nix         | 13 ------
 krebs/5pkgs/github-known_hosts/default.nix | 13 ++++++
 krebs/5pkgs/hashPassword.nix               | 16 --------
 krebs/5pkgs/hashPassword/default.nix       | 16 ++++++++
 krebs/5pkgs/lentil/default.nix             | 15 +++++++
 krebs/5pkgs/lentil/syntaxes.patch          | 11 +++++
 krebs/5pkgs/much/default.nix               | 64 ++++++++++++++++++++++++++++++
 krebs/5pkgs/nq.nix                         | 16 --------
 krebs/5pkgs/nq/default.nix                 | 16 ++++++++
 krebs/5pkgs/posix-array.nix                | 31 ---------------
 krebs/5pkgs/posix-array/default.nix        | 31 +++++++++++++++
 krebs/5pkgs/youtube-tools.nix              | 21 ----------
 krebs/5pkgs/youtube-tools/default.nix      | 21 ++++++++++
 24 files changed, 381 insertions(+), 242 deletions(-)
 delete mode 100644 krebs/5pkgs/cac.nix
 create mode 100644 krebs/5pkgs/cac/default.nix
 create mode 100644 krebs/5pkgs/charybdis/default.nix
 create mode 100644 krebs/5pkgs/charybdis/remove-setenv.patch
 delete mode 100644 krebs/5pkgs/dic.nix
 create mode 100644 krebs/5pkgs/dic/default.nix
 delete mode 100644 krebs/5pkgs/genid.nix
 create mode 100644 krebs/5pkgs/genid/default.nix
 delete mode 100644 krebs/5pkgs/github-hosts-sync.nix
 create mode 100644 krebs/5pkgs/github-hosts-sync/default.nix
 delete mode 100644 krebs/5pkgs/github-known_hosts.nix
 create mode 100644 krebs/5pkgs/github-known_hosts/default.nix
 delete mode 100644 krebs/5pkgs/hashPassword.nix
 create mode 100644 krebs/5pkgs/hashPassword/default.nix
 create mode 100644 krebs/5pkgs/lentil/default.nix
 create mode 100644 krebs/5pkgs/lentil/syntaxes.patch
 create mode 100644 krebs/5pkgs/much/default.nix
 delete mode 100644 krebs/5pkgs/nq.nix
 create mode 100644 krebs/5pkgs/nq/default.nix
 delete mode 100644 krebs/5pkgs/posix-array.nix
 create mode 100644 krebs/5pkgs/posix-array/default.nix
 delete mode 100644 krebs/5pkgs/youtube-tools.nix
 create mode 100644 krebs/5pkgs/youtube-tools/default.nix

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/cac.nix b/krebs/5pkgs/cac.nix
deleted file mode 100644
index eff52304..00000000
--- a/krebs/5pkgs/cac.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchgit, coreutils, curl, gnused, jq, ncurses, sshpass, ... }:
-
-stdenv.mkDerivation {
-  name = "cac";
-
-  src = fetchgit {
-    url = http://cgit.cd.retiolum/cac;
-    rev = "f4589158572ab35969b9bccf801ea07e115705e1";
-    sha256 = "9d761cd1d7ff68507392cbfd6c3f6000ddff9cc540293da2b3c4ee902321fb27";
-  };
-
-  phases = [
-    "unpackPhase"
-    "installPhase"
-  ];
-
-  installPhase =
-    let
-      path = stdenv.lib.makeSearchPath "bin" [
-        coreutils
-        curl
-        gnused
-        jq
-        ncurses
-        sshpass
-      ];
-    in
-    ''
-      mkdir -p $out/bin
-
-      sed \
-        's,^\(  true) \)\(cac "$@";;\)$,\1 PATH=${path}${PATH+:$PATH} \2,' \
-        < ./cac \
-        > $out/bin/cac
-
-      chmod +x $out/bin/cac
-    '';
-}
diff --git a/krebs/5pkgs/cac/default.nix b/krebs/5pkgs/cac/default.nix
new file mode 100644
index 00000000..eff52304
--- /dev/null
+++ b/krebs/5pkgs/cac/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchgit, coreutils, curl, gnused, jq, ncurses, sshpass, ... }:
+
+stdenv.mkDerivation {
+  name = "cac";
+
+  src = fetchgit {
+    url = http://cgit.cd.retiolum/cac;
+    rev = "f4589158572ab35969b9bccf801ea07e115705e1";
+    sha256 = "9d761cd1d7ff68507392cbfd6c3f6000ddff9cc540293da2b3c4ee902321fb27";
+  };
+
+  phases = [
+    "unpackPhase"
+    "installPhase"
+  ];
+
+  installPhase =
+    let
+      path = stdenv.lib.makeSearchPath "bin" [
+        coreutils
+        curl
+        gnused
+        jq
+        ncurses
+        sshpass
+      ];
+    in
+    ''
+      mkdir -p $out/bin
+
+      sed \
+        's,^\(  true) \)\(cac "$@";;\)$,\1 PATH=${path}${PATH+:$PATH} \2,' \
+        < ./cac \
+        > $out/bin/cac
+
+      chmod +x $out/bin/cac
+    '';
+}
diff --git a/krebs/5pkgs/charybdis/default.nix b/krebs/5pkgs/charybdis/default.nix
new file mode 100644
index 00000000..f3e6be40
--- /dev/null
+++ b/krebs/5pkgs/charybdis/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchgit, bison, flex, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "charybdis-3.5.0-rc1";
+
+  src = fetchgit {
+    url = "https://github.com/atheme/charybdis.git";
+    rev = "61815bf9324e872f51255e09fe37a8c595f94a60";
+    sha256 = "0zsd6xk2cnspc1cvryy2296p3ix4hwjd9k24wmgbh5wzks0wahwy";
+  };
+
+  patches = [
+    ./remove-setenv.patch
+  ];
+
+  configureFlags = [
+    "--enable-epoll"
+    "--enable-ipv6"
+    "--enable-openssl=${openssl}"
+    "--enable-small-net"
+    "--with-program-prefix=charybdis-"
+    "--sysconfdir=/tmp"
+  ];
+
+  buildInputs = [ bison flex openssl ];
+
+  meta = {
+    description = "An extremely scalable ircd with some cooperation with the ratbox and ircu guys";
+    homepage    = https://github.com/atheme/charybdis;
+    license     = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.lassulus ];
+    platforms   = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/krebs/5pkgs/charybdis/remove-setenv.patch b/krebs/5pkgs/charybdis/remove-setenv.patch
new file mode 100644
index 00000000..bbaf95e1
--- /dev/null
+++ b/krebs/5pkgs/charybdis/remove-setenv.patch
@@ -0,0 +1,12 @@
+diff --git a/src/bandbi.c b/src/bandbi.c
+index 03dd907..3698e85 100644
+--- a/src/bandbi.c
++++ b/src/bandbi.c
+@@ -82,7 +82,6 @@ start_bandb(void)
+ 	const char *suffix = "";
+ #endif
+
+-	rb_setenv("BANDB_DBPATH", PKGLOCALSTATEDIR "/ban.db", 1);
+ 	if(bandb_path == NULL)
+ 	{
+ 		rb_snprintf(fullpath, sizeof(fullpath), "%s/bandb%s", PKGLIBEXECDIR, suffix);
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 2f7a24ed..71bee3fa 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -7,15 +7,18 @@ let
 in
 
 rec {
-  cac = callPackage ./cac.nix {};
-  dic = callPackage ./dic.nix {};
-  genid = callPackage ./genid.nix {};
-  github-hosts-sync = callPackage ./github-hosts-sync.nix {};
-  github-known_hosts = callPackage ./github-known_hosts.nix {};
-  hashPassword = callPackage ./hashPassword.nix {};
-  nq = callPackage ./nq.nix {};
-  posix-array = callPackage ./posix-array.nix {};
-  youtube-tools = callPackage ./youtube-tools.nix {};
+  cac = callPackage ./cac {};
+  charybdis = callPackage ./charybdis {};
+  dic = callPackage ./dic {};
+  genid = callPackage ./genid {};
+  github-hosts-sync = callPackage ./github-hosts-sync {};
+  github-known_hosts = callPackage ./github-known_hosts {};
+  hashPassword = callPackage ./hashPassword {};
+  lentil = callPackage ./lentil {};
+  much = callPackage ./much {};
+  nq = callPackage ./nq {};
+  posix-array = callPackage ./posix-array {};
+  youtube-tools = callPackage ./youtube-tools {};
 
   execve = name: { filename, argv, envp ? {}, destination ? "" }:
     writeC name { inherit destination; } ''
diff --git a/krebs/5pkgs/dic.nix b/krebs/5pkgs/dic.nix
deleted file mode 100644
index 571773d2..00000000
--- a/krebs/5pkgs/dic.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchgit, coreutils, curl, gnused, gnugrep, ... }:
-
-stdenv.mkDerivation {
-  name = "dic";
-
-  src = fetchgit {
-    url = https://github.com/krebscode/painload;
-    rev = "35ccac73d563ad30d2851b9aeed4cfef69ff74e3";
-    sha256 = "1y1fs2p3xj2yrqpw0h5kd0f3c5p1y70xk1hjnw99sr33r67s9c35";
-  };
-
-  phases = [
-    "unpackPhase"
-    "installPhase"
-  ];
-
-  installPhase =
-    let
-      path = stdenv.lib.makeSearchPath "bin" [
-        coreutils
-        curl
-        gnused
-        gnugrep
-      ];
-    in
-    ''
-      mkdir -p $out/bin
-
-      sed \
-        's,^main() {$,&\n  PATH=${path}; export PATH,' \
-        < ./util/bin/dic \
-        > $out/bin/dic
-
-      chmod +x $out/bin/dic
-    '';
-}
diff --git a/krebs/5pkgs/dic/default.nix b/krebs/5pkgs/dic/default.nix
new file mode 100644
index 00000000..571773d2
--- /dev/null
+++ b/krebs/5pkgs/dic/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchgit, coreutils, curl, gnused, gnugrep, ... }:
+
+stdenv.mkDerivation {
+  name = "dic";
+
+  src = fetchgit {
+    url = https://github.com/krebscode/painload;
+    rev = "35ccac73d563ad30d2851b9aeed4cfef69ff74e3";
+    sha256 = "1y1fs2p3xj2yrqpw0h5kd0f3c5p1y70xk1hjnw99sr33r67s9c35";
+  };
+
+  phases = [
+    "unpackPhase"
+    "installPhase"
+  ];
+
+  installPhase =
+    let
+      path = stdenv.lib.makeSearchPath "bin" [
+        coreutils
+        curl
+        gnused
+        gnugrep
+      ];
+    in
+    ''
+      mkdir -p $out/bin
+
+      sed \
+        's,^main() {$,&\n  PATH=${path}; export PATH,' \
+        < ./util/bin/dic \
+        > $out/bin/dic
+
+      chmod +x $out/bin/dic
+    '';
+}
diff --git a/krebs/5pkgs/genid.nix b/krebs/5pkgs/genid.nix
deleted file mode 100644
index c75bec31..00000000
--- a/krebs/5pkgs/genid.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib, pkgs, ... }:
-
-pkgs.writeScriptBin "genid" ''
-  #! /bin/sh
-  # usage: genid NAME
-  set -euf
-
-  export PATH=${lib.makeSearchPath "bin" (with pkgs; [
-    bc
-    coreutils
-  ])}
-
-  name=$1
-  hash=$(printf %s "$name" | sha1sum | cut -d\  -f1 | tr a-f A-F)
-  echo "
-    min=2^24  # bigger than nobody and nogroup, see <nixos/modules/misc/ids.nix>
-              # and some spare for stuff like lxd.
-    max=2^32  # see 2^(8*sizeof(uid_t))
-    ibase=16
-    ($hash + min) % max
-  " | bc
-''
diff --git a/krebs/5pkgs/genid/default.nix b/krebs/5pkgs/genid/default.nix
new file mode 100644
index 00000000..c75bec31
--- /dev/null
+++ b/krebs/5pkgs/genid/default.nix
@@ -0,0 +1,22 @@
+{ lib, pkgs, ... }:
+
+pkgs.writeScriptBin "genid" ''
+  #! /bin/sh
+  # usage: genid NAME
+  set -euf
+
+  export PATH=${lib.makeSearchPath "bin" (with pkgs; [
+    bc
+    coreutils
+  ])}
+
+  name=$1
+  hash=$(printf %s "$name" | sha1sum | cut -d\  -f1 | tr a-f A-F)
+  echo "
+    min=2^24  # bigger than nobody and nogroup, see <nixos/modules/misc/ids.nix>
+              # and some spare for stuff like lxd.
+    max=2^32  # see 2^(8*sizeof(uid_t))
+    ibase=16
+    ($hash + min) % max
+  " | bc
+''
diff --git a/krebs/5pkgs/github-hosts-sync.nix b/krebs/5pkgs/github-hosts-sync.nix
deleted file mode 100644
index d69b2b12..00000000
--- a/krebs/5pkgs/github-hosts-sync.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchgit, pkgs, ... }:
-
-stdenv.mkDerivation {
-  name = "github-hosts-sync";
-
-  src = fetchgit {
-    url = https://github.com/krebscode/painload;
-    rev = "35ccac73d563ad30d2851b9aeed4cfef69ff74e3";
-    sha256 = "1y1fs2p3xj2yrqpw0h5kd0f3c5p1y70xk1hjnw99sr33r67s9c35";
-  };
-
-  phases = [
-    "unpackPhase"
-    "installPhase"
-  ];
-
-  installPhase =
-    let
-      ca-bundle = "${pkgs.cacert}/etc/ca-bundle.crt";
-      path = stdenv.lib.makeSearchPath "bin" (with pkgs; [
-        coreutils
-        findutils
-        git
-        gnugrep
-        gnused
-        openssh
-        socat
-      ]);
-    in
-    ''
-      mkdir -p $out/bin
-
-      sed \
-        's,^main() {$,&\n  export PATH=${path} GIT_SSL_CAINFO=${ca-bundle},' \
-        < ./retiolum/scripts/github_hosts_sync/hosts-sync \
-        > $out/bin/github-hosts-sync
-
-      chmod +x $out/bin/github-hosts-sync
-    '';
-}
diff --git a/krebs/5pkgs/github-hosts-sync/default.nix b/krebs/5pkgs/github-hosts-sync/default.nix
new file mode 100644
index 00000000..d69b2b12
--- /dev/null
+++ b/krebs/5pkgs/github-hosts-sync/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchgit, pkgs, ... }:
+
+stdenv.mkDerivation {
+  name = "github-hosts-sync";
+
+  src = fetchgit {
+    url = https://github.com/krebscode/painload;
+    rev = "35ccac73d563ad30d2851b9aeed4cfef69ff74e3";
+    sha256 = "1y1fs2p3xj2yrqpw0h5kd0f3c5p1y70xk1hjnw99sr33r67s9c35";
+  };
+
+  phases = [
+    "unpackPhase"
+    "installPhase"
+  ];
+
+  installPhase =
+    let
+      ca-bundle = "${pkgs.cacert}/etc/ca-bundle.crt";
+      path = stdenv.lib.makeSearchPath "bin" (with pkgs; [
+        coreutils
+        findutils
+        git
+        gnugrep
+        gnused
+        openssh
+        socat
+      ]);
+    in
+    ''
+      mkdir -p $out/bin
+
+      sed \
+        's,^main() {$,&\n  export PATH=${path} GIT_SSL_CAINFO=${ca-bundle},' \
+        < ./retiolum/scripts/github_hosts_sync/hosts-sync \
+        > $out/bin/github-hosts-sync
+
+      chmod +x $out/bin/github-hosts-sync
+    '';
+}
diff --git a/krebs/5pkgs/github-known_hosts.nix b/krebs/5pkgs/github-known_hosts.nix
deleted file mode 100644
index 302fdd8d..00000000
--- a/krebs/5pkgs/github-known_hosts.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ lib, ... }:
-
-with builtins;
-with lib;
-
-let
-  github-pubkey = removeSuffix "\n" (readFile ../../Zpubkeys/github.ssh.pub);
-in
-
-toFile "github-known_hosts"
-  (concatMapStrings
-    (i: "github.com,192.30.252.${toString i} ${github-pubkey}\n")
-    (range 0 255))
diff --git a/krebs/5pkgs/github-known_hosts/default.nix b/krebs/5pkgs/github-known_hosts/default.nix
new file mode 100644
index 00000000..302fdd8d
--- /dev/null
+++ b/krebs/5pkgs/github-known_hosts/default.nix
@@ -0,0 +1,13 @@
+{ lib, ... }:
+
+with builtins;
+with lib;
+
+let
+  github-pubkey = removeSuffix "\n" (readFile ../../Zpubkeys/github.ssh.pub);
+in
+
+toFile "github-known_hosts"
+  (concatMapStrings
+    (i: "github.com,192.30.252.${toString i} ${github-pubkey}\n")
+    (range 0 255))
diff --git a/krebs/5pkgs/hashPassword.nix b/krebs/5pkgs/hashPassword.nix
deleted file mode 100644
index a10340cc..00000000
--- a/krebs/5pkgs/hashPassword.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ 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"
-''
diff --git a/krebs/5pkgs/hashPassword/default.nix b/krebs/5pkgs/hashPassword/default.nix
new file mode 100644
index 00000000..a10340cc
--- /dev/null
+++ b/krebs/5pkgs/hashPassword/default.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"
+''
diff --git a/krebs/5pkgs/lentil/default.nix b/krebs/5pkgs/lentil/default.nix
new file mode 100644
index 00000000..fc9b4fd3
--- /dev/null
+++ b/krebs/5pkgs/lentil/default.nix
@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+
+(pkgs.haskellngPackages.override {
+  overrides = self: super: {
+    lentil = super.lentil.override {
+      mkDerivation = (attrs: self.mkDerivation (attrs // {
+        version = "0.1.3.0";
+        sha256 = "0xa59avh0bvfg69xh9p5b8dppfhx29mvfq8v41sk9j7qbcnzjivg";
+        patches = [
+          ./syntaxes.patch
+        ];
+      }));
+    };
+  };
+}).lentil
diff --git a/krebs/5pkgs/lentil/syntaxes.patch b/krebs/5pkgs/lentil/syntaxes.patch
new file mode 100644
index 00000000..a9390ae5
--- /dev/null
+++ b/krebs/5pkgs/lentil/syntaxes.patch
@@ -0,0 +1,11 @@
+diff -rN -u old-lentil/src/Lentil/Parse/Syntaxes.hs new-lentil/src/Lentil/Parse/Syntaxes.hs
+--- old-lentil/src/Lentil/Parse/Syntaxes.hs	2015-07-20 23:15:38.600539779 +0200
++++ new-lentil/src/Lentil/Parse/Syntaxes.hs	2015-07-20 23:15:38.600539779 +0200
+@@ -30,6 +30,7 @@
+               | ext `elem` [".pas", ".pp", ".inc"] = Just pascal
+               | ext `elem` [".py"]                 = Just python
+               | ext `elem` [".rb"]                 = Just ruby
++              | ext `elem` [".nix"]                = Just perl -- Nix
+               | ext `elem` [".pl", ".pm", ".t"]    = Just perl
+               | ext `elem` [".sh"]                 = Just perl -- shell
+               | ext `elem` [".txt"]                = Just text
diff --git a/krebs/5pkgs/much/default.nix b/krebs/5pkgs/much/default.nix
new file mode 100644
index 00000000..82586b42
--- /dev/null
+++ b/krebs/5pkgs/much/default.nix
@@ -0,0 +1,64 @@
+{ pkgs, ... }:
+
+let
+   hspkgs = pkgs.haskellngPackages.override {
+     overrides = self: super: {
+       email-header = self.callPackage (
+{ mkDerivation, attoparsec, base, base64-bytestring, bytestring
+, case-insensitive, containers, exceptions, fetchgit, QuickCheck
+, stdenv, tasty, tasty-quickcheck, text, text-icu, time
+}:
+mkDerivation {
+  pname = "email-header";
+  version = "0.3.0";
+  src = fetchgit {
+    url = "https://github.com/4z3/email-header";
+    sha256 = "f33fba567a39b1f2448869b269c26c40d8007599c23ab83bde5b4dfd9fd76ebc";
+    rev = "7b179bd31192ead8afe7a0b6e34bcad4039deaa8";
+  };
+  buildDepends = [
+    attoparsec base base64-bytestring bytestring case-insensitive
+    containers exceptions text text-icu time
+  ];
+  testDepends = [
+    base bytestring case-insensitive containers QuickCheck tasty
+    tasty-quickcheck text time
+  ];
+  jailbreak = true;
+  homepage = "http://github.com/knrafto/email-header";
+  description = "Parsing and rendering of email and MIME headers";
+  license = stdenv.lib.licenses.bsd3;
+}
+) {};
+    };
+  };
+in
+
+hspkgs.callPackage (
+{ mkDerivation, aeson, attoparsec, base, base64-bytestring
+, blaze-builder, bytestring, case-insensitive, containers, deepseq
+, directory, docopt, email-header, fetchgit, filepath
+, friendly-time, hyphenation, linebreak, old-locale, process
+, random, rosezipper, safe, split, stdenv, terminal-size, text
+, time, transformers, transformers-compat, unix, vector
+}:
+mkDerivation {
+  pname = "much";
+  version = "0.0.0.0";
+  src = fetchgit {
+    url = "http://cgit.nomic/much";
+    sha256 = "f0bcc34456cb876d3439694d1e16db414a540e13f476fa3ff1ad70d1d3caccb2";
+    rev = "bfd854e05207a073eaa983c49f27c37555ccfce5";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    aeson attoparsec base base64-bytestring blaze-builder bytestring
+    case-insensitive containers deepseq directory docopt email-header
+    filepath friendly-time hyphenation linebreak old-locale process
+    random rosezipper safe split terminal-size text time transformers
+    transformers-compat unix vector
+  ];
+  license = stdenv.lib.licenses.mit;
+}
+) {}
diff --git a/krebs/5pkgs/nq.nix b/krebs/5pkgs/nq.nix
deleted file mode 100644
index 0f397a43..00000000
--- a/krebs/5pkgs/nq.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ fetchgit, stdenv }:
-
-stdenv.mkDerivation rec {
-  name = "nq-${rev}";
-  rev = "0eae839cb1";
-
-  src = fetchgit {
-    url = https://github.com/chneukirchen/nq;
-    inherit rev;
-    sha256 = "1150274750cde934932d65bd6053d7a0ba2404a59eadfb87fc6bd8a4fb70febb";
-  };
-
-  configurePhase = ''
-    sed -i "s:^PREFIX=.*:PREFIX=$out:" Makefile
-  '';
-}
diff --git a/krebs/5pkgs/nq/default.nix b/krebs/5pkgs/nq/default.nix
new file mode 100644
index 00000000..0f397a43
--- /dev/null
+++ b/krebs/5pkgs/nq/default.nix
@@ -0,0 +1,16 @@
+{ fetchgit, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "nq-${rev}";
+  rev = "0eae839cb1";
+
+  src = fetchgit {
+    url = https://github.com/chneukirchen/nq;
+    inherit rev;
+    sha256 = "1150274750cde934932d65bd6053d7a0ba2404a59eadfb87fc6bd8a4fb70febb";
+  };
+
+  configurePhase = ''
+    sed -i "s:^PREFIX=.*:PREFIX=$out:" Makefile
+  '';
+}
diff --git a/krebs/5pkgs/posix-array.nix b/krebs/5pkgs/posix-array.nix
deleted file mode 100644
index 456a3cc1..00000000
--- a/krebs/5pkgs/posix-array.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchgit, ... }:
-
-with stdenv; stdenv.mkDerivation rec {
-  name = "posix-array";
-  version = "1.0.0";
-
-  src = fetchgit {
-    url = https://github.com/makefu/array.git;
-    rev = "refs/tags/${version}";
-    sha256 = "0yzwlhdg1rgc4p64ny7gj30l7z6vikhskhppsa2qj7s9gm2gz938";
-  };
-
-  phases = [
-    "unpackPhase"
-    "installPhase"
-  ];
-
-  installPhase = ''
-    mkdir -p "$out/bin"
-    cp -a ./array $out/bin
-    rm *
-  '';
-
-  meta = {
-    description = "Posix-compliant array implementation";
-    url = https://github.com/makefu/array;
-    license = licenses.wtfpl;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ makefu ];
-  };
-}
diff --git a/krebs/5pkgs/posix-array/default.nix b/krebs/5pkgs/posix-array/default.nix
new file mode 100644
index 00000000..456a3cc1
--- /dev/null
+++ b/krebs/5pkgs/posix-array/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchgit, ... }:
+
+with stdenv; stdenv.mkDerivation rec {
+  name = "posix-array";
+  version = "1.0.0";
+
+  src = fetchgit {
+    url = https://github.com/makefu/array.git;
+    rev = "refs/tags/${version}";
+    sha256 = "0yzwlhdg1rgc4p64ny7gj30l7z6vikhskhppsa2qj7s9gm2gz938";
+  };
+
+  phases = [
+    "unpackPhase"
+    "installPhase"
+  ];
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp -a ./array $out/bin
+    rm *
+  '';
+
+  meta = {
+    description = "Posix-compliant array implementation";
+    url = https://github.com/makefu/array;
+    license = licenses.wtfpl;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ makefu ];
+  };
+}
diff --git a/krebs/5pkgs/youtube-tools.nix b/krebs/5pkgs/youtube-tools.nix
deleted file mode 100644
index d767728b..00000000
--- a/krebs/5pkgs/youtube-tools.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchgit, ... }:
-
-stdenv.mkDerivation {
-  name = "youtube-tools";
-
-  src = fetchgit {
-    url = https://github.com/Lassulus/the_playlist;
-    rev = "9218b163f2d8bc965b853ed9fc9e13d15a703456";
-    sha256 = "ae5db4be652d015a518e57e4ed2de34b9127e77d9272af3049832bb134e96e4d";
-  };
-
-  phases = [
-    "unpackPhase"
-    "installPhase"
-  ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp bin/* $out/bin/
-  '';
-}
diff --git a/krebs/5pkgs/youtube-tools/default.nix b/krebs/5pkgs/youtube-tools/default.nix
new file mode 100644
index 00000000..d767728b
--- /dev/null
+++ b/krebs/5pkgs/youtube-tools/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchgit, ... }:
+
+stdenv.mkDerivation {
+  name = "youtube-tools";
+
+  src = fetchgit {
+    url = https://github.com/Lassulus/the_playlist;
+    rev = "9218b163f2d8bc965b853ed9fc9e13d15a703456";
+    sha256 = "ae5db4be652d015a518e57e4ed2de34b9127e77d9272af3049832bb134e96e4d";
+  };
+
+  phases = [
+    "unpackPhase"
+    "installPhase"
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp bin/* $out/bin/
+  '';
+}
-- 
cgit v1.2.3


From cb6bede2f65bdcaafe547fdffd8c99f671c54ee9 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sat, 29 Aug 2015 00:48:37 +0200
Subject: Zpubkeys github -> krebs pkgs github-known_hosts

---
 krebs/5pkgs/github-known_hosts/default.nix    | 2 +-
 krebs/5pkgs/github-known_hosts/github.ssh.pub | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 krebs/5pkgs/github-known_hosts/github.ssh.pub

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/github-known_hosts/default.nix b/krebs/5pkgs/github-known_hosts/default.nix
index 302fdd8d..fe5efe41 100644
--- a/krebs/5pkgs/github-known_hosts/default.nix
+++ b/krebs/5pkgs/github-known_hosts/default.nix
@@ -4,7 +4,7 @@ with builtins;
 with lib;
 
 let
-  github-pubkey = removeSuffix "\n" (readFile ../../Zpubkeys/github.ssh.pub);
+  github-pubkey = removeSuffix "\n" (readFile ./github.ssh.pub);
 in
 
 toFile "github-known_hosts"
diff --git a/krebs/5pkgs/github-known_hosts/github.ssh.pub b/krebs/5pkgs/github-known_hosts/github.ssh.pub
new file mode 100644
index 00000000..90f6e2b7
--- /dev/null
+++ b/krebs/5pkgs/github-known_hosts/github.ssh.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
-- 
cgit v1.2.3


From 6def9f2d6ba957d068f0d1f0f267247b8e9a89f8 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sat, 29 Aug 2015 08:29:35 +0200
Subject: krebs pkgs pssh: init

---
 krebs/5pkgs/default.nix      |  1 +
 krebs/5pkgs/pssh/default.nix | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 krebs/5pkgs/pssh/default.nix

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 71bee3fa..500d5fe2 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -18,6 +18,7 @@ rec {
   much = callPackage ./much {};
   nq = callPackage ./nq {};
   posix-array = callPackage ./posix-array {};
+  pssh = callPackage ./pssh {};
   youtube-tools = callPackage ./youtube-tools {};
 
   execve = name: { filename, argv, envp ? {}, destination ? "" }:
diff --git a/krebs/5pkgs/pssh/default.nix b/krebs/5pkgs/pssh/default.nix
new file mode 100644
index 00000000..fd48d3e7
--- /dev/null
+++ b/krebs/5pkgs/pssh/default.nix
@@ -0,0 +1,37 @@
+{ writeScriptBin }:
+
+writeScriptBin "pssh" ''
+  #! /bin/sh
+  set -efu
+  case ''${1-} in
+
+  # TODO create plog with -o json | jq ... | map date
+
+  # usage: pssh {-j,--journal} host...
+  # Follow journal at each host.
+  -j|--journal)
+    shift
+    "$0" journalctl -n0 -ocat --follow --all ::: "$@" \
+      | while read line; do
+          printf '%s %s\n' "$(date --rfc-3339=s)" "$line"
+        done
+    ;;
+
+  -*)
+    echo $0: unknown option: $1 >&2
+    exit 1
+    ;;
+
+  # usage: pssh command [arg...] ::: host...
+  # Run command at each host.
+  *)
+    exec parallel \
+      --line-buffer \
+      -j0 \
+      --no-notice \
+      --tagstring {} \
+      ssh -T {} "$@"
+    ;;
+
+  esac
+''
-- 
cgit v1.2.3