diff options
author | Vincent Demeester <vincent@sbr.pm> | 2017-01-17 15:49:32 +0100 |
---|---|---|
committer | Vincent Demeester <vincent@sbr.pm> | 2017-01-18 21:33:37 +0100 |
commit | 74d4d3e4f9bec56e20bb0adcb6dd8df6c4d14247 (patch) | |
tree | 29a612d555493227e7aab5788801430bae3bae31 /pkgs/applications/virtualization/tini | |
parent | e9109b1b979d8ce9385431b38d0f2eda693cbaf3 (diff) |
docker: 1.12.6 -> 1.13.0
- Update docker version to 1.13.0. - Introduce now docker-proxy package (from libnetmork). - Use overrideDerivation to set the correct version for docker. - Update tini to make sure we can build it static. Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat (limited to 'pkgs/applications/virtualization/tini')
-rw-r--r-- | pkgs/applications/virtualization/tini/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index 535ca551785fa..2a7b4810a24f9 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchurl, cmake }: +{ stdenv, fetchFromGitHub, cmake, glibc }: stdenv.mkDerivation rec { - version = "0.8.3"; + version = "0.13.1"; name = "tini-${version}"; - src = fetchurl { - url = "https://github.com/krallin/tini/archive/v0.8.3.tar.gz"; - sha256 ="1w7rj4crrcyv25idmh4asbp2sxzwyihy5mbpw384bzxjzaxn9xpa"; + src = fetchFromGitHub { + owner = "krallin"; + repo = "tini"; + rev = "v${version}"; + sha256 ="1g4n8v5d197zcb41fcpbhip2x342383zw1d2zkv57w73vkqgv6z6"; }; patchPhase = "sed -i /tini-static/d CMakeLists.txt"; NIX_CFLAGS_COMPILE = [ "-DPR_SET_CHILD_SUBREAPER=36" "-DPR_GET_CHILD_SUBREAPER=37" ]; - buildInputs = [ cmake ]; + buildInputs = [ cmake glibc glibc.static ]; meta = with stdenv.lib; { description = "A tiny but valid init for containers"; homepage = https://github.com/krallin/tini; |