From 1459600c36bc4e85e5a43bc1f9b25b8c92717e0a Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Thu, 15 Jan 2015 16:11:58 -0600
Subject: [PATCH] s6-networking: update to 2.0.1.0

---
 pkgs/tools/networking/s6-networking/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index 09d9e722245b..e8857e35e673 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -1,30 +1,36 @@
-{ stdenv, execline, fetchurl, s6Dns, skalibs }:
+{ stdenv, execline, fetchgit, s6, s6Dns, skalibs }:
 
 let
 
-  version = "2.0.0.0";
+  version = "2.0.1.0";
 
 in stdenv.mkDerivation rec {
 
   name = "s6-networking-${version}";
 
-  src = fetchurl {
-    url = "http://www.skarnet.org/software/s6-networking/${name}.tar.gz";
-    sha256 = "0k2i0g5lsvh1gz90ixwdip1pngj9vd45d4fpmdg075vd8zhh7j37";
+  src = fetchgit {
+    url = "git://git.skarnet.org/s6-networking";
+    rev = "refs/tags/v${version}";
+    sha256 = "1q094x8x99cy0kkq74kfw1rd9kmp6ynpz9ahx0lviz05n9paq7ya";
   };
 
   dontDisableStatic = true;
 
+  enableParallelBuilding = true;
+
   configureFlags = [
     "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
     "--with-include=${skalibs}/include"
     "--with-include=${execline}/include"
+    "--with-include=${s6}/include"
     "--with-include=${s6Dns}/include"
     "--with-lib=${skalibs}/lib"
     "--with-lib=${execline}/lib"
+    "--with-lib=${s6}/lib"
     "--with-lib=${s6Dns}/lib"
     "--with-dynlib=${skalibs}/lib"
     "--with-dynlib=${execline}/lib"
+    "--with-dynlib=${s6}/lib"
     "--with-dynlib=${s6Dns}/lib"
   ];