summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock6
-rw-r--r--hosts/ahmed/configuration.nix2
-rw-r--r--modules/nixos/on-demand-minecraft/default.nix1
3 files changed, 5 insertions, 4 deletions
diff --git a/flake.lock b/flake.lock
index 3a1a054..404b095 100644
--- a/flake.lock
+++ b/flake.lock
@@ -202,11 +202,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1733212471,
- "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
+ "lastModified": 1737885589,
+ "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
+ "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
"type": "github"
},
"original": {
diff --git a/hosts/ahmed/configuration.nix b/hosts/ahmed/configuration.nix
index f3cd646..0276ea3 100644
--- a/hosts/ahmed/configuration.nix
+++ b/hosts/ahmed/configuration.nix
@@ -60,7 +60,7 @@
services.on-demand-minecraft = {
enable = true;
eula = true;
- package = pkgs.papermc;
+ package = pkgs.unstable.papermc;
openFirewall = true;
# Try shutting down every 10 minutes.
frequency-check-players = "*-*-* *:00/10:00";
diff --git a/modules/nixos/on-demand-minecraft/default.nix b/modules/nixos/on-demand-minecraft/default.nix
index 2e48457..999f67b 100644
--- a/modules/nixos/on-demand-minecraft/default.nix
+++ b/modules/nixos/on-demand-minecraft/default.nix
@@ -205,6 +205,7 @@ in {
# HACK: Each server is given its own subdirectory so
# incompatibilities between servers don't cause complaints.
+ # FIXME: This hack will break everything when trying to upgrade servers.
start-server = pkgs.writeShellScript "minecraft-server-start" ''
# Switch to runtime directory.
export RUNTIME_DIR="${config.users.users.minecrafter.home}/${cfg.package.name}/"