summary refs log tree commit diff
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2014-02-08 21:22:50 +0100
committerDomen Kožar <domen@dev.si>2014-02-08 21:22:50 +0100
commit9c95b1151a27f2c70a51782918a41db7a69673c5 (patch)
tree8051dd8f87a5f4d7ce09357855fbe865c7260b75
parent84a7a09bc8c0bd1b53ea5f56ae6426e3a2e9bb21 (diff)
parent4191ee53b972b7c01d365571da4cfda606a95a7c (diff)
downloadnixlib-9c95b1151a27f2c70a51782918a41db7a69673c5.tar
nixlib-9c95b1151a27f2c70a51782918a41db7a69673c5.tar.gz
nixlib-9c95b1151a27f2c70a51782918a41db7a69673c5.tar.bz2
nixlib-9c95b1151a27f2c70a51782918a41db7a69673c5.tar.lz
nixlib-9c95b1151a27f2c70a51782918a41db7a69673c5.tar.xz
nixlib-9c95b1151a27f2c70a51782918a41db7a69673c5.tar.zst
nixlib-9c95b1151a27f2c70a51782918a41db7a69673c5.zip
Merge pull request #1705 from wkennington/master.mumble
Upgrade murmur + mumble to 1.2.5
-rw-r--r--pkgs/applications/networking/mumble/default.nix4
-rw-r--r--pkgs/applications/networking/mumble/murmur.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 43fbe952b182..9d2050d10fed 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -15,11 +15,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "mumble-" + version;
-  version = "1.2.4";
+  version = "1.2.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/mumble/${name}.tar.gz";
-    sha256 = "16wwj6gwcnyjlnzh7wk0l255ldxmbwx0wi652sdp20lsv61q7kx1";
+    sha256 = "1bsgains6xgpgpd1b5bq682z0kswp5fcjh2cir4c4qkndya5clci";
   };
 
   patches = optional jackSupport ./mumble-jack-support.patch;
diff --git a/pkgs/applications/networking/mumble/murmur.nix b/pkgs/applications/networking/mumble/murmur.nix
index 4b074b0708e0..b886896c071f 100644
--- a/pkgs/applications/networking/mumble/murmur.nix
+++ b/pkgs/applications/networking/mumble/murmur.nix
@@ -12,11 +12,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "murmur-" + version;
-  version = "1.2.4";
+  version = "1.2.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/mumble/mumble-${version}.tar.gz";
-    sha256 = "16wwj6gwcnyjlnzh7wk0l255ldxmbwx0wi652sdp20lsv61q7kx1";
+    sha256 = "1bsgains6xgpgpd1b5bq682z0kswp5fcjh2cir4c4qkndya5clci";
   };
 
   patchPhase = optional iceSupport ''