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

docker: 1.6.0 -> 1.7.1

Browse Source
This commit is contained in:
Benjamin Staffin 2015-08-03 20:16:03 -07:00
parent b0e46fc3ea
commit a5cdd98da4
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +1,15 @@
{ stdenv, fetchurl, makeWrapper, go, lxc, sqlite, iproute, bridge-utils, devicemapper, { stdenv, fetchFromGitHub, makeWrapper, go, lxc, sqlite, iproute, bridge-utils, devicemapper,
btrfsProgs, iptables, bash, e2fsprogs, xz}: btrfsProgs, iptables, bash, e2fsprogs, xz}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "docker-${version}"; name = "docker-${version}";
version = "1.6.0"; version = "1.7.1";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz"; owner = "docker";
sha256 = "03nzhikxp60falshzyk6ip8g9fhrczhvnvgmzqr8bny6w8x1v84b"; repo = "docker";
rev = "v${version}";
sha256 = "0r0j8aj1a7lbnc9piznp02h5n2gdw3v3n4q2ipmapi9ax0wj82lz";
}; };
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 +19,7 @@ stdenv.mkDerivation rec {
buildPhase = '' buildPhase = ''
patchShebangs . patchShebangs .
export AUTO_GOPATH=1 export AUTO_GOPATH=1
export DOCKER_GITCOMMIT="03nzhikx" export DOCKER_GITCOMMIT="786b29d4"
./hack/make.sh dynbinary ./hack/make.sh dynbinary
''; '';
@ -35,7 +37,7 @@ stdenv.mkDerivation rec {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.docker.io/; homepage = http://www.docker.com/;
description = "An open source project to pack, ship and run any application as a lightweight container"; description = "An open source project to pack, ship and run any application as a lightweight container";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ offline tailhook ]; maintainers = with maintainers; [ offline tailhook ];

2
pkgs/top-level/all-packages.nix
View File

@ -11002,7 +11002,7 @@ let
}; };
docker = callPackage ../applications/virtualization/docker { docker = callPackage ../applications/virtualization/docker {
go = go_1_3; go = go_1_4;
}; };
doodle = callPackage ../applications/search/doodle { }; doodle = callPackage ../applications/search/doodle { };