From caaa4237cccc484f87449c778726b2cafded6846 Mon Sep 17 00:00:00 2001 From: ktkk Date: Mon, 20 Oct 2025 18:10:12 +0000 Subject: [PATCH] Fix nix flake check issues --- flake.lock | 92 +++++++++++++++++++++++++++++++++-- modules/minecraft/default.nix | 14 +++--- 2 files changed, 96 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 5318aa3..16c64d0 100644 --- a/flake.lock +++ b/flake.lock @@ -44,6 +44,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1733328505, @@ -59,6 +75,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -100,11 +134,31 @@ "type": "github" } }, - "nixos-wsl": { + "nix-minecraft": { "inputs": { "flake-compat": "flake-compat", + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_2" }, + "locked": { + "lastModified": 1760925861, + "narHash": "sha256-jApZZBUvkvZMOZVGmKKjrzH+wGosJnClDkJhWu0D0Ek=", + "owner": "Infinidoge", + "repo": "nix-minecraft", + "rev": "efc6a6ef3345caaeec3aebc7de45dfcabc4b7359", + "type": "github" + }, + "original": { + "owner": "Infinidoge", + "repo": "nix-minecraft", + "type": "github" + } + }, + "nixos-wsl": { + "inputs": { + "flake-compat": "flake-compat_2", + "nixpkgs": "nixpkgs_3" + }, "locked": { "lastModified": 1760536587, "narHash": "sha256-wfWqt+igns/VazjPLkyb4Z/wpn4v+XIjUeI3xY/1ENg=", @@ -136,6 +190,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1748929857, + "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1760524057, "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", @@ -151,7 +221,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1746141548, "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", @@ -171,8 +241,9 @@ "inputs": { "agenix": "agenix", "home-manager": "home-manager_2", + "nix-minecraft": "nix-minecraft", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" } }, "systems": { @@ -189,6 +260,21 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/modules/minecraft/default.nix b/modules/minecraft/default.nix index 8aeb13f..486aa8c 100644 --- a/modules/minecraft/default.nix +++ b/modules/minecraft/default.nix @@ -17,14 +17,14 @@ serverProperties = config.services.minecraft-servers.servers.vanilla-server.serverProperties; in { - proxyPass = "http://${toString serverProperties.server-ip}:${serverProperties.server-port}"; + proxyPass = "http://${toString serverProperties.server-ip}:${toString serverProperties.server-port}"; + + proxyWebsockets = true; + + extraConfig = '' + proxy_pass_header Authorization; + ''; }; - - proxyWebsockets = true; - - extraConfig = '' - proxy_pass_header Authorization; - ''; }; services.minecraft-servers = {