From eb29b006213b752c5a5ca312f709fc62f600f307 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 13 Jan 2018 03:07:26 +0800
Subject: mumble_git: 2017-05-25 -> 2018-01-12

---
 pkgs/applications/networking/mumble/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                 | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 283307fc9de5..dd4491be3410 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -119,14 +119,14 @@ let
   };
 
   gitSource = rec {
-    version = "2017-05-25";
+    version = "2018-01-12";
     qtVersion = 5;
 
     # Needs submodules
     src = fetchgit {
       url = "https://github.com/mumble-voip/mumble";
-      rev = "3754898ac94ed3f1e86408114917d1b4c06f17b3";
-      sha256 = "1qh49x3y7m0c0h0gcs6amkf8nb75p6g611zwn19mbplwmi7h9y8f";
+      rev = "e348e47f4af68eaa8e0f87d1d9fc28c5583e421e";
+      sha256 = "12z41qfaq6w3i4wcw8pvyb8wwwa8gs3ar5zx6aqx6yssc6513lr3";
     };
   };
 in {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04be1c44978c..9444a191fc8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16132,7 +16132,6 @@ with pkgs;
       avahi = avahi.override {
         withLibdnssdCompat = true;
       };
-      qt5 = qt56; # Mumble doesn't work with Qt > 5.5
       jackSupport = config.mumble.jackSupport or false;
       speechdSupport = config.mumble.speechdSupport or false;
       pulseSupport = config.pulseaudio or false;
@@ -16143,7 +16142,6 @@ with pkgs;
       avahi = avahi.override {
         withLibdnssdCompat = true;
       };
-      qt5 = qt56; # Mumble doesn't work with Qt > 5.5
       jackSupport = config.mumble.jackSupport or false;
       speechdSupport = config.mumble.speechdSupport or false;
       pulseSupport = config.pulseaudio or false;
-- 
cgit 1.4.1