From c6ba04ee4f3c78577167d605d74528168962003f Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Thu, 24 Sep 2015 20:15:36 -0500
Subject: [PATCH 1/2] s6-rc: new derivation

---
 pkgs/tools/system/s6-rc/default.nix | 42 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/tools/system/s6-rc/default.nix

diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix
new file mode 100644
index 00000000000..a3b244d875b
--- /dev/null
+++ b/pkgs/tools/system/s6-rc/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, execline, fetchgit, skalibs, s6 }:
+
+let
+
+  version = "0.0.1.0";
+
+in stdenv.mkDerivation rec {
+
+  name = "s6-rc-${version}";
+
+  src = fetchgit {
+    url = "git://git.skarnet.org/s6-rc";
+    rev = "refs/tags/v${version}";
+    sha256 = "02ppsda8pg7mph3r7lrh7dhi6ip99bgghsl3lf902cg9i4n50q6q";
+  };
+
+  dontDisableStatic = true;
+
+  enableParallelBuilding = true;
+
+  configureFlags = [
+    "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
+    "--with-include=${skalibs}/include"
+    "--with-include=${execline}/include"
+    "--with-include=${s6}/include"
+    "--with-lib=${skalibs}/lib"
+    "--with-lib=${execline}/lib"
+    "--with-lib=${s6}/lib/s6"
+    "--with-dynlib=${skalibs}/lib"
+    "--with-dynlib=${execline}/lib"
+    "--with-dynlib=${s6}/lib"
+  ] ++ [ (if stdenv.isDarwin then "--disable-shared" else "--enable-shared") ];
+
+  meta = {
+    homepage = http://skarnet.org/software/s6-rc/;
+    description = "a service manager for s6-based systems";
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.isc;
+    maintainers = with stdenv.lib.maintainers; [ pmahoney ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d63c5d67a8d..3abd95b2930 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9146,6 +9146,8 @@ let
 
   s6 = callPackage ../servers/s6 { };
 
+  s6-rc = callPackage ../tools/system/s6-rc { };
+
   spamassassin = callPackage ../servers/mail/spamassassin {
     inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile
       HTTPDate MailDKIM LWP IOSocketSSL;

From d4e0b35f188430ea90fbe08fc5d171b29baa7f18 Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Thu, 24 Sep 2015 20:18:03 -0500
Subject: [PATCH 2/2] s6: move to tools/system

Matches runit, a similar process supervisor.
---
 pkgs/{servers => tools/system}/s6/default.nix | 0
 pkgs/top-level/all-packages.nix               | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{servers => tools/system}/s6/default.nix (100%)

diff --git a/pkgs/servers/s6/default.nix b/pkgs/tools/system/s6/default.nix
similarity index 100%
rename from pkgs/servers/s6/default.nix
rename to pkgs/tools/system/s6/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3abd95b2930..5376370a84d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9144,7 +9144,7 @@ let
 
   ripple-rest = callPackage ../servers/rippled/ripple-rest.nix { };
 
-  s6 = callPackage ../servers/s6 { };
+  s6 = callPackage ../tools/system/s6 { };
 
   s6-rc = callPackage ../tools/system/s6-rc { };