diff options
author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2014-08-24 17:29:15 +0200 |
---|---|---|
committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2014-08-24 17:30:50 +0200 |
commit | 88391a5c65c15ecb83bf4a1bd5532cc956f96b5a (patch) | |
tree | e4254451b3078311a8de4911be3973801435e442 /pkgs/applications | |
parent | aee5d6ac3bdbc6b1c11b6726bbf11cad7214aabb (diff) | |
download | nixlib-88391a5c65c15ecb83bf4a1bd5532cc956f96b5a.tar nixlib-88391a5c65c15ecb83bf4a1bd5532cc956f96b5a.tar.gz nixlib-88391a5c65c15ecb83bf4a1bd5532cc956f96b5a.tar.bz2 nixlib-88391a5c65c15ecb83bf4a1bd5532cc956f96b5a.tar.lz nixlib-88391a5c65c15ecb83bf4a1bd5532cc956f96b5a.tar.xz nixlib-88391a5c65c15ecb83bf4a1bd5532cc956f96b5a.tar.zst nixlib-88391a5c65c15ecb83bf4a1bd5532cc956f96b5a.zip |
docker: update to 1.2.0
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 4571e979c6c7..f4d329221ff3 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -3,11 +3,11 @@ btrfsProgs, iptables, bash, e2fsprogs}: stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz"; - sha256 = "1pa6k3gx940ap3r96xdry6apzkm0ymqra92b2mrp25b25264cqcy"; + sha256 = "1nk74p9k17bllgw4992ixx7z3w87icp2wabbpbgfyi20k2q9mayp"; }; buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables e2fsprogs]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildPhase = '' patchShebangs ./hack export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="d84a070" + export DOCKER_GITCOMMIT="fa7b24f" ./hack/make.sh dynbinary ''; |