From 72d5a050e11ee59604ae8d165b3a284d2799e7e2 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 5 Oct 2021 22:59:35 +0200
Subject: ircaids: init at 1.0.0

---
 krebs/5pkgs/simple/ircaids.nix | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 krebs/5pkgs/simple/ircaids.nix

(limited to 'krebs/5pkgs/simple')

diff --git a/krebs/5pkgs/simple/ircaids.nix b/krebs/5pkgs/simple/ircaids.nix
new file mode 100644
index 000000000..566346cc9
--- /dev/null
+++ b/krebs/5pkgs/simple/ircaids.nix
@@ -0,0 +1,32 @@
+{ lib, pkgs, stdenv }:
+
+stdenv.mkDerivation rec {
+  pname = "ircaids";
+  version = "1.0.0";
+
+  src = pkgs.fetchgit {
+    url = "https://cgit.krebsco.de/ircaids";
+    rev = "refs/tags/${version}";
+    sha256 = "13z9pc9vq2xq2qpavwmh7fvzvvjkc495ssxsh8cs044qflvj54b2";
+  };
+
+  buildPhase = null;
+
+  installPhase = ''
+    mkdir -p $out/bin
+
+    cp $src/bin/ircsink $out/bin/ircsink
+    sed -i '
+      s;^#! /bin/sh;#! ${pkgs.dash}/bin/dash;
+      s;^#!.*;&\nexport PATH=${lib.makeBinPath [
+        pkgs.coreutils
+        pkgs.gawk
+        pkgs.gnused
+        pkgs.netcat
+        pkgs.nettools
+        pkgs.openssl
+        pkgs.utillinux
+      ]};
+    ' $out/bin/ircsink
+  '';
+}
-- 
cgit v1.2.3


From 1b65517b444daa190a9cb80ea85a85d49bd0d394 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 5 Oct 2021 23:09:44 +0200
Subject: irc-announce: use ircaids

---
 krebs/5pkgs/simple/irc-announce/default.nix | 74 +++++------------------------
 1 file changed, 11 insertions(+), 63 deletions(-)

(limited to 'krebs/5pkgs/simple')

diff --git a/krebs/5pkgs/simple/irc-announce/default.nix b/krebs/5pkgs/simple/irc-announce/default.nix
index 5797b3667..7b2af0307 100644
--- a/krebs/5pkgs/simple/irc-announce/default.nix
+++ b/krebs/5pkgs/simple/irc-announce/default.nix
@@ -1,18 +1,8 @@
 { pkgs, lib, ... }:
 
-with lib;
-
 pkgs.writeDashBin "irc-announce" ''
   set -euf
 
-  export PATH=${makeSearchPath "bin" (with pkgs; [
-    coreutils
-    gawk
-    gnused
-    netcat
-    nettools
-  ])}
-
   IRC_SERVER=$1
   IRC_PORT=$2
   IRC_NICK=$3_$$
@@ -20,57 +10,15 @@ pkgs.writeDashBin "irc-announce" ''
   IRC_TLS=$5
   message=$6
 
-  export IRC_CHANNEL # for privmsg_cat
-
-  # echo2 and cat2 are used output to both, stdout and stderr
-  # This is used to see what we send to the irc server. (debug output)
-  echo2() { echo "$*"; echo "$*" >&2; }
-  cat2() {
-    awk '{
-      print $0
-      print $0 > "/dev/stderr"
-    }'
-  }
-
-  # privmsg_cat transforms stdin to a privmsg
-  privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; }
-
-  tls_flag() { if [ "$IRC_TLS" -eq 1 ]; then echo "-c"; fi }
-
-  # ircin is used to feed the output of netcat back to the "irc client"
-  # so we can implement expect-like behavior with sed^_^
-  # XXX mkselfdestructingtmpfifo would be nice instead of this cruft
-  tmpdir=$(mktemp --tmpdir -d irc-announce_XXXXXXXX)
-  cd "$tmpdir"
-  mkfifo ircin
-  trap "
-    rm ircin
-    cd '$OLDPWD'
-    rmdir '$tmpdir'
-    trap - EXIT INT QUIT
-  " EXIT INT QUIT
-
-  {
-    echo2 "USER $LOGNAME 0 * :$LOGNAME@$(hostname)"
-    echo2 "NICK $IRC_NICK"
-
-    awk 'match($0, /PING(.*)/, m) {print "PONG", m[1]; exit}'
-
-    # wait for MODE message
-    sed -n '/^:[^ ]* MODE /q'
-
-    echo2 "JOIN $IRC_CHANNEL"
-
-    printf '%s' "$message" \
-      | privmsg_cat \
-      | cat2
-
-    echo2 "PART $IRC_CHANNEL"
-
-    # wait for PART confirmation
-    sed -n '/:'"$IRC_NICK"'![^ ]* PART /q'
-
-    echo2 'QUIT :Gone to have lunch'
-  } < ircin \
-    | nc $(tls_flag) "$IRC_SERVER" "$IRC_PORT" | tee -a ircin
+  if test "$IRC_TLS" != 1; then
+    unset IRC_TLS
+  fi
+
+  printf %s "$message" |
+  ${pkgs.ircaids}/bin/ircsink \
+      --nick="$IRC_NICK" \
+      --port="$IRC_PORT" \
+      --server="$IRC_SERVER" \
+      --target="$IRC_CHANNEL" \
+      ''${IRC_TLS:+--secure}
 ''
-- 
cgit v1.2.3


From 780a04e991c46a111c38281fced75f9c38e972f8 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 12 Oct 2021 20:07:54 +0200
Subject: ircaids: move to dir

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

(limited to 'krebs/5pkgs/simple')

diff --git a/krebs/5pkgs/simple/ircaids.nix b/krebs/5pkgs/simple/ircaids.nix
deleted file mode 100644
index 566346cc9..000000000
--- a/krebs/5pkgs/simple/ircaids.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, pkgs, stdenv }:
-
-stdenv.mkDerivation rec {
-  pname = "ircaids";
-  version = "1.0.0";
-
-  src = pkgs.fetchgit {
-    url = "https://cgit.krebsco.de/ircaids";
-    rev = "refs/tags/${version}";
-    sha256 = "13z9pc9vq2xq2qpavwmh7fvzvvjkc495ssxsh8cs044qflvj54b2";
-  };
-
-  buildPhase = null;
-
-  installPhase = ''
-    mkdir -p $out/bin
-
-    cp $src/bin/ircsink $out/bin/ircsink
-    sed -i '
-      s;^#! /bin/sh;#! ${pkgs.dash}/bin/dash;
-      s;^#!.*;&\nexport PATH=${lib.makeBinPath [
-        pkgs.coreutils
-        pkgs.gawk
-        pkgs.gnused
-        pkgs.netcat
-        pkgs.nettools
-        pkgs.openssl
-        pkgs.utillinux
-      ]};
-    ' $out/bin/ircsink
-  '';
-}
diff --git a/krebs/5pkgs/simple/ircaids/default.nix b/krebs/5pkgs/simple/ircaids/default.nix
new file mode 100644
index 000000000..566346cc9
--- /dev/null
+++ b/krebs/5pkgs/simple/ircaids/default.nix
@@ -0,0 +1,32 @@
+{ lib, pkgs, stdenv }:
+
+stdenv.mkDerivation rec {
+  pname = "ircaids";
+  version = "1.0.0";
+
+  src = pkgs.fetchgit {
+    url = "https://cgit.krebsco.de/ircaids";
+    rev = "refs/tags/${version}";
+    sha256 = "13z9pc9vq2xq2qpavwmh7fvzvvjkc495ssxsh8cs044qflvj54b2";
+  };
+
+  buildPhase = null;
+
+  installPhase = ''
+    mkdir -p $out/bin
+
+    cp $src/bin/ircsink $out/bin/ircsink
+    sed -i '
+      s;^#! /bin/sh;#! ${pkgs.dash}/bin/dash;
+      s;^#!.*;&\nexport PATH=${lib.makeBinPath [
+        pkgs.coreutils
+        pkgs.gawk
+        pkgs.gnused
+        pkgs.netcat
+        pkgs.nettools
+        pkgs.openssl
+        pkgs.utillinux
+      ]};
+    ' $out/bin/ircsink
+  '';
+}
-- 
cgit v1.2.3


From 77c3aab5b860a952e9d83db56aefe23ee04ccebc Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 12 Oct 2021 19:36:09 +0200
Subject: pkgs: use relative stockholm.lib

---
 krebs/5pkgs/simple/bling/default.nix             |  5 ++---
 krebs/5pkgs/simple/cgit-clear-cache.nix          |  6 ++----
 krebs/5pkgs/simple/default.nix                   | 15 +++++++--------
 krebs/5pkgs/simple/eximlog.nix                   |  4 ++--
 krebs/5pkgs/simple/flameshot-once/default.nix    |  4 ++--
 krebs/5pkgs/simple/flameshot-once/profile.nix    |  2 +-
 krebs/5pkgs/simple/fzfmenu/default.nix           |  4 ++--
 krebs/5pkgs/simple/git-hooks/default.nix         |  4 ++--
 krebs/5pkgs/simple/htgen-cyberlocker/default.nix |  5 +++--
 krebs/5pkgs/simple/htgen-imgur/default.nix       |  7 +++----
 krebs/5pkgs/simple/logf/default.nix              |  2 --
 krebs/5pkgs/simple/netcup/default.nix            |  5 +++--
 krebs/5pkgs/simple/reaktor2-plugins.nix          |  4 ++--
 krebs/5pkgs/simple/urix.nix                      |  5 ++---
 krebs/5pkgs/simple/withGetopt.nix                |  4 ++--
 15 files changed, 35 insertions(+), 41 deletions(-)

(limited to 'krebs/5pkgs/simple')

diff --git a/krebs/5pkgs/simple/bling/default.nix b/krebs/5pkgs/simple/bling/default.nix
index 8d6207f65..1c8610325 100644
--- a/krebs/5pkgs/simple/bling/default.nix
+++ b/krebs/5pkgs/simple/bling/default.nix
@@ -1,6 +1,5 @@
-{ imagemagick, runCommand, ... }:
-
-with import <stockholm/lib>;
+{ imagemagick, runCommand, stockholm, ... }:
+with stockholm.lib;
 
 let
   krebs-v2 = [
diff --git a/krebs/5pkgs/simple/cgit-clear-cache.nix b/krebs/5pkgs/simple/cgit-clear-cache.nix
index 28402c39c..31a2eccb3 100644
--- a/krebs/5pkgs/simple/cgit-clear-cache.nix
+++ b/krebs/5pkgs/simple/cgit-clear-cache.nix
@@ -1,8 +1,6 @@
-with import <stockholm/lib>;
-
-{ cache-root ? "/tmp/cgit", findutils, writeDashBin }:
+{ cache-root ? "/tmp/cgit", findutils, stockholm, writeDashBin }:
 
 writeDashBin "cgit-clear-cache" ''
   set -efu
-  ${findutils}/bin/find ${shell.escape cache-root} -type f -delete
+  ${findutils}/bin/find ${stockholm.lib.shell.escape cache-root} -type f -delete
 ''
diff --git a/krebs/5pkgs/simple/default.nix b/krebs/5pkgs/simple/default.nix
index 6ba4fec83..10458001e 100644
--- a/krebs/5pkgs/simple/default.nix
+++ b/krebs/5pkgs/simple/default.nix
@@ -1,18 +1,17 @@
-with import <stockholm/lib>;
-
 self: super:
 
 let
   # This callPackage will try to detect obsolete overrides.
+  lib = import ../../../lib;
   callPackage = path: args: let
     override = self.callPackage path args;
-    upstream = optionalAttrs (override ? "name")
-      (super.${(parseDrvName override.name).name} or {});
+    upstream = lib.optionalAttrs (override ? "name")
+      (super.${(lib.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
+        lib.compareVersions upstream.name override.name != -1
+    then lib.trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
     else override;
 in
-
-  mapNixDir (path: callPackage path {}) ./.
+  { stockholm.lib = lib; } //
+    lib.mapNixDir (path: callPackage path {}) ./.
diff --git a/krebs/5pkgs/simple/eximlog.nix b/krebs/5pkgs/simple/eximlog.nix
index 2d64e13e9..9e5ae8d63 100644
--- a/krebs/5pkgs/simple/eximlog.nix
+++ b/krebs/5pkgs/simple/eximlog.nix
@@ -1,7 +1,7 @@
-{ jq, systemd, writeDashBin }:
+{ jq, stockholm, systemd, writeDashBin }:
 
 let
-  lib = import <stockholm/lib>;
+  lib = stockholm.lib;
   user = "exim"; # TODO make this configurable
 in
 
diff --git a/krebs/5pkgs/simple/flameshot-once/default.nix b/krebs/5pkgs/simple/flameshot-once/default.nix
index 20c709fb5..0524c2cfa 100644
--- a/krebs/5pkgs/simple/flameshot-once/default.nix
+++ b/krebs/5pkgs/simple/flameshot-once/default.nix
@@ -1,5 +1,5 @@
-with import <stockholm/lib>;
-{ pkgs, ... }@args:
+{ pkgs, stockholm, ... }@args:
+with stockholm.lib;
 
 let
   # config cannot be declared in the input attribute set because that would
diff --git a/krebs/5pkgs/simple/flameshot-once/profile.nix b/krebs/5pkgs/simple/flameshot-once/profile.nix
index 8aacbfa42..991b46118 100644
--- a/krebs/5pkgs/simple/flameshot-once/profile.nix
+++ b/krebs/5pkgs/simple/flameshot-once/profile.nix
@@ -1,5 +1,5 @@
-with import <stockholm/lib>;
 { config, pkgs }:
+with pkgs.stockholm.lib;
 let
 
   # Refs https://github.com/lupoDharkael/flameshot/blob/master/src/widgets/capture/capturebutton.h
diff --git a/krebs/5pkgs/simple/fzfmenu/default.nix b/krebs/5pkgs/simple/fzfmenu/default.nix
index 537b90f42..f208f6a3e 100644
--- a/krebs/5pkgs/simple/fzfmenu/default.nix
+++ b/krebs/5pkgs/simple/fzfmenu/default.nix
@@ -1,5 +1,5 @@
-with import <stockholm/lib>;
-{ pkgs, ... }@args:
+{ pkgs, stockholm, ... }@args:
+with stockholm.lib;
 
 let
   # config cannot be declared in the input attribute set because that would
diff --git a/krebs/5pkgs/simple/git-hooks/default.nix b/krebs/5pkgs/simple/git-hooks/default.nix
index acf34ad69..00a593be3 100644
--- a/krebs/5pkgs/simple/git-hooks/default.nix
+++ b/krebs/5pkgs/simple/git-hooks/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ pkgs, stockholm, ... }:
 
-with import <stockholm/lib>;
+with stockholm.lib;
 
 {
   # TODO irc-announce should return a derivation
diff --git a/krebs/5pkgs/simple/htgen-cyberlocker/default.nix b/krebs/5pkgs/simple/htgen-cyberlocker/default.nix
index 515ea3cf9..c7d7ebfd8 100644
--- a/krebs/5pkgs/simple/htgen-cyberlocker/default.nix
+++ b/krebs/5pkgs/simple/htgen-cyberlocker/default.nix
@@ -1,5 +1,6 @@
-with import <stockholm/lib>;
-{ pkgs, stdenv }:
+{ pkgs, stockholm, stdenv }:
+with stockholm.lib;
+
 stdenv.mkDerivation rec {
   pname = "htgen-cyberlocker";
   version = "1.0.0";
diff --git a/krebs/5pkgs/simple/htgen-imgur/default.nix b/krebs/5pkgs/simple/htgen-imgur/default.nix
index fe0b2ab04..f429ff7a6 100644
--- a/krebs/5pkgs/simple/htgen-imgur/default.nix
+++ b/krebs/5pkgs/simple/htgen-imgur/default.nix
@@ -1,5 +1,4 @@
-with import <stockholm/lib>;
-{ attr, coreutils, exiv2, findutils, gnugrep, jq, nix, utillinux, stdenv }:
+{ attr, coreutils, exiv2, findutils, gnugrep, jq, nix, stockholm, utillinux, stdenv }:
 stdenv.mkDerivation rec {
   pname = "htgen-imgur";
   version = "1.0.0";
@@ -9,7 +8,7 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     (
       exec > htgen-imgur
-      echo PATH=${makeBinPath [
+      echo PATH=${stockholm.lib.makeBinPath [
         attr
         coreutils
         exiv2
@@ -18,7 +17,7 @@ stdenv.mkDerivation rec {
         jq
         nix utillinux
       ]}
-      echo STATEDIR=${shell.escape "\${STATEDIR-$HOME}"}
+      echo STATEDIR=${stockholm.lib.shell.escape "\${STATEDIR-$HOME}"}
       cat $src/htgen-imgur
     )
   '';
diff --git a/krebs/5pkgs/simple/logf/default.nix b/krebs/5pkgs/simple/logf/default.nix
index ac95acb33..36a7fed2f 100644
--- a/krebs/5pkgs/simple/logf/default.nix
+++ b/krebs/5pkgs/simple/logf/default.nix
@@ -1,7 +1,5 @@
 { lib, pkgs, ... }:
 
-with import <stockholm/lib>;
-
 let
   default-host-colors = pkgs.writeJSON "logf.default-host-colors.json" {
   };
diff --git a/krebs/5pkgs/simple/netcup/default.nix b/krebs/5pkgs/simple/netcup/default.nix
index d1f46299d..408672eff 100644
--- a/krebs/5pkgs/simple/netcup/default.nix
+++ b/krebs/5pkgs/simple/netcup/default.nix
@@ -1,5 +1,6 @@
-{ coreutils, curl, fetchgit, gawk, gnugrep, gnused, jq, stdenv, w3m, ... }:
-with import <stockholm/lib>;
+{ coreutils, curl, fetchgit, gawk, gnugrep, gnused, jq, stdenv, stockholm, w3m, ... }:
+with stockholm.lib;
+
 let
   readJSON = path: fromJSON (readFile path);
   sed.escape = replaceChars ["/"] ["\\/"]; # close enough
diff --git a/krebs/5pkgs/simple/reaktor2-plugins.nix b/krebs/5pkgs/simple/reaktor2-plugins.nix
index 4cd9e7d89..e23b14a23 100644
--- a/krebs/5pkgs/simple/reaktor2-plugins.nix
+++ b/krebs/5pkgs/simple/reaktor2-plugins.nix
@@ -1,5 +1,5 @@
-with import <stockholm/lib>;
-{ lib, pkgs, ... }:
+{ lib, pkgs, stockholm, ... }:
+with stockholm.lib;
 
 rec {
   generators = {
diff --git a/krebs/5pkgs/simple/urix.nix b/krebs/5pkgs/simple/urix.nix
index c0db8c975..73ea3e665 100644
--- a/krebs/5pkgs/simple/urix.nix
+++ b/krebs/5pkgs/simple/urix.nix
@@ -1,5 +1,4 @@
-let lib = import <stockholm/lib>; in
-{ pkgs }:
+{ pkgs, stockholm }:
 
 # urix - URI eXtractor
 # Extract all the URIs from standard input and write them to standard output!
@@ -10,6 +9,6 @@ pkgs.execBin "urix" {
   argv = [
     "urix"
     "-Eo"
-    "\\b${lib.uri.posix-extended-regex}\\b"
+    "\\b${stockholm.lib.uri.posix-extended-regex}\\b"
   ];
 }
diff --git a/krebs/5pkgs/simple/withGetopt.nix b/krebs/5pkgs/simple/withGetopt.nix
index d20802fb2..7f17a5934 100644
--- a/krebs/5pkgs/simple/withGetopt.nix
+++ b/krebs/5pkgs/simple/withGetopt.nix
@@ -1,5 +1,5 @@
-with import <stockholm/lib>;
-{ coreutils, quote, utillinux, writeDash }:
+{ coreutils, quote, stockholm, utillinux, writeDash }:
+with stockholm.lib;
 
 opt-spec: cmd-spec: let
 
-- 
cgit v1.2.3


From be5f4833fe1dc3ec4acb24eeb5a6670c2aaef2e0 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 12 Oct 2021 22:08:07 +0200
Subject: pkgs: import relative stockholm lib only once

New overlay code in inspired by <nixpkgs/pkgs/top-level/stage.nix>.
---
 krebs/5pkgs/simple/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'krebs/5pkgs/simple')

diff --git a/krebs/5pkgs/simple/default.nix b/krebs/5pkgs/simple/default.nix
index 10458001e..76ad6ff10 100644
--- a/krebs/5pkgs/simple/default.nix
+++ b/krebs/5pkgs/simple/default.nix
@@ -2,7 +2,7 @@ self: super:
 
 let
   # This callPackage will try to detect obsolete overrides.
-  lib = import ../../../lib;
+  lib = super.stockholm.lib;
   callPackage = path: args: let
     override = self.callPackage path args;
     upstream = lib.optionalAttrs (override ? "name")
@@ -13,5 +13,4 @@ let
     then lib.trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
     else override;
 in
-  { stockholm.lib = lib; } //
-    lib.mapNixDir (path: callPackage path {}) ./.
+  lib.mapNixDir (path: callPackage path {}) ./.
-- 
cgit v1.2.3


From a9bba92e0e2e63af4ef470327d30d1e873af53eb Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 19 Oct 2021 22:51:26 +0200
Subject: krebs: stdenv.lib -> lib

---
 krebs/5pkgs/simple/buildbot-classic/sqlparse.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs/5pkgs/simple')

diff --git a/krebs/5pkgs/simple/buildbot-classic/sqlparse.nix b/krebs/5pkgs/simple/buildbot-classic/sqlparse.nix
index b6aee633e..2cbb51845 100644
--- a/krebs/5pkgs/simple/buildbot-classic/sqlparse.nix
+++ b/krebs/5pkgs/simple/buildbot-classic/sqlparse.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   # Package supports 3.x, but tests are clearly 2.x only.
   doCheck = !isPy3k;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Non-validating SQL parser for Python";
     longDescription = ''
       Provides support for parsing, splitting and formatting SQL statements.
-- 
cgit v1.2.3


From 55b137ba525f075f4619de4676d3e66f782b1a12 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 14 Sep 2021 18:52:54 +0200
Subject: rip Reaktor

---
 krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh |  6 ---
 krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh | 20 --------
 krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py   | 58 ----------------------
 .../5pkgs/simple/Reaktor/scripts/shack-correct.sh  |  6 ---
 4 files changed, 90 deletions(-)
 delete mode 100755 krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh
 delete mode 100755 krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh
 delete mode 100755 krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py
 delete mode 100755 krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh

(limited to 'krebs/5pkgs/simple')

diff --git a/krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh b/krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh
deleted file mode 100755
index 6f3dd4a3f..000000000
--- a/krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-curl -sS http://emojicons.com/random | \
-  grep data-text | \
-  sed -n 's/.*>\(.*\)<\/textarea>/\1/p' | \
-  head -n 1 | \
-  xmlstarlet unesc
diff --git a/krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh b/krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh
deleted file mode 100755
index 5c47c6156..000000000
--- a/krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh
-set -eu
-# requires env:
-#   $state_dir
-#   $origin
-
-# in PATH: git,lentil,coreutils
-subdir=`echo "$1" | tr -dc "[:alnum:]"`
-name=`echo "$origin" | tr -dc "[:alnum:]"`
-track="$state_dir/$name-checkout"
-(if test -e "$track" ;then
-  cd "$track"
-  git fetch origin master
-  git reset --hard origin/master
-else
-  git clone "$origin" "$track"
-fi) >&2
-
-cd "$track"
-lentil "${subdir:-.}" -f csv | sed 1d | shuf | head -1
diff --git a/krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py b/krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py
deleted file mode 100755
index 4925b25bb..000000000
--- a/krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env python3
-
-# Usage:
-# _from=krebs state_dir=. python sed-plugin.py 'dick butt'
-# _from=krebs state_dir=. python sed-plugin.py 's/t/l/g'
-# > dick bull
-import shelve
-from os import environ
-from os.path import join
-from sys import argv
-from time import sleep
-import re
-
-# try to open the shelve file until it succeeds
-while True:
-    try:
-        d = shelve.open(
-            join(environ['state_dir'], 'sed-plugin.shelve'),
-            writeback=True
-        )
-        break
-    except:  # noqa: E722
-        sleep(0.2)
-usr = environ['_from']
-
-
-def is_regex(line):
-    myre = re.compile(r'^s/(?:\\/|[^/])+/(?:\\/|[^/])*/[ig]?$')
-    return myre.match(line)
-
-
-line = argv[1]
-
-if is_regex(line):
-    last = d.get(usr, None)
-    if last:
-        from subprocess import Popen, PIPE
-        p = Popen(['sed', line], stdin=PIPE, stdout=PIPE, stderr=PIPE)
-        so, se = p.communicate(bytes("{}\n".format(last), "UTF-8"))
-        if p.returncode:
-            print("something went wrong when trying to process your regex: {}".format(line.strip()))
-        ret = so.decode()
-        if len(ret) > 512:
-            print('message to long, skipped')
-        elif len(ret.split('\n')) > 5:
-            print('to many lines, skipped')
-        else:
-            if last.strip() != ret.strip():
-                print("\x02{}\x02 meant: {}".format(usr, ret.strip()))
-                if ret:
-                    d[usr] = ret
-
-    else:
-        print("no last message")
-else:
-    d[usr] = line
-
-d.close()
diff --git a/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh b/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh
deleted file mode 100755
index d500b3cb3..000000000
--- a/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/sh
-set -eu
-printf "Sie meinten wohl \""
-echo -n $@ | sed 's/Shack/shack/g'
-echo "\" check out https://wiki.shackspace.de/project/logo_and_ci#name_ci"
-echo "${_from}--"
-- 
cgit v1.2.3


From 679922a7831176089fe9e3ad62346b0e0bd4dcdd Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 23 Oct 2021 15:15:54 +0200
Subject: Revert "rip Reaktor"

This reverts commit 55b137ba525f075f4619de4676d3e66f782b1a12.
---
 krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh |  6 +++
 krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh | 20 ++++++++
 krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py   | 58 ++++++++++++++++++++++
 .../5pkgs/simple/Reaktor/scripts/shack-correct.sh  |  6 +++
 4 files changed, 90 insertions(+)
 create mode 100755 krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh
 create mode 100755 krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh
 create mode 100755 krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py
 create mode 100755 krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh

(limited to 'krebs/5pkgs/simple')

diff --git a/krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh b/krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh
new file mode 100755
index 000000000..6f3dd4a3f
--- /dev/null
+++ b/krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+curl -sS http://emojicons.com/random | \
+  grep data-text | \
+  sed -n 's/.*>\(.*\)<\/textarea>/\1/p' | \
+  head -n 1 | \
+  xmlstarlet unesc
diff --git a/krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh b/krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh
new file mode 100755
index 000000000..5c47c6156
--- /dev/null
+++ b/krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh
@@ -0,0 +1,20 @@
+#! /bin/sh
+set -eu
+# requires env:
+#   $state_dir
+#   $origin
+
+# in PATH: git,lentil,coreutils
+subdir=`echo "$1" | tr -dc "[:alnum:]"`
+name=`echo "$origin" | tr -dc "[:alnum:]"`
+track="$state_dir/$name-checkout"
+(if test -e "$track" ;then
+  cd "$track"
+  git fetch origin master
+  git reset --hard origin/master
+else
+  git clone "$origin" "$track"
+fi) >&2
+
+cd "$track"
+lentil "${subdir:-.}" -f csv | sed 1d | shuf | head -1
diff --git a/krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py b/krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py
new file mode 100755
index 000000000..4925b25bb
--- /dev/null
+++ b/krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py
@@ -0,0 +1,58 @@
+#!/usr/bin/env python3
+
+# Usage:
+# _from=krebs state_dir=. python sed-plugin.py 'dick butt'
+# _from=krebs state_dir=. python sed-plugin.py 's/t/l/g'
+# > dick bull
+import shelve
+from os import environ
+from os.path import join
+from sys import argv
+from time import sleep
+import re
+
+# try to open the shelve file until it succeeds
+while True:
+    try:
+        d = shelve.open(
+            join(environ['state_dir'], 'sed-plugin.shelve'),
+            writeback=True
+        )
+        break
+    except:  # noqa: E722
+        sleep(0.2)
+usr = environ['_from']
+
+
+def is_regex(line):
+    myre = re.compile(r'^s/(?:\\/|[^/])+/(?:\\/|[^/])*/[ig]?$')
+    return myre.match(line)
+
+
+line = argv[1]
+
+if is_regex(line):
+    last = d.get(usr, None)
+    if last:
+        from subprocess import Popen, PIPE
+        p = Popen(['sed', line], stdin=PIPE, stdout=PIPE, stderr=PIPE)
+        so, se = p.communicate(bytes("{}\n".format(last), "UTF-8"))
+        if p.returncode:
+            print("something went wrong when trying to process your regex: {}".format(line.strip()))
+        ret = so.decode()
+        if len(ret) > 512:
+            print('message to long, skipped')
+        elif len(ret.split('\n')) > 5:
+            print('to many lines, skipped')
+        else:
+            if last.strip() != ret.strip():
+                print("\x02{}\x02 meant: {}".format(usr, ret.strip()))
+                if ret:
+                    d[usr] = ret
+
+    else:
+        print("no last message")
+else:
+    d[usr] = line
+
+d.close()
diff --git a/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh b/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh
new file mode 100755
index 000000000..d500b3cb3
--- /dev/null
+++ b/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh
@@ -0,0 +1,6 @@
+#! /bin/sh
+set -eu
+printf "Sie meinten wohl \""
+echo -n $@ | sed 's/Shack/shack/g'
+echo "\" check out https://wiki.shackspace.de/project/logo_and_ci#name_ci"
+echo "${_from}--"
-- 
cgit v1.2.3


From 4467830663663f0310968c00d0f191d22ad7f690 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 23 Oct 2021 15:37:22 +0200
Subject: ircaids: 1.0.0 -> 1.0.1

---
 krebs/5pkgs/simple/ircaids/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs/5pkgs/simple')

diff --git a/krebs/5pkgs/simple/ircaids/default.nix b/krebs/5pkgs/simple/ircaids/default.nix
index 566346cc9..61d3ee31c 100644
--- a/krebs/5pkgs/simple/ircaids/default.nix
+++ b/krebs/5pkgs/simple/ircaids/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "ircaids";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = pkgs.fetchgit {
     url = "https://cgit.krebsco.de/ircaids";
     rev = "refs/tags/${version}";
-    sha256 = "13z9pc9vq2xq2qpavwmh7fvzvvjkc495ssxsh8cs044qflvj54b2";
+    sha256 = "0wp01pag58c72rmx8j3i1vlq60na8lc91743832f0h27cik8yqvh";
   };
 
   buildPhase = null;
-- 
cgit v1.2.3


From 9fc5849786a82c4cd5bec695d6f9086237a597df Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Oct 2021 20:15:45 +0200
Subject: pkgs.htgen-cyberlocker: fix erronous response

---
 krebs/5pkgs/simple/htgen-cyberlocker/src/htgen-cyberlocker | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'krebs/5pkgs/simple')

diff --git a/krebs/5pkgs/simple/htgen-cyberlocker/src/htgen-cyberlocker b/krebs/5pkgs/simple/htgen-cyberlocker/src/htgen-cyberlocker
index ab9c4e8e3..5ca0ddd3e 100644
--- a/krebs/5pkgs/simple/htgen-cyberlocker/src/htgen-cyberlocker
+++ b/krebs/5pkgs/simple/htgen-cyberlocker/src/htgen-cyberlocker
@@ -1,3 +1,10 @@
+emptyok_response() {(
+  printf "HTTP/1.1 204 OK\r\n"
+  printf 'Connection: close\r\n'
+  printf 'Server: %s\r\n' "$Server"
+  printf '\r\n'
+)}
+
 delete_response() {
   jq -n -r \
   --arg server "$Server" \
@@ -44,7 +51,10 @@ read_uri() {
 }
 
 uri=$(read_uri "$Request_URI")
-path=$(jq -nr --argjson uri "$uri" '$uri.path')
+path=$(jq -nr --argjson uri "$uri" '
+  $uri.path |
+  gsub("/+"; "/")
+')
 
 case "$Method $path" in
   'POST /'*|'PUT /'*)
@@ -57,6 +67,8 @@ case "$Method $path" in
 
     mkdir -v -p $STATEDIR/items >&2
     cp -v $content $item >&2
+
+    emptyok_response
     exit
   ;;
   'GET /'*)
-- 
cgit v1.2.3


From 6ad567a18ed27b8c07bd79e045ac082f1dfe148e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Oct 2021 20:17:32 +0200
Subject: pkgs.nomads-cloud: put tmpfiles into tmpdir

---
 krebs/5pkgs/simple/nomads-cloud/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'krebs/5pkgs/simple')

diff --git a/krebs/5pkgs/simple/nomads-cloud/default.nix b/krebs/5pkgs/simple/nomads-cloud/default.nix
index 97cf10d1f..cc9e7a964 100644
--- a/krebs/5pkgs/simple/nomads-cloud/default.nix
+++ b/krebs/5pkgs/simple/nomads-cloud/default.nix
@@ -1,10 +1,10 @@
 { writers, coreutils, grib2json, curl, jq, findutils, imagemagick }:
 writers.writeDashBin "nomads-cloud" ''
   prefix=$(mktemp -d)
-  grib_path=$prefix.grib
-  json_path=$prefix.json
-  pgm_path=$prefix.pgm
-  png_path="$1"
+  grib_path=$prefix/clouds.grib
+  json_path=$prefix/clouds.json
+  pgm_path=$prefix/clouds.pgm
+  png_path=$1
 
   mkdir -p "$prefix"
 
-- 
cgit v1.2.3