From 64ec34644c424ce83a4fc9ec880a4f21122fb64c Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sat, 8 Jul 2023 14:49:19 +0200
Subject: fzfmenu: use upstream writers

---
 krebs/5pkgs/simple/fzfmenu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/krebs/5pkgs/simple/fzfmenu/default.nix b/krebs/5pkgs/simple/fzfmenu/default.nix
index fe5d5e27a..eb2441330 100644
--- a/krebs/5pkgs/simple/fzfmenu/default.nix
+++ b/krebs/5pkgs/simple/fzfmenu/default.nix
@@ -39,7 +39,7 @@ let
   };
 in
 
-pkgs.writeDashBin "fzfmenu" ''
+pkgs.writers.writeDashBin "fzfmenu" ''
   set -efu
 
   # Spawn terminal if called without one, like e.g. from a window manager.
-- 
cgit v1.2.3


From e67a5c2c0d6d83609f468af6b0f2e006ef73a8f5 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sat, 8 Jul 2023 14:50:38 +0200
Subject: htgen-paste: use _override for content_type forcing

---
 krebs/5pkgs/simple/htgen-paste/src/htgen-paste | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/krebs/5pkgs/simple/htgen-paste/src/htgen-paste b/krebs/5pkgs/simple/htgen-paste/src/htgen-paste
index bc806e870..74266e53a 100644
--- a/krebs/5pkgs/simple/htgen-paste/src/htgen-paste
+++ b/krebs/5pkgs/simple/htgen-paste/src/htgen-paste
@@ -46,8 +46,8 @@ case "$Method $abs_path" in
       cp -v $content $item >&2
     fi
 
-    if test -n ${reg_content_type-}; then
-      echo -n "$req_content_type" > "$item".content_type
+    if test -n "${req_content_type_override-}"; then
+      echo -n "$req_content_type_override" > "$item".content_type
     fi
 
     base32short=$(echo $base32 | cut -b-7)
-- 
cgit v1.2.3


From d9facad144fa9e91f3bccd78f4a5abc871859a00 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sat, 8 Jul 2023 14:50:48 +0200
Subject: irc-announce: use upstream writers

---
 krebs/5pkgs/simple/irc-announce/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/krebs/5pkgs/simple/irc-announce/default.nix b/krebs/5pkgs/simple/irc-announce/default.nix
index 7b2af0307..75036d41c 100644
--- a/krebs/5pkgs/simple/irc-announce/default.nix
+++ b/krebs/5pkgs/simple/irc-announce/default.nix
@@ -1,6 +1,6 @@
 { pkgs, lib, ... }:
 
-pkgs.writeDashBin "irc-announce" ''
+pkgs.writers.writeDashBin "irc-announce" ''
   set -euf
 
   IRC_SERVER=$1
-- 
cgit v1.2.3


From de0db32fb87ad2d382f50fb04f96b4e60a8b2ebd Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sat, 8 Jul 2023 14:51:38 +0200
Subject: realwallpaper: don't pin imagemagick

---
 krebs/5pkgs/simple/realwallpaper/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/krebs/5pkgs/simple/realwallpaper/default.nix b/krebs/5pkgs/simple/realwallpaper/default.nix
index 236d75d72..544abb3a3 100644
--- a/krebs/5pkgs/simple/realwallpaper/default.nix
+++ b/krebs/5pkgs/simple/realwallpaper/default.nix
@@ -9,7 +9,7 @@ pkgs.writers.writeDashBin "generate-wallpaper" ''
     gnused
     file
     findutils
-    imagemagick6
+    imagemagick
     inkscape
     jq
     nomads-cloud
-- 
cgit v1.2.3


From 364e8970a79dc6d0a482d200efe1466db7f617fc Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sun, 23 Jul 2023 23:00:32 +0200
Subject: reaktor2-plugins: fix sed plugin

---
 krebs/5pkgs/simple/reaktor2-plugins.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/krebs/5pkgs/simple/reaktor2-plugins.nix b/krebs/5pkgs/simple/reaktor2-plugins.nix
index 651062b0a..b51b53a48 100644
--- a/krebs/5pkgs/simple/reaktor2-plugins.nix
+++ b/krebs/5pkgs/simple/reaktor2-plugins.nix
@@ -59,7 +59,7 @@ rec {
         filename = pkgs.writers.writeDash "sed-plugin" ''
           set -efu
           exec ${pkgs.python3}/bin/python \
-              ${stockholm.outPath + "/krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py"} "$@"
+            ${./Reaktor/scripts/sed-plugin.py} "$@"
         '';
       };
     };
-- 
cgit v1.2.3