From debc5fae3b06ef915db9465db4599d4821f658fc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sun, 9 Jun 2019 12:37:31 +0200
Subject: [PATCH] Add s6 tools

---
 overlays/default.nix               |  1 +
 overlays/environments/immae-eu.nix |  4 ++
 overlays/s6/default.nix            | 73 ++++++++++++++++++++++++++++++
 3 files changed, 78 insertions(+)
 create mode 100644 overlays/s6/default.nix

diff --git a/overlays/default.nix b/overlays/default.nix
index 42c0386a..8445f27c 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -18,6 +18,7 @@
   pelican = import ./pelican;
   postgresql = import ./databases/postgresql;
   profanity = import ./profanity;
+  s6 = import ./s6;
   sc-im = import ./sc-im;
   shaarli = import ./shaarli;
   slrn = import ./slrn;
diff --git a/overlays/environments/immae-eu.nix b/overlays/environments/immae-eu.nix
index 9f044d5e..b38c9e13 100644
--- a/overlays/environments/immae-eu.nix
+++ b/overlays/environments/immae-eu.nix
@@ -102,6 +102,10 @@ let
     # video/music
     youtube-dl ncmpc ncmpcpp ffmpeg
 
+    # s6 tools (part of skawarePackages)
+    skalibs execline s6 s6-dns s6-linux-utils s6-networking
+    s6-portable-utils
+
     # other tools
     pgloader s3cmd lftp jq cpulimit libxslt
   ];
diff --git a/overlays/s6/default.nix b/overlays/s6/default.nix
new file mode 100644
index 00000000..ddf0a239
--- /dev/null
+++ b/overlays/s6/default.nix
@@ -0,0 +1,73 @@
+self: super: {
+  skawarePackages = super.skawarePackages // (with super.skawarePackages; {
+    skalibs = skalibs.overrideAttrs(old: rec {
+      pname = "skalibs";
+      name = "${pname}-${version}";
+      version = "2.8.1.0";
+      src = self.fetchurl {
+        url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz";
+        sha256 = "1fk6n402ywn4kpy6ng7sfnnqcg0mp6wq2hrv8sv3kxd0nh3na723";
+      };
+    });
+
+    execline = execline.overrideAttrs(old: rec {
+      pname = "execline";
+      name = "${pname}-${version}";
+      version = "2.5.1.0";
+      src = self.fetchurl {
+        url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz";
+        sha256 = "0xr6yb50wm6amj1wc7jmxyv7hvlx2ypbnww1vc288j275625d9xi";
+      };
+    });
+
+    s6 = s6.overrideAttrs(old: rec {
+      pname = "s6";
+      name = "${pname}-${version}";
+      version = "2.8.0.1";
+      src = self.fetchurl {
+        url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz";
+        sha256 = "1n1i3jm3kp9ii54cxj1sgh89m6nyna7vhy8714ma6py1frdqzq6v";
+      };
+    });
+
+    s6-dns = s6-dns.overrideAttrs(old: rec {
+      pname = "s6-dns";
+      name = "${pname}-${version}";
+      version = "2.3.0.2";
+      src = self.fetchurl {
+        url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz";
+        sha256 = "1y9bhvx8bqsb2xq5lmlfnc1hw2b3jyqg11i9r4lj0n6vvaqwh1j8";
+      };
+    });
+
+    s6-linux-utils = s6-linux-utils.overrideAttrs(old: rec {
+      pname = "s6-linux-utils";
+      name = "${pname}-${version}";
+      version = "2.5.0.1";
+      src = self.fetchurl {
+        url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz";
+        sha256 = "0bpcaah3rbz4i013bkarr7wxmfvisjyxg0z78xg5zfbgajpgjxx1";
+      };
+    });
+
+    s6-networking = s6-networking.overrideAttrs(old: rec {
+      pname = "s6-networking";
+      name = "${pname}-${version}";
+      version = "2.3.0.4";
+      src = self.fetchurl {
+        url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz";
+        sha256 = "00kqp0mcp8c7f0z5s4399rd1haxasxkqgd6ds0j0607hvi56mqqa";
+      };
+    });
+
+    s6-portable-utils = s6-portable-utils.overrideAttrs(old: rec {
+      pname = "s6-portable-utils";
+      name = "${pname}-${version}";
+      version = "2.2.1.3";
+      src = self.fetchurl {
+        url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz";
+        sha256 = "1ibjns1slyg1p7jl9irzlrjz8b01f506iw87g3s7db5arhf17vv2";
+      };
+    });
+  });
+}
-- 
2.41.0