summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorJaka Hudoklin <jakahudoklin@gmail.com>2015-02-28 03:54:25 +0100
committerJaka Hudoklin <jakahudoklin@gmail.com>2015-02-28 03:54:25 +0100
commitef291d2c66e22f8a47175d00f11814c0303501be (patch)
tree695927e44410663603ba4c0c3d4301c81dd211da /pkgs/applications
parentf54a63ed32c9f84a00102f718f5dae11ef2e5d74 (diff)
parent6944b2bde70609b9dbfbf8010acee3a42796ee84 (diff)
downloadnixlib-ef291d2c66e22f8a47175d00f11814c0303501be.tar
nixlib-ef291d2c66e22f8a47175d00f11814c0303501be.tar.gz
nixlib-ef291d2c66e22f8a47175d00f11814c0303501be.tar.bz2
nixlib-ef291d2c66e22f8a47175d00f11814c0303501be.tar.lz
nixlib-ef291d2c66e22f8a47175d00f11814c0303501be.tar.xz
nixlib-ef291d2c66e22f8a47175d00f11814c0303501be.tar.zst
nixlib-ef291d2c66e22f8a47175d00f11814c0303501be.zip
Merge pull request #6586 from offlinehacker/pkgs/docker/update
docker: update to 1.5.0
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/virtualization/docker/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index eaf983f7bbc1..c456c9aa9f22 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.4.1";
+  version = "1.5.0";
 
   src = fetchurl {
     url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz";
-    sha256 = "0d98c7dfzv1gj5ssbyln4pbkbml6rrmy22v5v4ricbsx9qhhwc1l";
+    sha256 = "0j1wlh0jj84ly3iykp2iqvm01g5il5v56fvlrfvx6qsslyrs35yg";
   };
 
   buildInputs = [ makeWrapper go sqlite lxc iproute bridge-utils devicemapper btrfsProgs iptables e2fsprogs ];