Skip to content

Update Fenix #365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Cyberboss wants to merge 10 commits into
base: main
Choose a base branch
from
Draft

Update Fenix #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
43d12b7
Unlock fenix
Cyberboss Jan 6, 2026
57ec25a
Update fenix
Cyberboss Jan 6, 2026
25d46ef
Try
Cyberboss Jan 19, 2026
c2964be
Merge branch 'UpdateFenix' into NewRust
Cyberboss Jan 19, 2026
6b5d328
Try
Cyberboss Jan 19, 2026
389254c
Switch to replaceVars
Cyberboss Jan 20, 2026
cd05470
Merge branch 'main' of https://github.com/tgstation-operations/infras…
Cyberboss Jan 20, 2026
3e3aaa8
Ugh
Cyberboss Jan 20, 2026
8a695d0
Add missing semicolon
Cyberboss Jan 20, 2026
319fc02
Auuuuugggh
Cyberboss Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
Comment thread
Cyberboss marked this conversation as resolved.
fenix = {
# fenix is pinned to that specific hash because we need 1.86 for TGS otherwise openssl can't build
url = "github:nix-community/fenix?rev=76ffc1b7b3ec8078fe01794628b6abff35cbda8f";
url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs";
};
authentik-nix = {
Expand Down
7 changes: 3 additions & 4 deletions systems/game-servers/modules/tgs/EventScripts/tg/PreCompile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ mkdir -p $work_directory

cd $work_directory

export TARGET_CC=$(which clang)
export TARGET_CXX=$(which clang++)
export TARGET_CC=@NIX_CLANG_PATH@/bin/clang
export TARGET_CXX=@NIX_CLANG_PATH@/bin/clang++
export CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER=@NIX_CLANG_PATH@/bin/clang
echo "rust-g: deployment begin"
if [ ! -d "rust-g" ]; then
echo "rust-g: cloning"
Expand Down Expand Up @@ -49,8 +50,6 @@ echo "dreamluau: checkout"
git checkout "$DREAMLUAU_VERSION" >/dev/null
echo "dreamluau: building"

export LIBCLANG_PATH="$(find /nix/store -name *-clang-*-lib | head -n1)/lib"

#cargo build --ignore-rust-version --release --target=i686-unknown-linux-gnu
#cp target/i686-unknown-linux-gnu/release/libdreamluau.so "$1/libdreamluau.so"

Expand Down
104 changes: 54 additions & 50 deletions systems/game-servers/modules/tgs/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,113 +16,115 @@
#TG
"tgs-EventScripts.d/tg/DreamDaemonPreLaunch.sh" = {
text = builtins.readFile ./EventScripts/tg/DreamDaemonPreLaunch.sh;
group = "tgstation-server";
group = config.services.tgstation-server.groupname;
mode = "0755";
};
"tgs-EventScripts.d/tg/parse-server.sh" = {
text = builtins.readFile ./EventScripts/tg/parse-server.sh;
group = "tgstation-server";
group = config.services.tgstation-server.groupname;
mode = "0755";
};
"tgs-EventScripts.d/tg/PostCompile.sh" = {
text = builtins.readFile ./EventScripts/tg/PostCompile.sh;
group = "tgstation-server";
group = config.services.tgstation-server.groupname;
mode = "0755";
};
"tgs-EventScripts.d/tg/PreCompile.sh" = {
text = builtins.readFile ./EventScripts/tg/PreCompile.sh;
group = "tgstation-server";
text = builtins.readFile (pkgs.replaceVars ./EventScripts/tg/PreCompile.sh {
NIX_CLANG_PATH = "${pkgs.clang_multi}";
});
group = config.services.tgstation-server.groupname;
mode = "0755";
};
"tgs-EventScripts.d/tg/tg-Roundend.sh" = {
text = builtins.readFile ./EventScripts/tg/tg-Roundend.sh;
group = "tgstation-server";
group = config.services.tgstation-server.groupname;
mode = "0755";
};
"tgs-EventScripts.d/tg/update-config.sh" = {
text = builtins.readFile ./EventScripts/tg/update-config.sh;
group = "tgstation-server";
group = config.services.tgstation-server.groupname;
mode = "0755";
};

#TGMC
"tgs-EventScripts.d/tgmc/DreamDaemonPreLaunch.sh" = {
text = builtins.readFile ./EventScripts/tgmc/DreamDaemonPreLaunch.sh;
group = "tgstation-server";
group = config.services.tgstation-server.groupname;
mode = "0755";
};
"tgs-EventScripts.d/tgmc/PostCompile.sh" = {
text = builtins.readFile ./EventScripts/tgmc/PostCompile.sh;
group = "tgstation-server";
group = config.services.tgstation-server.groupname;
mode = "0755";
};
"tgs-EventScripts.d/tgmc/PreCompile.sh" = {
text = builtins.readFile ./EventScripts/tgmc/PreCompile.sh;
group = "tgstation-server";
group = config.services.tgstation-server.groupname;
mode = "0755";
};
"tgs-EventScripts.d/tgmc/tg-Roundend.sh" = {
text = builtins.readFile ./EventScripts/tgmc/tg-Roundend.sh;
group = "tgstation-server";
group = config.services.tgstation-server.groupname;
mode = "0755";
};
"tgs-EventScripts.d/tgmc/update-config.sh" = {
text = builtins.readFile ./EventScripts/tgmc/update-config.sh;
group = "tgstation-server";
group = config.services.tgstation-server.groupname;
mode = "0755";
};

#EFFIGY
"tgs-EventScripts.d/effigy/DreamDaemonPreLaunch.sh" = {
text = builtins.readFile ./EventScripts/effigy/DreamDaemonPreLaunch.sh;
group = "tgstation-server";
group = config.services.tgstation-server.groupname;
mode = "0755";
};
"tgs-EventScripts.d/effigy/PostCompile.sh" = {
text = builtins.readFile ./EventScripts/effigy/PostCompile.sh;
group = "tgstation-server";
group = config.services.tgstation-server.groupname;
mode = "0755";
};
"tgs-EventScripts.d/effigy/PreCompile.sh" = {
text = builtins.readFile ./EventScripts/effigy/PreCompile.sh;
group = "tgstation-server";
group = config.services.tgstation-server.groupname;
mode = "0755";
};
"tgs-EventScripts.d/effigy/tg-Roundend.sh" = {
text = builtins.readFile ./EventScripts/effigy/tg-Roundend.sh;
group = "tgstation-server";
group = config.services.tgstation-server.groupname;
mode = "0755";
};
"tgs-EventScripts.d/effigy/update-config.sh" = {
text = builtins.readFile ./EventScripts/effigy/update-config.sh;
group = "tgstation-server";
group = config.services.tgstation-server.groupname;
mode = "0755";
};

#COOLSTATION
"tgs-EventScripts.d/cool/DreamDaemonPreLaunch.sh" = {
text = builtins.readFile ./EventScripts/cool/DreamDaemonPreLaunch.sh;
group = "tgstation-server";
group = config.services.tgstation-server.groupname;
mode = "0755";
};
"tgs-EventScripts.d/cool/PostCompile.sh" = {
text = builtins.readFile ./EventScripts/cool/PostCompile.sh;
group = "tgstation-server";
group = config.services.tgstation-server.groupname;
mode = "0755";
};
"tgs-EventScripts.d/cool/PreCompile.sh" = {
text = builtins.readFile ./EventScripts/cool/PreCompile.sh;
group = "tgstation-server";
group = config.services.tgstation-server.groupname;
mode = "0755";
};
"tgs-EventScripts.d/cool/cool-exciting-roundend.sh" = {
text = builtins.readFile ./EventScripts/cool/cool-exciting-roundend.sh;
group = "tgstation-server";
group = config.services.tgstation-server.groupname;
mode = "0755";
};
"tgs-EventScripts.d/cool/update-config.sh" = {
text = builtins.readFile ./EventScripts/cool/update-config.sh;
group = "tgstation-server";
group = config.services.tgstation-server.groupname;
mode = "0755";
};
};
Expand All @@ -131,68 +133,68 @@
age.secrets = {
tg13-comms = {
file = ../../secrets/tg13-comms.age;
owner = "${config.services.tgstation-server.username}";
group = "${config.services.tgstation-server.groupname}";
owner = config.services.tgstation-server.username;
group = config.services.tgstation-server.groupname;
};
tg13-dbconfig = {
file = ../../secrets/tg13-dbconfig.age;
owner = "${config.services.tgstation-server.username}";
group = "${config.services.tgstation-server.groupname}";
owner = config.services.tgstation-server.username;
group = config.services.tgstation-server.groupname;
};
tg13-tts_secrets = {
file = ../../secrets/tg13-tts_secrets.age;
owner = "${config.services.tgstation-server.username}";
group = "${config.services.tgstation-server.groupname}";
owner = config.services.tgstation-server.username;
group = config.services.tgstation-server.groupname;
};
tg13-webhooks = {
file = ../../secrets/tg13-webhooks.age;
owner = "${config.services.tgstation-server.username}";
group = "${config.services.tgstation-server.groupname}";
owner = config.services.tgstation-server.username;
group = config.services.tgstation-server.groupname;
};
tg13-extra_config-rclone = {
file = ../../secrets/tg13-extra_config-rclone.age;
owner = "${config.services.tgstation-server.username}";
group = "${config.services.tgstation-server.groupname}";
owner = config.services.tgstation-server.username;
group = config.services.tgstation-server.groupname;
};
tgmc-dbconfig = {
file = ../../secrets/tgmc-dbconfig.age;
owner = "${config.services.tgstation-server.username}";
group = "${config.services.tgstation-server.groupname}";
owner = config.services.tgstation-server.username;
group = config.services.tgstation-server.groupname;
};
tgmc-tts_secrets = {
file = ../../secrets/tgmc-tts_secrets.age;
owner = "${config.services.tgstation-server.username}";
group = "${config.services.tgstation-server.groupname}";
owner = config.services.tgstation-server.username;
group = config.services.tgstation-server.groupname;
};
tgmc-extra_config-rclone = {
file = ../../secrets/tgmc-extra_config-rclone.age;
owner = "${config.services.tgstation-server.username}";
group = "${config.services.tgstation-server.groupname}";
owner = config.services.tgstation-server.username;
group = config.services.tgstation-server.groupname;
};
effigy-comms = {
file = ../../secrets/effigy-comms.age;
owner = "${config.services.tgstation-server.username}";
group = "${config.services.tgstation-server.groupname}";
owner = config.services.tgstation-server.username;
group = config.services.tgstation-server.groupname;
};
effigy-dbconfig = {
file = ../../secrets/effigy-dbconfig.age;
owner = "${config.services.tgstation-server.username}";
group = "${config.services.tgstation-server.groupname}";
owner = config.services.tgstation-server.username;
group = config.services.tgstation-server.groupname;
};
#effigy-tts_secrets = { for a rainy day...
#file = ../../secrets/effigy-tts_secrets.age;
#owner = "${config.services.tgstation-server.username}";
#group = "${config.services.tgstation-server.groupname}";
#owner = config.services.tgstation-server.username;
#group = config.services.tgstation-server.groupname;
#};
effigy-extra_config-rclone = {
file = ../../secrets/effigy-extra_config-rclone.age;
owner = "${config.services.tgstation-server.username}";
group = "${config.services.tgstation-server.groupname}";
owner = config.services.tgstation-server.username;
group = config.services.tgstation-server.groupname;
};
cool-apitoken = {
file = ../../secrets/cool-apitoken.age;
owner = "${config.services.tgstation-server.username}";
group = "${config.services.tgstation-server.groupname}";
owner = config.services.tgstation-server.username;
group = config.services.tgstation-server.groupname;
};
};
services.tgstation-server = {
Expand Down Expand Up @@ -260,12 +262,14 @@
rclone
yt-dlp # For Internet Sounds
lua # Lua Support
nix-prefetch-github # New rust builder prefetcher
jq # for parsing above output
]
);
};
age.secrets.rsc-cdn = {
file = ../../secrets/rsc-cdn.age;
owner = "${config.services.tgstation-server.username}";
group = "${config.services.tgstation-server.groupname}";
owner = config.services.tgstation-server.username;
group = config.services.tgstation-server.groupname;
};
}
7 changes: 6 additions & 1 deletion systems/game-servers/systems/tgsatan/modules/tts/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@
};
compose-file = pkgs.writeTextFile {
name = "tgtts-docker-compose.yml";
text = builtins.replaceStrings [ "$TGTTS_HAPROXY_CFG_PATH$" "$TGTTS_BLIPS_PATH$" "$TGTTS_IMAGE_NAME$" "$TGTTS_PUBLIC_PORT$" ] [ "${haproxy-cfg}" workspace-directory name "${toString port}" ] (builtins.readFile ./docker-compose.yml);
text = builtins.readFile (pkgs.replaceVars ./docker-compose.yml {
TGTTS_HAPROXY_CFG_PATH = "${haproxy-cfg}";
TGTTS_BLIPS_PATH = workspace-directory;
TGTTS_IMAGE_NAME = name;
TGTTS_PUBLIC_PORT = toString port;
});
};
in {
users = {
Expand Down
Loading
Loading