From f3d282b763e54ed65773e0e5b58f7b00fe583b50 Mon Sep 17 00:00:00 2001 From: kurogeek Date: Thu, 15 Jan 2026 11:35:36 +0700 Subject: [PATCH] bump nixpkgs --- flake.lock | 6 +++--- machines/b4l/services/nextcloud.nix | 2 +- modules/clan/jukebox/default.nix | 23 +++++++++++++---------- modules/nixos/think-backend-gtcm.nix | 2 +- modules/nixos/think-gtcm.nix | 2 +- pkgs/think-backend-gtcm.nix | 2 +- pkgs/think-gtcm.nix | 2 +- 7 files changed, 21 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 3d11ad8..27de34b 100644 --- a/flake.lock +++ b/flake.lock @@ -225,11 +225,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761656231, - "narHash": "sha256-krgZxGAIIIKFJS+UB0l8do3sYUDWJc75M72tepmVMzE=", + "lastModified": 1768395095, + "narHash": "sha256-ZhuYJbwbZT32QA95tSkXd9zXHcdZj90EzHpEXBMabaw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10", + "rev": "13868c071cc73a5e9f610c47d7bb08e5da64fdd5", "type": "github" }, "original": { diff --git a/machines/b4l/services/nextcloud.nix b/machines/b4l/services/nextcloud.nix index c7c3b1c..62901db 100644 --- a/machines/b4l/services/nextcloud.nix +++ b/machines/b4l/services/nextcloud.nix @@ -19,7 +19,7 @@ in services.nextcloud = { hostName = ncDomain; - package = pkgs.nextcloud31; + package = pkgs.nextcloud32; settings = { diff --git a/modules/clan/jukebox/default.nix b/modules/clan/jukebox/default.nix index dc77f5d..af5d6c8 100644 --- a/modules/clan/jukebox/default.nix +++ b/modules/clan/jukebox/default.nix @@ -113,19 +113,22 @@ services.mpd = { enable = true; - musicDirectory = settings.baseDir; - network.listenAddress = "any"; - extraConfig = '' - audio_output { - type "pulse" - name "jukebox" - server "localhost" - } - ''; + openFirewall = true; + settings = { + bind_to_address = "any"; + music_directory = settings.baseDir; + audio_output = [ + { + type = "pulse"; + name = "jukebox"; + server = "localhost"; + } + ]; + }; }; networking.firewall.interfaces = lib.genAttrs settings.binds (_: { - allowedTCPPorts = [ config.services.mpd.network.port ]; + allowedTCPPorts = [ config.services.mpd.settings.port ]; }); environment.systemPackages = [ pkgs.mpc ]; diff --git a/modules/nixos/think-backend-gtcm.nix b/modules/nixos/think-backend-gtcm.nix index e9e97e5..2079c1e 100644 --- a/modules/nixos/think-backend-gtcm.nix +++ b/modules/nixos/think-backend-gtcm.nix @@ -57,7 +57,7 @@ in dataDir = lib.mkOption { type = lib.types.path; default = "/var/lib/think-backend.greaterchiangmai.com"; - description = ''A place where to store states''; + description = "A place where to store states"; }; user = lib.mkOption { diff --git a/modules/nixos/think-gtcm.nix b/modules/nixos/think-gtcm.nix index c2909d9..e868fbb 100644 --- a/modules/nixos/think-gtcm.nix +++ b/modules/nixos/think-gtcm.nix @@ -33,7 +33,7 @@ in dataDir = lib.mkOption { type = lib.types.path; default = "/var/lib/think.greaterchiangmai.com"; - description = ''A place where to store states''; + description = "A place where to store states"; }; user = lib.mkOption { diff --git a/pkgs/think-backend-gtcm.nix b/pkgs/think-backend-gtcm.nix index bc08098..4d6f5ea 100644 --- a/pkgs/think-backend-gtcm.nix +++ b/pkgs/think-backend-gtcm.nix @@ -28,5 +28,5 @@ php.buildComposerProject2 (finalAttrs: { ''; composerStrictValidation = false; - vendorHash = "sha256-eXm1x3E9KHWojaT2RU4inMdZqQVcWdLCKlvzhOlIZrc="; + vendorHash = "sha256-wGfbprSDULBje1s5y3+ZiU/nCwYGDEULobZzyzGZ9bQ="; }) diff --git a/pkgs/think-gtcm.nix b/pkgs/think-gtcm.nix index 0af8b9a..b8858e9 100644 --- a/pkgs/think-gtcm.nix +++ b/pkgs/think-gtcm.nix @@ -28,5 +28,5 @@ php.buildComposerProject2 (finalAttrs: { ''; composerStrictValidation = false; - vendorHash = "sha256-QV3hR3U3GwCqrCRxfkazmJwDpO1vFyMfA6YqUb4bjMI="; + vendorHash = "sha256-b8+AKUmjQiOdV8UC9GYfJzAHFs9+FRSH91YsxKt0rDA="; })