Merge master into staging

2019-07-25 09:23:21 +00:00
parent aabb651b23 b5d1d50aa9
commit 32fbbc6f9b
193 changed files with 4440 additions and 1950 deletions
@@ -3,12 +3,12 @@
 , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:

 let
-  version = "5.1.0";
+  version = "5.2.0";
 in stdenv.mkDerivation rec {
  name = "franz-${version}";
  src = fetchurl {
    url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb";
-    sha256 = "a474d2e9c6fb99abfc4c7e9290a0e52eef62233fa25c962afdde75fe151277d0";
+    sha256 = "1wlfd1ja38vbjy8y5pg95cpvf5ixkkq53m7v3c24q473jax4ynvg";
  };

  # don't remove runtime deps