From fe368cabb7d82eddd2cc0edc7fac362320ad63f7 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 6 Jun 2021 16:21:29 +0200
Subject: realwallpaper: use imagemagick6 (future lassulus has to understand 7)

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

(limited to 'krebs/5pkgs')

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
-- 
cgit v1.2.3


From 463d01ef5c58f5750922cf76da6a0b10a0a5eb04 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 8 Jun 2021 16:57:54 +0200
Subject: flameshot-once: 1.3.0 -> 1.4.0

---
 krebs/5pkgs/haskell/flameshot-once.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/haskell/flameshot-once.nix b/krebs/5pkgs/haskell/flameshot-once.nix
index 1b54f7db6..737722875 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 = "03g6sxgp6hcmbww5lzbs5llssgii1w469i5pz14x94542l06cmkq";
+    rev = "5f0ba1cf326d215bd5c50ad74c634e92c785ae46";
     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;
 }
-- 
cgit v1.2.3


From b5753d89f75fdd270c9922b3452806db200d1546 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 8 Jun 2021 16:57:54 +0200
Subject: flameshot-once: 1.3.0 -> 1.4.0

---
 krebs/5pkgs/haskell/flameshot-once.nix        | 11 +++++------
 krebs/5pkgs/simple/flameshot-once/profile.nix |  4 +++-
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'krebs/5pkgs')

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
     '';
   };
 
-- 
cgit v1.2.3