diff --git a/flake.lock b/flake.lock index ffc815b..5a5b091 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1706098335, - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", + "lastModified": 1764983851, + "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", + "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.11", + "ref": "nixos-25.11", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index b284666..e24bd45 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "NixOS modules for matrix related services"; inputs = { - nixpkgs.url = "nixpkgs/nixos-23.11"; + nixpkgs.url = "nixpkgs/nixos-25.11"; }; outputs = { self, nixpkgs }: { @@ -12,7 +12,7 @@ lib = import ./lib.nix { lib = nixpkgs.lib; }; - packages = let + checks = let forAllSystems = f: nixpkgs.lib.genAttrs [ "x86_64-linux" @@ -20,11 +20,13 @@ "x86_64-darwin" "aarch64-darwin" ] (system: f nixpkgs.legacyPackages.${system}); - in forAllSystems (pkgs: { + in forAllSystems (pkgs: let tests = import ./tests { inherit nixpkgs pkgs; matrix-lib = self.lib; }; + in { + inherit (tests) nginx-pipeline-eval; }); }; } diff --git a/synapse-module/default.nix b/synapse-module/default.nix index 1cdc345..c4c3fde 100644 --- a/synapse-module/default.nix +++ b/synapse-module/default.nix @@ -427,7 +427,7 @@ in wantedBy = [ "matrix-synapse.target" ]; preStart = let - flags = lib.cli.toGNUCommandLineShell {} { + flags = lib.cli.toCommandLineShellGNU {} { config-path = [ matrix-synapse-common-config ] ++ cfg.extraConfigFiles; keys-directory = cfg.dataDir; generate-keys = true; @@ -443,12 +443,12 @@ in StateDirectory = "matrix-synapse"; RuntimeDirectory = "matrix-synapse"; ExecStart = let - flags = lib.cli.toGNUCommandLineShell {} { + flags = lib.cli.toCommandLineShellGNU {} { config-path = [ matrix-synapse-common-config ] ++ cfg.extraConfigFiles; keys-directory = cfg.dataDir; }; in "${wrapped}/bin/synapse_homeserver ${flags}"; - ExecReload = "${pkgs.utillinux}/bin/kill -HUP $MAINPID"; + ExecReload = "${lib.getExe' pkgs.coreutils "kill"} -HUP $MAINPID"; Restart = "on-failure"; }; }; diff --git a/synapse-module/workers.nix b/synapse-module/workers.nix index ed60628..b068011 100644 --- a/synapse-module/workers.nix +++ b/synapse-module/workers.nix @@ -389,7 +389,7 @@ in { done ''; ExecStart = let - flags = lib.cli.toGNUCommandLineShell {} { + flags = lib.cli.toCommandLineShellGNU {} { config-path = [ matrix-synapse-common-config (workerConfig worker) ] ++ cfg.extraConfigFiles; keys-directory = cfg.dataDir; }; diff --git a/tests/default.nix b/tests/default.nix index 5ad1572..ac68032 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -1,4 +1,4 @@ { nixpkgs, pkgs, matrix-lib, ... }: { - nginx-pipeline = pkgs.callPackage ./nginx-pipeline { inherit nixpkgs matrix-lib; }; + nginx-pipeline-eval = pkgs.callPackage ./nginx-pipeline { inherit nixpkgs matrix-lib; }; } diff --git a/tests/nginx-pipeline/default.nix b/tests/nginx-pipeline/default.nix index 03958cc..b59864a 100644 --- a/tests/nginx-pipeline/default.nix +++ b/tests/nginx-pipeline/default.nix @@ -5,7 +5,7 @@ let modules = [ ../../module.nix { - system.stateVersion = "23.11"; + system.stateVersion = "25.11"; boot.isContainer = true; services.matrix-synapse-next = { enable = true;