4 files changed, 22 insertions, 31 deletions
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 358a0bb12288..611d77eb2150 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchurl, pkgconfig
 , avahi, boost, libopus, libsndfile, protobuf, qt4, speex
-, jackSupport ? false, jack2 ? null
+, jackSupport ? false, libjack2 ? null
 , speechdSupport ? false, speechd ? null
-, pulseSupport ? false, pulseaudio ? null
+, pulseSupport ? false, libpulseaudio ? null
 }:
 
-assert jackSupport -> jack2 != null;
+assert jackSupport -> libjack2 != null;
 assert speechdSupport -> speechd != null;
-assert pulseSupport -> pulseaudio != null;
+assert pulseSupport -> libpulseaudio != null;
 
 let
   optional = stdenv.lib.optional;
   optionalString = stdenv.lib.optionalString;
 in
 stdenv.mkDerivation rec {
-  name = "mumble-" + version;
+  name = "mumble-${version}";
   version = "1.2.8";
 
   src = fetchurl {
@@ -44,9 +44,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [ avahi boost libopus libsndfile protobuf qt4 speex ]
-    ++ optional jackSupport jack2
+    ++ optional jackSupport libjack2
     ++ optional speechdSupport speechd
-    ++ optional pulseSupport pulseaudio;
+    ++ optional pulseSupport libpulseaudio;
 
   installPhase = ''
     mkdir -p $out
diff --git a/pkgs/applications/networking/mumble/murmur.nix b/pkgs/applications/networking/mumble/murmur.nix
index 1c06392f60b2..cb10fca6cd90 100644
--- a/pkgs/applications/networking/mumble/murmur.nix
+++ b/pkgs/applications/networking/mumble/murmur.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, boost, protobuf
+{ stdenv, qt4, boost, protobuf, mumble
 , avahi, libcap, pkgconfig
 , iceSupport ? false
 , zeroc_ice ? null
@@ -11,13 +11,9 @@ let
   optionalString = stdenv.lib.optionalString;
 in
 stdenv.mkDerivation rec {
-  name = "murmur-" + version;
-  version = "1.2.8";
+  name = "murmur-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/mumble/mumble-${version}.tar.gz";
-    sha256 = "0ng1xd7i0951kqnd9visf84y2dcwia79a1brjwfvr1wnykgw6bsc";
-  };
+  inherit (mumble) version src;
 
   patchPhase = optional iceSupport ''
     sed -i 's,/usr/share/Ice/,${zeroc_ice}/,g' src/murmur/murmur.pro
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index c456c9aa9f22..240973044d1e 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -3,11 +3,11 @@ btrfsProgs, iptables, bash, e2fsprogs, xz}:
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchurl {
     url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz";
-    sha256 = "0j1wlh0jj84ly3iykp2iqvm01g5il5v56fvlrfvx6qsslyrs35yg";
+    sha256 = "03nzhikxp60falshzyk6ip8g9fhrczhvnvgmzqr8bny6w8x1v84b";
   };
 
   buildInputs = [ makeWrapper go sqlite lxc iproute bridge-utils devicemapper btrfsProgs iptables e2fsprogs ];
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     patchShebangs ./project
     export AUTO_GOPATH=1
-    export DOCKER_GITCOMMIT="c78088f"
-    ./project/make.sh dynbinary
+    export DOCKER_GITCOMMIT="03nzhikx"
+    ./hack/make.sh dynbinary
   '';
 
   installPhase = ''
diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix
index af368d0a0425..f9165e0bbd48 100644
--- a/pkgs/applications/window-managers/sxhkd/default.nix
+++ b/pkgs/applications/window-managers/sxhkd/default.nix
@@ -1,26 +1,21 @@
 { stdenv, fetchurl, asciidoc, libxcb, xcbutil, xcbutilkeysyms, xcbutilwm }:
 
 stdenv.mkDerivation rec {
-  name = "sxhkd-0.5.4";
- 
+  name = "sxhkd-${version}";
+  version = "0.5.5";
+
   src = fetchurl {
-    url = "https://github.com/baskerville/sxhkd/archive/0.5.4.tar.gz";
-    sha256 = "de95f97155319ded41ece9403ac9e9f18bfdd914a09f553ab09b331bbfe5d332";
+    url = "https://github.com/baskerville/sxhkd/archive/${version}.tar.gz";
+    sha256 = "04s3y2bq9502gw72jj3y2zsh96yj3qg2av3zsa8ahd2farvrysg6";
   };
-  
-  buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ];
 
-  buildPhase = ''
-     make PREFIX=$out
-  '';
+  buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ];
 
-  installPhase = ''
-     make PREFIX=$out install
-  '';
+  makeFlags = ''PREFIX=$(out)'';
 
   meta = {
     description = "Simple X hotkey daemon";
-    homepage = "http://github.com/baskerville/sxhkd";
+    homepage = http://github.com/baskerville/sxhkd/;
     license = stdenv.lib.licenses.bsd2;
     platforms = stdenv.lib.platforms.linux;
   };