From 529f5b8bfcca927c62137d1bc95655db1da2035a Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Wed, 23 Oct 2019 21:58:47 +0100
Subject: [PATCH 1/4] franz: 5.3.3 -> 5.4.0

---
 .../networking/instant-messengers/franz/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index 46a27737d23..043a1a9610e 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -3,13 +3,13 @@
 , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
 
 let
-  version = "5.3.3";
+  version = "5.4.0";
 in stdenv.mkDerivation {
   pname = "franz";
   inherit version;
   src = fetchurl {
     url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb";
-    sha256 = "03ii1gpc2wijy917565pqig1ihd4zhal12i2f5k916i7fp8912m1";
+    sha256 = "0jqxanihklb88igxs7ilnjlavag64mdj84zrhpr22km3m3c0agq5";
   };
 
   # don't remove runtime deps

From c1fc68a41c978e5f69398e826d28c3725c906dc1 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Wed, 23 Oct 2019 21:59:15 +0100
Subject: [PATCH 2/4] franz: add davidtwco as maintainer

---
 .../networking/instant-messengers/franz/default.nix             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index 043a1a9610e..b5a95af68d5 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -50,7 +50,7 @@ in stdenv.mkDerivation {
     description = "A free messaging app that combines chat & messaging services into one application";
     homepage = https://meetfranz.com;
     license = licenses.free;
-    maintainers = [ maintainers.gnidorah ];
+    maintainers = with maintainers; [ davidtwco gnidorah ];
     platforms = ["x86_64-linux"];
     hydraPlatforms = [];
   };

From 04d4ea0e24accf4a4d26039775c6777c6c91bec9 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Thu, 24 Oct 2019 13:31:24 +0100
Subject: [PATCH 3/4] franz: remove gnidorah as maintainer

For context, see:
https://github.com/NixOS/nixpkgs/pull/71862#issuecomment-545753201

Signed-off-by: David Wood <david@davidtw.co>
---
 .../networking/instant-messengers/franz/default.nix             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index b5a95af68d5..ae1e77781c1 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -50,7 +50,7 @@ in stdenv.mkDerivation {
     description = "A free messaging app that combines chat & messaging services into one application";
     homepage = https://meetfranz.com;
     license = licenses.free;
-    maintainers = with maintainers; [ davidtwco gnidorah ];
+    maintainers = [ maintainers.davidtwco ];
     platforms = ["x86_64-linux"];
     hydraPlatforms = [];
   };

From ff545effd52f7d8bd612459a048538d73dc98339 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Thu, 31 Oct 2019 13:37:42 +0000
Subject: [PATCH 4/4] franz: 5.4.0 -> 5.4.1

---
 .../networking/instant-messengers/franz/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index ae1e77781c1..feba61c8a3b 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -3,13 +3,13 @@
 , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
 
 let
-  version = "5.4.0";
+  version = "5.4.1";
 in stdenv.mkDerivation {
   pname = "franz";
   inherit version;
   src = fetchurl {
     url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb";
-    sha256 = "0jqxanihklb88igxs7ilnjlavag64mdj84zrhpr22km3m3c0agq5";
+    sha256 = "1g1z5zjm9l081hpqslfc4h7pqh4k76ccmlz71r21204wy630mw6h";
   };
 
   # don't remove runtime deps