From eee1bb5ae533a18e9da04fcc03fb8c9fb9e3f85a Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 25 Apr 2015 15:46:35 +0200
Subject: [PATCH] docker: update to 1.6.0

---
 pkgs/applications/virtualization/docker/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 = ''