Skip to content

Commit dfdfbc8

Browse files
authored
Merge pull request #173 from booxter/huntarr-version-fix
Kill huntarr
2 parents 96148dd + ab9ef20 commit dfdfbc8

File tree

4 files changed

+0
-41
lines changed

4 files changed

+0
-41
lines changed

flake.lock

Lines changed: 0 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@
4949
#jellarr.url = "github:venkyr77/jellarr/v0.1.0";
5050
jellarr.inputs.nixpkgs.follows = "nixpkgs";
5151

52-
# TODO: contribute upstream once Huntarr module/package confirmed working
53-
nixpkgs-huntarr.url = "github:booxter/nixpkgs/huntarr-init";
54-
5552
nixpkgs-quartz-wm.url = "github:booxter/nixpkgs/quartz-wm-darwin";
5653

5754
nixarr.url = "github:rasmus-kirk/nixarr";

nixos/srvarrvm/default.nix

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ in
4545
{
4646
imports = [
4747
inputs.nixarr.nixosModules.default
48-
# TODO: drop when Huntarr module lands upstream
49-
(import "${inputs.nixpkgs-huntarr}/nixos/modules/services/misc/servarr/huntarr.nix")
5048
];
5149

5250
# NFS mounts with media
@@ -189,16 +187,6 @@ in
189187
namespaceAddress = wgNamespaceAddress;
190188
};
191189

192-
services.huntarr = {
193-
enable = true;
194-
dataDir = "${config.nixarr.stateDir}/huntarr";
195-
openFirewall = true;
196-
};
197-
198-
# TODO: remove once huntarr ids land in upstream nixpkgs
199-
ids.uids.huntarr = 328;
200-
ids.gids.huntarr = 328;
201-
202190
systemd.services."update-dynamic-ip" = {
203191
unitConfig = wgUnitDepsBase;
204192
path = [ pkgs.curl ];
@@ -300,11 +288,6 @@ in
300288
url = "http://srvarr.local:9696/";
301289
icon = "sh:prowlarr";
302290
}
303-
{
304-
title = "Huntarr";
305-
url = "http://srvarr.local:9705/";
306-
icon = "https://raw.githubusercontent.com/plexguide/Huntarr.io/main/frontend/static/logo/64.png";
307-
}
308291
{
309292
title = "Transmission";
310293
url = "http://srvarr.local:9091/";

overlays/default.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
pkgsLldb = getPkgs inputs.debugserver;
1919
pkgsRelease = getPkgs inputs.nixpkgs-25_11;
2020
pkgsQuartzWm = getPkgs inputs.nixpkgs-quartz-wm;
21-
pkgsHuntarr = getPkgs inputs.nixpkgs-huntarr;
2221
llmAgentsPkgs = inputs.llm-agents.packages.${prev.system};
2322
releaseTransmission =
2423
if prev.lib.strings.hasPrefix "4.0." pkgsRelease.transmission_4.version then
@@ -68,9 +67,6 @@
6867
transmission_4 = releaseTransmission;
6968
transmission = releaseTransmission;
7069

71-
# Huntarr from fork until it lands upstream
72-
inherit (pkgsHuntarr) huntarr;
73-
7470
jellyfin = prev.jellyfin.overrideAttrs (old: {
7571
patches = old.patches or [ ] ++ [
7672
# fix directors not populated for new movies since 10.11.6

0 commit comments

Comments
 (0)