mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 14:41:17 +00:00
Merge pull request #4572 from tailhook/docker1.3
docker: upgrade to 1.3.0
This commit is contained in:
commit
3f4e433ddf
|
@ -3,11 +3,11 @@ btrfsProgs, iptables, bash, e2fsprogs, xz}:
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "docker-${version}";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz";
|
||||
sha256 = "1nk74p9k17bllgw4992ixx7z3w87icp2wabbpbgfyi20k2q9mayp";
|
||||
sha256 = "09bn88i8acv7kw39js1p7mgf3sglq7d782xnafkp0i97svf0x4y9";
|
||||
};
|
||||
|
||||
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="fa7b24f"
|
||||
export DOCKER_GITCOMMIT="c78088f"
|
||||
./hack/make.sh dynbinary
|
||||
'';
|
||||
|
||||
|
|
Loading…
Reference in a new issue