summaryrefslogtreecommitdiffstats
path: root/krebs/5pkgs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2021-06-09 19:30:27 +0200
committermakefu <github@syntax-fehler.de>2021-06-09 19:30:27 +0200
commit8be55929d150a6f77f6d23df6f97681380d25d45 (patch)
tree042019d7888c597e0efe1ecefa3ff9a0f97e3275 /krebs/5pkgs
parent9b3adfdaa3c968c858e6442322f6da7b14510147 (diff)
parent824a1e8d059cadf83cd70d4cc90e2b6406cb93bb (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/5pkgs')
-rw-r--r--krebs/5pkgs/haskell/flameshot-once.nix11
-rw-r--r--krebs/5pkgs/simple/flameshot-once/profile.nix4
-rw-r--r--krebs/5pkgs/simple/realwallpaper/default.nix3
3 files changed, 9 insertions, 9 deletions
diff --git a/krebs/5pkgs/haskell/flameshot-once.nix b/krebs/5pkgs/haskell/flameshot-once.nix
index 1b54f7db6..c8007ce9e 100644
--- a/krebs/5pkgs/haskell/flameshot-once.nix
+++ b/krebs/5pkgs/haskell/flameshot-once.nix
@@ -1,14 +1,13 @@
{ mkDerivation, async, base, blessings, bytestring, dbus, fetchgit
-, iso8601-time, process, random, stdenv, text, time, unagi-chan
-, unix
+, iso8601-time, lib, process, random, text, time, unagi-chan, unix
}:
mkDerivation {
pname = "flameshot-once";
- version = "1.3.0";
+ version = "1.4.0";
src = fetchgit {
url = "https://cgit.krebsco.de/flameshot-once";
- sha256 = "1jy73379srnkq79i7k3al406r0kb3pxwgg6f64i89jhzxjn7zmzl";
- rev = "81ce6b9bb68c2739ec5bda067fcfaeab931d55dd";
+ sha256 = "13szgsiwn29aixm5xvs1m7128y5km5xss0ry5ii5y068rc2vysw8";
+ rev = "4475893c2081b3d9db4b7a54d0ce38d0914a17bf";
fetchSubmodules = true;
};
isLibrary = false;
@@ -17,5 +16,5 @@ mkDerivation {
async base blessings bytestring dbus iso8601-time process random
text time unagi-chan unix
];
- license = stdenv.lib.licenses.mit;
+ license = lib.licenses.mit;
}
diff --git a/krebs/5pkgs/simple/flameshot-once/profile.nix b/krebs/5pkgs/simple/flameshot-once/profile.nix
index 5aed99597..d70e2be1a 100644
--- a/krebs/5pkgs/simple/flameshot-once/profile.nix
+++ b/krebs/5pkgs/simple/flameshot-once/profile.nix
@@ -157,7 +157,7 @@ let
"QList<${t}>${le.x4 0}${le.x4 (length xs)}${concatMapStrings le.x4 xs}";
XDG_CONFIG_HOME = pkgs.write "flameshot-config" {
- "/Dharkael/flameshot.ini".text = ''
+ "/flameshot/flameshot.ini".text = ''
[General]
buttons=@Variant(\0\0\0\x7f\0\0\0\v${toQList "int" cfg.buttons})
disabledTrayIcon=${toJSON cfg.disabledTrayIcon}
@@ -166,6 +166,8 @@ let
savePath=${toJSON cfg.savePath}
showDesktopNotification=${toJSON cfg.showDesktopNotification}
showHelp=${toJSON cfg.showHelp}
+ [Shortcuts]
+ TYPE_COPY=Return
'';
};
diff --git a/krebs/5pkgs/simple/realwallpaper/default.nix b/krebs/5pkgs/simple/realwallpaper/default.nix
index 8728c0ae7..2fbc7ff86 100644
--- a/krebs/5pkgs/simple/realwallpaper/default.nix
+++ b/krebs/5pkgs/simple/realwallpaper/default.nix
@@ -9,8 +9,7 @@ pkgs.writers.writeDashBin "generate-wallpaper" ''
gnused
file
findutils
- grib2json
- imagemagick
+ imagemagick6
inkscape
jq
nomads-cloud