summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--environments/immae-eu.nix2
-rw-r--r--overlays/bonfire/default.nix4
-rw-r--r--overlays/default.nix2
-rw-r--r--overlays/pass/default.nix2
-rw-r--r--overlays/s6/default.nix73
-rw-r--r--overlays/vdirsyncer/default.nix14
6 files changed, 21 insertions, 76 deletions
diff --git a/environments/immae-eu.nix b/environments/immae-eu.nix
index 90633491..0322b53a 100644
--- a/environments/immae-eu.nix
+++ b/environments/immae-eu.nix
@@ -90,7 +90,7 @@ let
90 mailcap 90 mailcap
91 91
92 # password management 92 # password management
93 pass apg pwgen 93 (pass.withExtensions (exts: [ exts.pass-otp ])) apg pwgen
94 94
95 # pdf 95 # pdf
96 pdftk poppler_utils 96 pdftk poppler_utils
diff --git a/overlays/bonfire/default.nix b/overlays/bonfire/default.nix
index 68bde20f..a01e6191 100644
--- a/overlays/bonfire/default.nix
+++ b/overlays/bonfire/default.nix
@@ -7,6 +7,10 @@ self: super: {
7 inherit version; 7 inherit version;
8 sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi"; 8 sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi";
9 }; 9 };
10 postPatch = ''
11 substituteInPlace click/_unicodefun.py --replace "'locale'" "'${self.locale}/bin/locale'"
12 '';
13 doCheck = false;
10 }); 14 });
11 in 15 in
12 super.bonfire.overridePythonAttrs(old: { 16 super.bonfire.overridePythonAttrs(old: {
diff --git a/overlays/default.nix b/overlays/default.nix
index b3bc8caf..0cefc17c 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -19,7 +19,6 @@
19 pelican = import ./pelican; 19 pelican = import ./pelican;
20 postfix = import ./postfix; 20 postfix = import ./postfix;
21 postgresql = import ./databases/postgresql; 21 postgresql = import ./databases/postgresql;
22 s6 = import ./s6;
23 sc-im = import ./sc-im; 22 sc-im = import ./sc-im;
24 shaarli = import ./shaarli; 23 shaarli = import ./shaarli;
25 slrn = import ./slrn; 24 slrn = import ./slrn;
@@ -30,5 +29,6 @@
30 ympd = import ./ympd; 29 ympd = import ./ympd;
31 doing = import ./doing; 30 doing = import ./doing;
32 xmr-stak = import ./xmr-stak; 31 xmr-stak = import ./xmr-stak;
32 vdirsyncer = import ./vdirsyncer;
33} 33}
34// import ./python-packages 34// import ./python-packages
diff --git a/overlays/pass/default.nix b/overlays/pass/default.nix
index df42cf19..262492f5 100644
--- a/overlays/pass/default.nix
+++ b/overlays/pass/default.nix
@@ -1,5 +1,5 @@
1self: super: { 1self: super: {
2 pass = (super.pass.withExtensions (exts: [ exts.pass-otp ])).overrideAttrs (old: 2 pass = super.pass.overrideAttrs (old:
3 self.mylibs.fetchedGit ./pass.json // { 3 self.mylibs.fetchedGit ./pass.json // {
4 patches = old.patches ++ [ ./pass-fix-pass-init.patch ]; 4 patches = old.patches ++ [ ./pass-fix-pass-init.patch ];
5 } 5 }
diff --git a/overlays/s6/default.nix b/overlays/s6/default.nix
deleted file mode 100644
index ddf0a239..00000000
--- a/overlays/s6/default.nix
+++ /dev/null
@@ -1,73 +0,0 @@
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}
diff --git a/overlays/vdirsyncer/default.nix b/overlays/vdirsyncer/default.nix
new file mode 100644
index 00000000..53248f91
--- /dev/null
+++ b/overlays/vdirsyncer/default.nix
@@ -0,0 +1,14 @@
1self: super: {
2 vdirsyncer = super.vdirsyncer.overridePythonAttrs(old: {
3 # https://github.com/NixOS/nixpkgs/pull/85809
4 postPatch = old.postPatch + ''
5 sed -i "s/invalid value for \"--verbosity\"/invalid value for \\\'--verbosity\\\'/" tests/system/cli/test_sync.py
6 '';
7 });
8 khal = super.khal.overridePythonAttrs(old: {
9 postPatch = ''
10 sed -i "s/Invalid value for \"ics\"/Invalid value for \\\'ics\\\'/" tests/cli_test.py
11 sed -i "s/Invalid value for \"\[ICS\]\"/Invalid value for \\\'[ICS]\\\'/" tests/cli_test.py
12 '';
13 });
14}