summaryrefslogtreecommitdiffstats
path: root/krebs/5pkgs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2022-01-26 17:59:53 +0100
committermakefu <github@syntax-fehler.de>2022-01-26 17:59:53 +0100
commit54aaf5af8ed4d62a2e6645b7ca662ffac310e86c (patch)
treeb3b1a1797791cd8cf763254a3fd88f7d35a2340c /krebs/5pkgs
parentef48f536a3e539b215bb004b512e62c2d0f96907 (diff)
parent31fc5a95c735ab3b9b832d407195e422c07cd4c0 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/5pkgs')
-rw-r--r--krebs/5pkgs/haskell/brockman/default.nix4
-rw-r--r--krebs/5pkgs/haskell/much.nix6
-rw-r--r--krebs/5pkgs/simple/K_belwagen.nix38
-rw-r--r--krebs/5pkgs/simple/ergo/default.nix10
-rw-r--r--krebs/5pkgs/simple/git-hooks/default.nix1
-rw-r--r--krebs/5pkgs/simple/painload/default.nix12
-rw-r--r--krebs/5pkgs/simple/reaktor2-plugins.nix10
7 files changed, 66 insertions, 15 deletions
diff --git a/krebs/5pkgs/haskell/brockman/default.nix b/krebs/5pkgs/haskell/brockman/default.nix
index 01b7a0570..8a2311a2e 100644
--- a/krebs/5pkgs/haskell/brockman/default.nix
+++ b/krebs/5pkgs/haskell/brockman/default.nix
@@ -7,12 +7,12 @@
}:
mkDerivation rec {
pname = "brockman";
- version = "4.0.2";
+ version = "4.0.3";
src = fetchFromGitHub {
owner = "kmein";
repo = "brockman";
rev = version;
- sha256 = "sha256-EKXKhGdIJRbRklD5zxJNGhOxqPzog4f9NMXo/c8iBGc=";
+ sha256 = "sha256-rjwroSG9ys0FV2JM70kzmCutMVpUTx8cQ+jQq8Hw1kw=";
};
isLibrary = false;
isExecutable = true;
diff --git a/krebs/5pkgs/haskell/much.nix b/krebs/5pkgs/haskell/much.nix
index f3aad2ee6..5045465e6 100644
--- a/krebs/5pkgs/haskell/much.nix
+++ b/krebs/5pkgs/haskell/much.nix
@@ -9,11 +9,11 @@
}:
mkDerivation {
pname = "much";
- version = "1.2.0";
+ version = "1.3.1";
src = fetchgit {
url = "https://cgit.krebsco.de/much";
- sha256 = "0rf27d7gki5hgivy49xi59ld0j6jw3v7nxi4w1gx6byj1xsarwwl";
- rev = "29749366052a8f6c05b314f1ff17201717855ad7";
+ sha256 = "0gwyhqcvg9ywna8fhb9hnx97qh5inglj3l0pcwkgwcvm27mfpcqa";
+ rev = "77357335a3a88a4b93f91a46ab939a1a9b192977";
fetchSubmodules = true;
};
isLibrary = true;
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