public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3761 from offlinehacker/pkgs/docker/update_1_2_0 

docker: update to 1.2.0
This commit is contained in:
Jaka Hudoklin 2014-08-24 17:40:46 +02:00
parent 1d67ea1ce3 88391a5c65
commit 722a99347f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/virtualization/docker/default.nix
View File

@ -3,11 +3,11 @@ btrfsProgs, iptables, bash, e2fsprogs}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "docker-${version}"; name = "docker-${version}";
version = "1.1.2"; version = "1.2.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz"; 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]; buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables e2fsprogs];
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildPhase = '' buildPhase = ''
patchShebangs ./hack patchShebangs ./hack
export AUTO_GOPATH=1 export AUTO_GOPATH=1
export DOCKER_GITCOMMIT="d84a070" export DOCKER_GITCOMMIT="fa7b24f"
./hack/make.sh dynbinary ./hack/make.sh dynbinary
''; '';