summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
Diffstat (limited to 'krebs')
-rw-r--r--krebs/2configs/news.nix1
-rw-r--r--krebs/3modules/git.nix11
-rw-r--r--krebs/5pkgs/default.nix9
-rw-r--r--krebs/5pkgs/simple/Reaktor/plugins.nix3
-rw-r--r--krebs/5pkgs/simple/git-preview/default.nix25
5 files changed, 35 insertions, 14 deletions
diff --git a/krebs/2configs/news.nix b/krebs/2configs/news.nix
index 56395c166..2628c7986 100644
--- a/krebs/2configs/news.nix
+++ b/krebs/2configs/news.nix
@@ -16,6 +16,7 @@
vimperator|https://sites.google.com/a/vimperator.org/www/blog/posts.xml|#news
weechat|http://dev.weechat.org/feed/atom|#news
xkcd|https://xkcd.com/rss.xml|#news
+ painload|https://github.com/krebscode/painload/commits/master.atom|#news
'';
};
}
diff --git a/krebs/3modules/git.nix b/krebs/3modules/git.nix
index 610c20bb4..ba0924681 100644
--- a/krebs/3modules/git.nix
+++ b/krebs/3modules/git.nix
@@ -420,7 +420,16 @@ let
];
locations."/".extraConfig = ''
include ${pkgs.nginx}/conf/fastcgi_params;
- fastcgi_param SCRIPT_FILENAME ${pkgs.cgit}/cgit/cgit.cgi;
+ fastcgi_param SCRIPT_FILENAME ${pkgs.writeDash "cgit-wrapper" ''
+ set -efu
+ exec 3>&1
+ ${pkgs.cgit}/cgit/cgit.cgi "$@" 2>&1 >&3 3>&- \
+ | ${pkgs.gnused}/bin/sed \
+ '
+ \|^${pkgs.cgit}/cgit/cgit.cgi: Relink |d
+ '
+ exec 3>&-
+ ''};
fastcgi_param PATH_INFO $uri;
fastcgi_param QUERY_STRING $args;
fastcgi_param HTTP_HOST $server_name;
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index af4cbb3ba..84c00e82d 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -13,6 +13,15 @@ foldl' mergeAttrs {}
//
{
+ # https://github.com/NixOS/nixpkgs/pull/30065
+ brscan4 = overrideDerivation super.brscan4 (original: rec {
+ name = "brscan4-0.4.4-4";
+ src = super.fetchurl {
+ url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb";
+ sha256 = "0xy5px96y1saq9l80vwvfn6anr2q42qlxdhm6ci2a0diwib5q9fd";
+ };
+ });
+
ReaktorPlugins = self.callPackage ./simple/Reaktor/plugins.nix {};
# https://github.com/proot-me/PRoot/issues/106
diff --git a/krebs/5pkgs/simple/Reaktor/plugins.nix b/krebs/5pkgs/simple/Reaktor/plugins.nix
index c611d7471..518e80d0e 100644
--- a/krebs/5pkgs/simple/Reaktor/plugins.nix
+++ b/krebs/5pkgs/simple/Reaktor/plugins.nix
@@ -144,7 +144,8 @@ rec {
'';
};
wiki-todo-show = buildSimpleReaktorPlugin "wiki-todo" {
- script = pkgs.writeDash "wiki-todo-add" ''
+ pattern = "^wiki-show$";
+ script = pkgs.writeDash "wiki-show" ''
${pkgs.coreutils}/bin/cat wiki-todo
'';
};
diff --git a/krebs/5pkgs/simple/git-preview/default.nix b/krebs/5pkgs/simple/git-preview/default.nix
index f20f2a636..77826f34b 100644
--- a/krebs/5pkgs/simple/git-preview/default.nix
+++ b/krebs/5pkgs/simple/git-preview/default.nix
@@ -1,15 +1,16 @@
-{ coreutils, git, stdenv, writeDashBin }:
+{ coreutils, git, writeDashBin }:
writeDashBin "git-preview" ''
- PATH=${stdenv.lib.makeBinPath [
- coreutils
- git
- ]}''${PATH+:$PATH}
- hashes=$(git log --format=%h "..$1")
- end=$(echo "$hashes" | head -1)
- start=$(echo "$hashes" | tail -1)
- # exit if no diff was found
- test -z "$start" && exit 0
- shift
- git diff "$start^..$end" "$@"
+ set -efu
+ head_commit=$(${git}/bin/git log -1 --format=%H)
+ merge_commit=$1; shift
+ merge_message='Merge for git-preview'
+ preview_dir=$(${coreutils}/bin/mktemp --tmpdir -d git-preview.XXXXXXXX)
+ preview_name=$(${coreutils}/bin/basename "$preview_dir")
+ ${git}/bin/git worktree add --detach -f "$preview_dir" 2>/dev/null
+ ${git}/bin/git -C "$preview_dir" checkout -q "$head_commit"
+ ${git}/bin/git -C "$preview_dir" merge -qm "$merge_message" "$merge_commit"
+ ${git}/bin/git -C "$preview_dir" diff "$head_commit.." "$@"
+ ${coreutils}/bin/rm -fR "$preview_dir"
+ ${coreutils}/bin/rm -R .git/worktrees/"$preview_name"
''