ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11063 from offlinehacker/pkgs/docker/update_1.9.0

Browse Source 
docker: 1.8.1 -> 1.9.0
This commit is contained in:
Jaka Hudoklin 2015-11-18 22:26:17 +01:00
commit 7f45af89f7
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,13 +10,13 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "docker-${version}"; name = "docker-${version}";
version = "1.8.1"; version = "1.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "docker"; owner = "docker";
repo = "docker"; repo = "docker";
rev = "v${version}"; rev = "v${version}";
sha256 = "0nwd5wsw9f50jh4s5c5sfd6hnyh3g2kmxcrid36y1phabh30yrcz"; sha256 = "1a1ss210i712fs9mp5hcljb8bdx93lss91sxj9zay0vrmdb84zn2";
}; };
buildInputs = [ buildInputs = [
@ -26,15 +26,10 @@ stdenv.mkDerivation rec {
dontStrip = true; dontStrip = true;
preConfigure = ''
mv vendor/src/github.com/opencontainers/runc/libcontainer/seccomp/{jump_amd64.go,jump_linux.go}
sed -i 's/,amd64//' vendor/src/github.com/opencontainers/runc/libcontainer/seccomp/jump_linux.go
'';
buildPhase = '' buildPhase = ''
patchShebangs . patchShebangs .
export AUTO_GOPATH=1 export AUTO_GOPATH=1
export DOCKER_GITCOMMIT="786b29d4" export DOCKER_GITCOMMIT="76d6bc9a"
./hack/make.sh dynbinary ./hack/make.sh dynbinary
''; '';