From 425e511792aae47b9d3f997c848587d3f8479ab7 Mon Sep 17 00:00:00 2001 From: Pierre Penninckx Date: Wed, 17 Apr 2024 16:06:29 -0700 Subject: [PATCH] flake.lock: Update (#226) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Automated changes by the [update-flake-lock](https://github.com/DeterminateSystems/update-flake-lock) GitHub Action. ``` Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/b06025f1533a1e07b6db3e75151caa155d1c7eb3?narHash=sha256-qrxvLS888pNJFwJdK%2Bhf1wpRCSQcqA6W5%2BOx202NDa0%3D' (2024-03-19) → 'github:nixos/nixpkgs/5672bc9dbf9d88246ddab5ac454e82318d094bb8?narHash=sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U%2BISA%3D' (2024-04-16) • Updated input 'sops-nix': 'github:Mic92/sops-nix/83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616?narHash=sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A%3D' (2024-03-17) → 'github:Mic92/sops-nix/cc535d07cbcdd562bcca418e475c7b1959cefa4b?narHash=sha256-APoDs2GtzVrsE%2BZ9w72qpHzEtEDfuinWcNTN7zhwLxg%3D' (2024-04-15) • Updated input 'sops-nix/nixpkgs': 'github:NixOS/nixpkgs/9af9c1c87ed3e3ed271934cb896e0cdd33dae212?narHash=sha256-huQT4Xs0y4EeFKn2BTBVYgEwJSv8SDlm82uWgMnCMmI%3D' (2024-03-15) → 'github:NixOS/nixpkgs/a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9?narHash=sha256-icE1IJE9fHcbDfJ0%2BqWoDdcBXUoZCcIJxME4lMHwvSM%3D' (2024-04-12) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/6dc11d9859d6a18ab0c5e5829a5b8e4810658de3?narHash=sha256-y%2Bl3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw%3D' (2024-03-16) → 'github:NixOS/nixpkgs/c27f3b6d8e29346af16eecc0e9d54b1071eae27e?narHash=sha256-RifMwYuKu5v6x6O65msKDTqKkQ9crGwOB7yr20qMEuE%3D' (2024-04-13) ``` ### Running GitHub Actions on this PR GitHub Actions will not run workflows on pull requests which are opened by a GitHub Action. To run GitHub Actions workflows on this PR, run: ```sh git branch -D update_flake_lock_action git fetch origin git checkout update_flake_lock_action git commit --amend --no-edit git push origin update_flake_lock_action --force ``` --------- Co-authored-by: github-actions[bot] --- flake.lock | 24 ++++++++++++------------ modules/services/arr.nix | 8 ++++---- modules/services/grocy.nix | 2 +- test/vm/arr.nix | 9 +++++++-- 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 40ce328..26bbccc 100644 --- a/flake.lock +++ b/flake.lock @@ -35,11 +35,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710806803, - "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", + "lastModified": 1713248628, + "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", + "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", "type": "github" }, "original": { @@ -51,11 +51,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1710628718, - "narHash": "sha256-y+l3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw=", + "lastModified": 1713042715, + "narHash": "sha256-RifMwYuKu5v6x6O65msKDTqKkQ9crGwOB7yr20qMEuE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6dc11d9859d6a18ab0c5e5829a5b8e4810658de3", + "rev": "c27f3b6d8e29346af16eecc0e9d54b1071eae27e", "type": "github" }, "original": { @@ -67,11 +67,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710534455, - "narHash": "sha256-huQT4Xs0y4EeFKn2BTBVYgEwJSv8SDlm82uWgMnCMmI=", + "lastModified": 1712883908, + "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9af9c1c87ed3e3ed271934cb896e0cdd33dae212", + "rev": "a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1710644594, - "narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=", + "lastModified": 1713174909, + "narHash": "sha256-APoDs2GtzVrsE+Z9w72qpHzEtEDfuinWcNTN7zhwLxg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616", + "rev": "cc535d07cbcdd562bcca418e475c7b1959cefa4b", "type": "github" }, "original": { diff --git a/modules/services/arr.nix b/modules/services/arr.nix index 8567a5c..7b4200b 100644 --- a/modules/services/arr.nix +++ b/modules/services/arr.nix @@ -485,7 +485,7 @@ in excludePatterns = [".db-shm" ".db-wal" ".mono"]; }; })) - (lib.mkIf cfg.bazarr.enable (backup "sonarr")) + (lib.mkIf cfg.bazarr.enable (backup "bazarr")) (lib.mkIf cfg.readarr.enable ( let @@ -514,7 +514,7 @@ in excludePatterns = [".db-shm" ".db-wal" ".mono"]; }; })) - (lib.mkIf cfg.readarr.enable (backup "bazarr")) + (lib.mkIf cfg.readarr.enable (backup "readarr")) (lib.mkIf cfg.lidarr.enable ( let @@ -548,7 +548,7 @@ in excludePatterns = [".db-shm" ".db-wal" ".mono"]; }; })) - (lib.mkIf cfg.lidarr.enable (backup "readarr")) + (lib.mkIf cfg.lidarr.enable (backup "lidarr")) (lib.mkIf cfg.jackett.enable ( let @@ -579,6 +579,6 @@ in excludePatterns = [".db-shm" ".db-wal" ".mono"]; }; })) - (lib.mkIf cfg.jackett.enable (backup "lidarr")) + (lib.mkIf cfg.jackett.enable (backup "jackett")) ]; } diff --git a/modules/services/grocy.nix b/modules/services/grocy.nix index fb57a89..de6968b 100644 --- a/modules/services/grocy.nix +++ b/modules/services/grocy.nix @@ -39,7 +39,7 @@ in culture = lib.mkOption { type = lib.types.enum [ "de" "en" "da" "en_GB" "es" "fr" "hu" "it" "nl" "no" "pl" "pt_BR" "ru" "sk_SK" "sv_SE" "tr" ]; default = "en"; - description = lib.mdDoc '' + description = '' Display language of the frontend. ''; }; diff --git a/test/vm/arr.nix b/test/vm/arr.nix index 264e6fd..a14b75c 100644 --- a/test/vm/arr.nix +++ b/test/vm/arr.nix @@ -7,6 +7,8 @@ let shbapp = nodes.server.shb.arr.${appname}; hasSSL = !(isNull shbapp.ssl); fqdn = if hasSSL then "https://${appname}.example.com" else "http://${appname}.example.com"; + healthUrl = "/health"; + loginUrl = "/UI/Login"; in '' import json @@ -28,18 +30,21 @@ let "curl -X GET --fail-with-body --silent --show-error --output /dev/null --location" + " --connect-to ${appname}.example.com:443:server:443" + " --connect-to ${appname}.example.com:80:server:80" + + " --cookie-jar /tmp/cookies" + # Uncomment for debugging: + # + " -v" + f" --write-out '{format}'" + " " + endpoint )) with subtest("health"): - response = curl(client, """{"code":%{response_code}}""", "${fqdn}/health") + response = curl(client, """{"code":%{response_code}}""", "${fqdn}${healthUrl}") if response['code'] != 200: raise Exception(f"Code is {response['code']}") with subtest("login"): - response = curl(client, """{"code":%{response_code}}""", "${fqdn}/UI/Login") + response = curl(client, """{"code":%{response_code}}""", "${fqdn}${loginUrl}") if response['code'] != 200: raise Exception(f"Code is {response['code']}")