Merge branch 'master' into closure-size

TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
This commit is contained in:
Vladimír Čunát
2015-12-31 09:53:02 +01:00
951 changed files with 117997 additions and 19014 deletions
@@ -10,13 +10,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "docker-${version}";
version = "1.9.0";
version = "1.9.1";
src = fetchFromGitHub {
owner = "docker";
repo = "docker";
rev = "v${version}";
sha256 = "1a1ss210i712fs9mp5hcljb8bdx93lss91sxj9zay0vrmdb84zn2";
sha256 = "1mhi4y820h2wxz6hqmr95c7yvklyw578dd9c83jr463w7rq0rgr6";
};
buildInputs = [
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
buildPhase = ''
patchShebangs .
export AUTO_GOPATH=1
export DOCKER_GITCOMMIT="76d6bc9a"
export DOCKER_GITCOMMIT="a34a1d59"
./hack/make.sh dynbinary
'';