aboutsummaryrefslogtreecommitdiff
path: root/pkgs/tools/networking/s6-networking
diff options
context:
space:
mode:
authorPatrick Mahoney <pat@polycrystal.org>2015-03-28 23:13:45 -0500
committerPatrick Mahoney <pat@polycrystal.org>2015-03-28 23:13:45 -0500
commit00b57f47c7272693a5272dd5d384ec99560d4b22 (patch)
tree2ed5f228ef4f9d8c83a11f12edb94b2344856f46 /pkgs/tools/networking/s6-networking
parent6a2ec766fc45befc8867dd09d2bbd0be53185952 (diff)
Update versions of skarnet.org packages
skalibs 2.3.2.0 execline 2.1.1.0 s6 2.1.3.0 st-portable-utils 2.0.4.0 s6-linux-utils 2.0.2.0 s6-networking 2.1.0.0 Also change path to s6 static library in s6-networking build.
Diffstat (limited to 'pkgs/tools/networking/s6-networking')
-rw-r--r--pkgs/tools/networking/s6-networking/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index e8857e35e673..d2c7ebd03456 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -2,7 +2,7 @@
let
- version = "2.0.1.0";
+ version = "2.1.0.0";
in stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/s6-networking";
rev = "refs/tags/v${version}";
- sha256 = "1q094x8x99cy0kkq74kfw1rd9kmp6ynpz9ahx0lviz05n9paq7ya";
+ sha256 = "057xwh1dpwg2dz47s0badqhi66nhxgs5ps0xwn7s6hvba0lwyy4c";
};
dontDisableStatic = true;
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
"--with-include=${s6Dns}/include"
"--with-lib=${skalibs}/lib"
"--with-lib=${execline}/lib"
- "--with-lib=${s6}/lib"
+ "--with-lib=${s6}/lib/s6"
"--with-lib=${s6Dns}/lib"
"--with-dynlib=${skalibs}/lib"
"--with-dynlib=${execline}/lib"