From c79e22edbfc42f4983d2bc1da7a4611d857b1296 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 16 Nov 2015 15:55:38 +0100 Subject: [PATCH] docker: 1.8.1 -> 1.9.0 --- pkgs/applications/virtualization/docker/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 2363ccd910b1..841f82adf0e1 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -5,28 +5,23 @@ btrfsProgs, iptables, bash, e2fsprogs, xz, utillinux}: stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "docker"; repo = "docker"; rev = "v${version}"; - sha256 = "0nwd5wsw9f50jh4s5c5sfd6hnyh3g2kmxcrid36y1phabh30yrcz"; + sha256 = "1a1ss210i712fs9mp5hcljb8bdx93lss91sxj9zay0vrmdb84zn2"; }; buildInputs = [ makeWrapper go sqlite lxc iproute bridge-utils devicemapper btrfsProgs iptables e2fsprogs ]; 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 = '' patchShebangs . export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="786b29d4" + export DOCKER_GITCOMMIT="76d6bc9a" ./hack/make.sh dynbinary '';