about summary refs log tree commit diff
path: root/pkgs/applications/virtualization
diff options
context:
space:
mode:
authorJaka Hudoklin <jakahudoklin@gmail.com>2015-04-25 15:46:35 +0200
committerJaka Hudoklin <jakahudoklin@gmail.com>2015-04-25 15:46:35 +0200
commiteee1bb5ae533a18e9da04fcc03fb8c9fb9e3f85a (patch)
tree2f0487af695a9e1d7582ee5e9944e1bf51b273f7 /pkgs/applications/virtualization
parent4e51a466bdfa260d15fbaafe52cdccf5280f13d1 (diff)
downloadnixlib-eee1bb5ae533a18e9da04fcc03fb8c9fb9e3f85a.tar
nixlib-eee1bb5ae533a18e9da04fcc03fb8c9fb9e3f85a.tar.gz
nixlib-eee1bb5ae533a18e9da04fcc03fb8c9fb9e3f85a.tar.bz2
nixlib-eee1bb5ae533a18e9da04fcc03fb8c9fb9e3f85a.tar.lz
nixlib-eee1bb5ae533a18e9da04fcc03fb8c9fb9e3f85a.tar.xz
nixlib-eee1bb5ae533a18e9da04fcc03fb8c9fb9e3f85a.tar.zst
nixlib-eee1bb5ae533a18e9da04fcc03fb8c9fb9e3f85a.zip
docker: update to 1.6.0
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r--pkgs/applications/virtualization/docker/default.nix8
1 files 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 = ''