summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--overlays/default.nix1
-rw-r--r--overlays/environments/immae-eu.nix4
-rw-r--r--overlays/s6/default.nix73
3 files changed, 78 insertions, 0 deletions
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 @@
18 pelican = import ./pelican; 18 pelican = import ./pelican;
19 postgresql = import ./databases/postgresql; 19 postgresql = import ./databases/postgresql;
20 profanity = import ./profanity; 20 profanity = import ./profanity;
21 s6 = import ./s6;
21 sc-im = import ./sc-im; 22 sc-im = import ./sc-im;
22 shaarli = import ./shaarli; 23 shaarli = import ./shaarli;
23 slrn = import ./slrn; 24 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
102 # video/music 102 # video/music
103 youtube-dl ncmpc ncmpcpp ffmpeg 103 youtube-dl ncmpc ncmpcpp ffmpeg
104 104
105 # s6 tools (part of skawarePackages)
106 skalibs execline s6 s6-dns s6-linux-utils s6-networking
107 s6-portable-utils
108
105 # other tools 109 # other tools
106 pgloader s3cmd lftp jq cpulimit libxslt 110 pgloader s3cmd lftp jq cpulimit libxslt
107 ]; 111 ];
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 @@
1self: super: {
2 skawarePackages = super.skawarePackages // (with super.skawarePackages; {
3 skalibs = skalibs.overrideAttrs(old: rec {
4 pname = "skalibs";
5 name = "${pname}-${version}";
6 version = "2.8.1.0";
7 src = self.fetchurl {
8 url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz";
9 sha256 = "1fk6n402ywn4kpy6ng7sfnnqcg0mp6wq2hrv8sv3kxd0nh3na723";
10 };
11 });
12
13 execline = execline.overrideAttrs(old: rec {
14 pname = "execline";
15 name = "${pname}-${version}";
16 version = "2.5.1.0";
17 src = self.fetchurl {
18 url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz";
19 sha256 = "0xr6yb50wm6amj1wc7jmxyv7hvlx2ypbnww1vc288j275625d9xi";
20 };
21 });
22
23 s6 = s6.overrideAttrs(old: rec {
24 pname = "s6";
25 name = "${pname}-${version}";
26 version = "2.8.0.1";
27 src = self.fetchurl {
28 url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz";
29 sha256 = "1n1i3jm3kp9ii54cxj1sgh89m6nyna7vhy8714ma6py1frdqzq6v";
30 };
31 });
32
33 s6-dns = s6-dns.overrideAttrs(old: rec {
34 pname = "s6-dns";
35 name = "${pname}-${version}";
36 version = "2.3.0.2";
37 src = self.fetchurl {
38 url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz";
39 sha256 = "1y9bhvx8bqsb2xq5lmlfnc1hw2b3jyqg11i9r4lj0n6vvaqwh1j8";
40 };
41 });
42
43 s6-linux-utils = s6-linux-utils.overrideAttrs(old: rec {
44 pname = "s6-linux-utils";
45 name = "${pname}-${version}";
46 version = "2.5.0.1";
47 src = self.fetchurl {
48 url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz";
49 sha256 = "0bpcaah3rbz4i013bkarr7wxmfvisjyxg0z78xg5zfbgajpgjxx1";
50 };
51 });
52
53 s6-networking = s6-networking.overrideAttrs(old: rec {
54 pname = "s6-networking";
55 name = "${pname}-${version}";
56 version = "2.3.0.4";
57 src = self.fetchurl {
58 url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz";
59 sha256 = "00kqp0mcp8c7f0z5s4399rd1haxasxkqgd6ds0j0607hvi56mqqa";
60 };
61 });
62
63 s6-portable-utils = s6-portable-utils.overrideAttrs(old: rec {
64 pname = "s6-portable-utils";
65 name = "${pname}-${version}";
66 version = "2.2.1.3";
67 src = self.fetchurl {
68 url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz";
69 sha256 = "1ibjns1slyg1p7jl9irzlrjz8b01f506iw87g3s7db5arhf17vv2";
70 };
71 });
72 });
73}