diff --git a/flake.lock b/flake.lock index 742fa94..67c36fb 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1750183894, - "narHash": "sha256-ZtOgEt70keBVB4YJc+z7m0h7J1BOlv/GjHE1YC6KxeA=", + "lastModified": 1761016216, + "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f45e75fc63fc8a7ffc3da382b2f6b681c5b71875", + "rev": "481cf557888e05d3128a76f14c76397b7d7cc869", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -25,11 +25,11 @@ }, "vpnconfinement": { "locked": { - "lastModified": 1749672087, - "narHash": "sha256-j8LG0s0QcvNkZZLcItl78lvTZemvsScir0dG3Ii4B1c=", + "lastModified": 1759956062, + "narHash": "sha256-NUZu0Rb0fwUjfdp51zMm0xM3lcK8Kw4c97LLog7+JjA=", "owner": "Maroka-chan", "repo": "VPN-Confinement", - "rev": "880b3bd2c864dce4f6afc79f6580ca699294c011", + "rev": "fabe7247b720b5eb4c3c053e24a2b3b70e64c52b", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1750317638, - "narHash": "sha256-B4RWcXXOLO6gMeYyV+K4olu+kGGsYamKH+JAm0cIXqI=", + "lastModified": 1753958235, + "narHash": "sha256-Rd27XQJKv8Z4BCr3gdbaHFd0TmumiGxdjGRzsEf/mOg=", "owner": "rasmus-kirk", "repo": "website-builder", - "rev": "b54192000a00e865947f45bacf3184d56363ee38", + "rev": "00a14b7ae7baef2197978ba7c3fe72dfca7bc475", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cdbbdb4..bbb370c 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "The Nixarr Media Server Nixos Module"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; vpnconfinement.url = "github:Maroka-chan/VPN-Confinement"; diff --git a/nixarr/bazarr/default.nix b/nixarr/bazarr/default.nix index 4266060..8697aa2 100644 --- a/nixarr/bazarr/default.nix +++ b/nixarr/bazarr/default.nix @@ -98,7 +98,6 @@ in { --port ${toString cfg.port} \ --no-update True ''; - KillSignal = "SIGINT"; Restart = "on-failure"; KillSignal = "SIGINT"; SuccessExitStatus = "0 156"; diff --git a/tests/simple-test.nix b/tests/simple-test.nix index a402456..5fad4b0 100644 --- a/tests/simple-test.nix +++ b/tests/simple-test.nix @@ -25,7 +25,7 @@ pkgs.nixosTest { transmission = { enable = true; - privateTrackers.cross-seed.enable = true; + # privateTrackers.cross-seed.enable = true; }; autobrr.enable = true; @@ -37,51 +37,51 @@ pkgs.nixosTest { sabnzbd.enable = true; lidarr.enable = true; prowlarr.enable = true; - recyclarr = { - enable = true; - configuration = { - sonarr.series = { - base_url = "http://localhost:8989"; - api_key = "!env_var SONARR_API_KEY"; - quality_definition.type = "series"; - delete_old_custom_formats = true; - custom_formats = [ - { - trash_ids = [ - "85c61753df5da1fb2aab6f2a47426b09" # BR-DISK - "9c11cd3f07101cdba90a2d81cf0e56b4" # LQ - ]; - assign_scores_to = [ - { - name = "WEB-DL (1080p)"; - score = -10000; - } - ]; - } - ]; - }; - radarr.movies = { - base_url = "http://localhost:7878"; - api_key = "!env_var RADARR_API_KEY"; - quality_definition.type = "movie"; - delete_old_custom_formats = true; - custom_formats = [ - { - trash_ids = [ - "570bc9ebecd92723d2d21500f4be314c" # Remaster - "eca37840c13c6ef2dd0262b141a5482f" # 4K Remaster - ]; - assign_scores_to = [ - { - name = "HD Bluray + WEB"; - score = 25; - } - ]; - } - ]; - }; - }; - }; + # recyclarr = { + # enable = true; + # configuration = { + # sonarr.series = { + # base_url = "http://localhost:8989"; + # api_key = "!env_var SONARR_API_KEY"; + # quality_definition.type = "series"; + # delete_old_custom_formats = true; + # custom_formats = [ + # { + # trash_ids = [ + # "85c61753df5da1fb2aab6f2a47426b09" # BR-DISK + # "9c11cd3f07101cdba90a2d81cf0e56b4" # LQ + # ]; + # assign_scores_to = [ + # { + # name = "WEB-DL (1080p)"; + # score = -10000; + # } + # ]; + # } + # ]; + # }; + # radarr.movies = { + # base_url = "http://localhost:7878"; + # api_key = "!env_var RADARR_API_KEY"; + # quality_definition.type = "movie"; + # delete_old_custom_formats = true; + # custom_formats = [ + # { + # trash_ids = [ + # "570bc9ebecd92723d2d21500f4be314c" # Remaster + # "eca37840c13c6ef2dd0262b141a5482f" # 4K Remaster + # ]; + # assign_scores_to = [ + # { + # name = "HD Bluray + WEB"; + # score = 25; + # } + # ]; + # } + # ]; + # }; + # }; + # }; }; # Create a test user to verify mediaUsers functionality @@ -109,11 +109,7 @@ pkgs.nixosTest { machine.succeed("systemctl is-active sabnzbd") machine.succeed("systemctl is-active lidarr") machine.succeed("systemctl is-active prowlarr") - machine.succeed("systemctl is-active recyclarr") - - machine.succeed("nixarr list-api-keys") - machine.succeed("nixarr fix-permissions") - machine.succeed("nixarr wipe-uids-gids") + # machine.succeed("systemctl is-active recyclarr") print("\n=== Nixarr Simple Test Completed ===") '';