public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-04-03 11:01:57 +00:00
parent 5df521abda b8755a4cdf
commit 696d85a62d
99 changed files with 1762 additions and 709 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/system/s6-rc/default.nix
+5 -3
View File
@@ -2,7 +2,7 @@
let
version = "0.0.1.0";
version = "0.0.2.1";
in stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/s6-rc";
rev = "refs/tags/v${version}";
sha256 = "02ppsda8pg7mph3r7lrh7dhi6ip99bgghsl3lf902cg9i4n50q6q";
sha256 = "0x9ghi1f7zqphzlzyz67z7n7mnnyxf1hghi2wa2f8cdl70nfdi2f";
};
dontDisableStatic = true;
@@ -29,7 +29,9 @@ in stdenv.mkDerivation rec {
"--with-dynlib=${skalibs}/lib"
"--with-dynlib=${execline}/lib"
"--with-dynlib=${s6}/lib"
] ++ [ (if stdenv.isDarwin then "--disable-shared" else "--enable-shared") ];
]
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
meta = {
homepage = http://skarnet.org/software/s6-rc/;
pkgs/tools/system/s6/default.nix
+5 -3
View File
@@ -2,7 +2,7 @@
let
version = "2.2.1.0";
version = "2.2.4.3";
in stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/s6";
rev = "refs/tags/v${version}";
sha256 = "1g8gr3znxj8lyqpwrmgzh47yb64zldrvvvgpp1m4pb37k5k11bj9";
sha256 = "0j981xslcsra8filaawgwq6daqvxxjs0014lqb7dy3qf7c5pc4l8";
};
dontDisableStatic = true;
@@ -26,7 +26,9 @@ in stdenv.mkDerivation rec {
"--with-lib=${execline}/lib"
"--with-dynlib=${skalibs}/lib"
"--with-dynlib=${execline}/lib"
] ++ [ (if stdenv.isDarwin then "--disable-shared" else "--enable-shared") ];
]
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
preBuild = ''
substituteInPlace "src/daemontools-extras/s6-log.c" \