Skip to content

Commit 0d52fa5

Browse files
committed
remove scootaloo 25.11 pkgs override
but pull matrix-appservice-discord from pkgs-deprecated (25.11) to avoid the errors with the new version
1 parent 2c0ac00 commit 0d52fa5

3 files changed

Lines changed: 18 additions & 24 deletions

File tree

flake.nix

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -212,22 +212,6 @@
212212
# NOTE: all hosts will be sharing the same ocf nix modules in this
213213
# repository regardless of what pkgs or system is set to
214214
hostOverrides = {
215-
# even after adding:
216-
# nixpkgs.config.permittedInsecurePackages = [
217-
# "nodejs-20.20.2"
218-
# "nodejs-slim-20.20.2"
219-
# "nodejs-20.20.2-source"
220-
# ];
221-
#
222-
# to ./modules/matrix/discord-bridge.nix, scootaloo still fails to
223-
# build with:
224-
# "error: attribute 'nodeAppDir' missing"
225-
#
226-
# we will keep scootaloo on nixos-25.11 for now until
227-
# matrix-appservice-discord is updated to work with nixos-26.05.
228-
#
229-
# see: https://github.com/NixOS/nixpkgs/issues/515284
230-
scootaloo.nixpkgs = nixpkgs-deprecated;
231215
overheat.system = "aarch64-linux";
232216
};
233217

hosts/servers/scootaloo.nix

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@
88
{
99
imports = [ ../../hardware/virtualized.nix ];
1010

11-
# FIXME: python3.14-html5lib-1.1 and python3.14-rich-14.1.0 are broken on
12-
# 25.11 but not 26.05. matrix-appservice-discord is broken on 26.05 but not
13-
# 25.11. scootaloo needs all three of these packages, so scootaloo is on nixos
14-
# 25.11 with python 3.12.
15-
# ps dont you think that its neat that "25.11" is left aligned when i wrapped
16-
# this comment at 80 chars? :)
17-
ocf.python.package = pkgs.python312;
18-
1911
ocf.network = {
2012
enable = true;
2113
lastOctet = 29;

modules/matrix/discord-bridge.nix

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
pkgs,
33
lib,
44
config,
5+
pkgs-deprecated,
56
...
67
}:
78

@@ -19,6 +20,23 @@ in
1920
services.matrix-appservice-discord = {
2021
enable = true;
2122

23+
# even after adding:
24+
# nixpkgs.config.permittedInsecurePackages = [
25+
# "nodejs-20.20.2"
26+
# "nodejs-slim-20.20.2"
27+
# "nodejs-20.20.2-source"
28+
# ];
29+
#
30+
# to ./modules/matrix/discord-bridge.nix, scootaloo still fails to
31+
# build with:
32+
# "error: attribute 'nodeAppDir' missing"
33+
#
34+
# we will pull matrix-appservice-discord from pkgs-deprecated (25.11)
35+
# for now until matrix-appservice-discord is updated.
36+
#
37+
# see: https://github.com/NixOS/nixpkgs/issues/515284
38+
package = pkgs-deprecated.matrix-appservice-discord;
39+
2240
environmentFile = config.age.secrets.discord-auth-env.path;
2341

2442
settings = {

0 commit comments

Comments
 (0)