Merge pull request #10945 from datakurre/datakurre-tini

tini: init at 0.8.3
This commit is contained in:
Arseniy Seroka 2015-11-11 00:33:59 +03:00
commit 4b22a42a2f
2 changed files with 26 additions and 0 deletions

View File

@ -0,0 +1,24 @@
{ stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec {
version = "0.8.3";
name = "tini-${version}";
src = fetchurl {
url = "https://github.com/krallin/tini/archive/v0.8.3.tar.gz";
sha256 ="1w7rj4crrcyv25idmh4asbp2sxzwyihy5mbpw384bzxjzaxn9xpa";
};
NIX_CFLAGS_COMPILE = [
"-DPR_SET_CHILD_SUBREAPER=36"
"-DPR_GET_CHILD_SUBREAPER=37"
];
buildInputs = [ cmake ];
postInstall = ''
rm $out/bin/tini-static
'';
meta = with stdenv.lib; {
description = "A tiny but valid init for containers";
homepage = https://github.com/krallin/tini;
license = licenses.mit;
platforms = platforms.linux;
};
}

View File

@ -14696,6 +14696,8 @@ let
hologram = goPackages.hologram.bin // { outputs = [ "bin" ]; };
tini = callPackage ../applications/virtualization/tini {};
isabelle = callPackage ../applications/science/logic/isabelle {
inherit (pkgs.emacs24Packages) proofgeneral;
java = if stdenv.isLinux then jre else jdk;