Merge remote-tracking branch 'lass/master'

5 files changed, 61 insertions, 10 deletions

diff --git a/krebs/5pkgs/simple/K_belwagen.nix b/krebs/5pkgs/simple/K_belwagen.nix
new file mode 100644
index 000000000..80d377b0c
--- /dev/null
+++ b/krebs/5pkgs/simple/K_belwagen.nix
@@ -0,0 +1,38 @@
+{ lib, pkgs, stdenv }:
+
+stdenv.mkDerivation {
+  pname = "K_belwagen";
+  version = "1.0";
+
+  src = pkgs.painload;
+  sourceRoot = "source/K_belwagen";
+
+  buildInputs = [
+    pkgs.jack1
+    pkgs.pkgconfig
+  ];
+
+  patchPhase = ''
+    sed -i '
+      s@^cd@# &@
+      s@^make@# &@
+      s@^jackd@# &@
+      s@^trap@# &@
+
+      s@^set.*@&\nPATH=${lib.makeBinPath [
+        pkgs.bc
+        pkgs.coreutils
+      ]}; export PATH@
+
+      s@\./a\.out@'"$out"'/lib/a.out@
+    ' alarm
+  '';
+
+  installPhase = ''
+    mkdir -p $out/lib
+    mkdir -p $out/bin
+
+    cp alarm $out/bin
+    cp a.out $out/lib
+  '';
+}
diff --git a/krebs/5pkgs/simple/ergo/default.nix b/krebs/5pkgs/simple/ergo/default.nix
index a057b09f5..2c9223eed 100644
--- a/krebs/5pkgs/simple/ergo/default.nix
+++ b/krebs/5pkgs/simple/ergo/default.nix
@@ -1,14 +1,14 @@
-{ buildGo116Module , fetchFromGitHub, lib }:
+{ buildGo117Module , fetchFromGitHub, lib }:
 
-buildGo116Module rec {
+buildGo117Module rec {
   pname = "ergo";
-  version = "2.8.0";
+  version = "2.9.1";
 
   src = fetchFromGitHub {
     owner = "ergochat";
     repo = "ergo";
     rev = "v${version}";
-    sha256 = "sha256-xKcSHNH1ksjH1IikqzDi88fOdHR5CHGs8ya4Fj65MbI=";
+    sha256 = "sha256-RxsmkTfHymferS/FRW0sLnstKfvGXkW6cEb/JbeS4lc=";
   };
 
   vendorSha256 = null;
@@ -17,7 +17,7 @@ buildGo116Module rec {
     description = "A modern IRC server (daemon/ircd) written in Go";
     homepage = "https://github.com/ergochat/ergo";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.tv ];
+    maintainers = with lib.maintainers; [ lassulus tv ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/krebs/5pkgs/simple/git-hooks/default.nix b/krebs/5pkgs/simple/git-hooks/default.nix
index 00a593be3..c9dcc7541 100644
--- a/krebs/5pkgs/simple/git-hooks/default.nix
+++ b/krebs/5pkgs/simple/git-hooks/default.nix
@@ -100,6 +100,7 @@ with stockholm.lib;
         add_message "$(
           git log \
               --format="$(orange %h) %s $(gray '(%ar)')" \
+              --no-merges \
               --reverse \
               $id2..$id
 
diff --git a/krebs/5pkgs/simple/painload/default.nix b/krebs/5pkgs/simple/painload/default.nix
index 3b1c83b42..e4cb11604 100644
--- a/krebs/5pkgs/simple/painload/default.nix
+++ b/krebs/5pkgs/simple/painload/default.nix
@@ -1,7 +1,9 @@
-{ fetchgit, ... }:
+{ pkgs }:
 
-fetchgit {
-  url = https://github.com/krebs/painload;
-  rev = "c113487f73713a03b1a139b22bb34b86234d0495";
-  sha256 = "1irxklnmvm8wsa70ypjahkr8rfqq7357vcy8r0x1sfncs1hy6gr6";
+pkgs.fetchFromGitHub {
+  owner = "krebs";
+  repo = "painload";
+  rev = "a963b45d5a3921f19189575420cc7f8f946345b5";
+  sha256 = "03q8rxpzy4l9nd4wv0107s0ck3dhfzkfy1rabf8srabkwl0c3vsc";
+  fetchSubmodules = true;
 }
diff --git a/krebs/5pkgs/simple/reaktor2-plugins.nix b/krebs/5pkgs/simple/reaktor2-plugins.nix
index e23b14a23..54aaf246a 100644
--- a/krebs/5pkgs/simple/reaktor2-plugins.nix
+++ b/krebs/5pkgs/simple/reaktor2-plugins.nix
@@ -21,6 +21,16 @@ rec {
       };
     };
 
+    dance = {
+      filename = pkgs.writeDash "dance" ''
+        echo "<(^.^<)"
+        echo "<(^.^)>"
+        echo "(>^.^)>"
+        echo "(7^.^)7"
+        echo "(>^.^<)"
+      '';
+    };
+
     nixos-version = {
       filename = pkgs.writeDash "nixos-version" ''
         . /etc/os-release