diff options
| author | Linnnus <[email protected]> | 2025-01-29 07:18:01 +0100 |
|---|---|---|
| committer | Linnnus <[email protected]> | 2025-01-29 07:27:25 +0100 |
| commit | ecbe82fe6abd127ead71c9f888a72cde55ca0700 (patch) | |
| tree | 9f0aa5bac3fc4eee05651b359e423b1267e5dece | |
| parent | 4c03d45089669f0231e8d710cfc9840ea56337b8 (diff) | |
Bump nixpkgs-unstable, ahmed: use unstable PaperMC
I needed PaperMC v1.24.1 which happens to be what is packaged in
NixOS/nixpkgs@852ff1d9e.
I really ought to figure out a way to decouple the version of Minecraft
from the nixpkgs version. I don't want to be in the situation where I
want to bump unstable, but don't want to switch to a new Minecraft
version.
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | hosts/ahmed/configuration.nix | 2 | ||||
| -rw-r--r-- | modules/nixos/on-demand-minecraft/default.nix | 1 |
3 files changed, 5 insertions, 4 deletions
@@ -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}/" |