diff options
| author | Peter Simons <simons@cryp.to> | 2016-04-01 17:59:14 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2016-04-01 17:59:14 +0200 |
| commit | 90d0b082374023c98cefba137efe7e232846d24d (patch) | |
| tree | 9558b547b27a6e2ec913fc48bba3f669edbcc7c7 /pkgs/tools/system | |
| parent | 0805920132e7c7c4fba3f168296481f6a71b4fe6 (diff) | |
| parent | fc1f5d2cf1a4febaa7843284554fd7397c8988bc (diff) | |
| download | nixlib-90d0b082374023c98cefba137efe7e232846d24d.tar nixlib-90d0b082374023c98cefba137efe7e232846d24d.tar.gz nixlib-90d0b082374023c98cefba137efe7e232846d24d.tar.bz2 nixlib-90d0b082374023c98cefba137efe7e232846d24d.tar.lz nixlib-90d0b082374023c98cefba137efe7e232846d24d.tar.xz nixlib-90d0b082374023c98cefba137efe7e232846d24d.tar.zst nixlib-90d0b082374023c98cefba137efe7e232846d24d.zip | |
Merge pull request #14371 from pmahoney/skarnet
Update skarnet.org packages
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/s6-rc/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/system/s6/default.nix | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index a3b244d875b6..35763e8212e3 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -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/; diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index 5e29c20339cf..e1e30de5799f 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -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" \ |