diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b29447cc382f..505b021f156a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12953,11 +12953,6 @@ name = "Jez Cope"; keys = [ { fingerprint = "D9DA 3E47 E8BD 377D A317 B3D0 9E42 CE07 1C45 59D1"; } ]; }; - jf-uu = { - github = "jf-uu"; - githubId = 181011550; - name = "jf-uu"; - }; jfchevrette = { email = "jfchevrette@gmail.com"; github = "jfchevrette"; diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 155943510abf..73f460d97369 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -129,7 +129,7 @@ - [nvme-rs](https://github.com/liberodark/nvme-rs), NVMe monitoring [services.nvme-rs](#opt-services.nvme-rs.enable). -- [Overseerr](https://overseerr.dev), a request management and media discovery tool for the Plex ecosystem. Available as [services.overseerr](#opt-services.overseerr.enable). +- [Overseerr](https://overseerr.dev), a request management and media discovery tool for the Plex ecosystem. Available as {option}`opt-services.overseerr.enable`. - [PairDrop](https://github.com/schlagmichdoch/pairdrop), a peer-to-peer file transfer web app. Available as [services.pairdrop](#opt-services.pairdrop.enable). diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index 846e6ef796f0..7a3ebb609cf4 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -113,6 +113,8 @@ - `services.komodo-periphery` has been updated to support version 2.0.0. Some options have been renamed to match the new configuration structure; compatibility aliases are provided for the renamed options. The `passkeys` and `outbound.onboardingKey` options have been removed; use `passkeyFiles`, `auth.privateKey`/`auth.corePublicKeys`, or `outbound.onboardingKeyFile` instead. New outbound mode configuration is available under `outbound.*`. +- Package `overseerr` has been removed as the `overseerr` and `jellyseerr` projects were merged under `seerr`. + ## Other Notable Changes {#sec-release-26.11-notable-changes} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 871579e1d094..55493dcbeca9 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -938,7 +938,6 @@ ./services/misc/open-webui.nix ./services/misc/orthanc.nix ./services/misc/osrm.nix - ./services/misc/overseerr.nix ./services/misc/owncast.nix ./services/misc/packagekit.nix ./services/misc/paisa.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index f631e7f8f219..b5f8e4977990 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -539,6 +539,13 @@ in (mkRemovedOptionModule [ "services" "xserver" "cmt" ] '' services.xserver.cmt has been removed as it was broken and unmaintained upstream '') + (mkRemovedOptionModule + [ + "services" + "overseerr" + ] + "`services.overseerr` has been replaced by `services.seerr` as the project has been merged with Jellyseerr under Seerr." + ) # Do NOT add any option renames here, see top of the file ]; } diff --git a/nixos/modules/services/misc/overseerr.nix b/nixos/modules/services/misc/overseerr.nix deleted file mode 100644 index 3ea8cc26eb28..000000000000 --- a/nixos/modules/services/misc/overseerr.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: - -let - cfg = config.services.overseerr; -in -{ - meta.maintainers = [ lib.maintainers.jf-uu ]; - - options.services.overseerr = { - enable = lib.mkEnableOption "Overseerr, a request management and media discovery tool for the Plex ecosystem"; - - package = lib.mkPackageOption pkgs "overseerr" { }; - - openFirewall = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Open a port in the firewall for the Overseerr web interface."; - }; - - port = lib.mkOption { - type = lib.types.port; - default = 5055; - description = "The port which the Overseerr web UI should listen on."; - }; - }; - - config = lib.mkIf cfg.enable { - systemd.services.overseerr = { - description = "Request management and media discovery tool for the Plex ecosystem"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - environment = { - CONFIG_DIRECTORY = "/var/lib/overseerr"; - PORT = toString cfg.port; - }; - serviceConfig = { - CapabilityBoundingSet = ""; - DynamicUser = true; - ExecStart = lib.getExe cfg.package; - LockPersonality = true; - NoNewPrivileges = true; - PrivateDevices = true; - PrivateIPC = true; - PrivateMounts = true; - PrivateTmp = true; - PrivateUsers = true; - ProcSubset = "pid"; - ProtectClock = true; - ProtectControlGroups = true; - ProtectHome = true; - ProtectHostname = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - ProtectProc = "invisible"; - ProtectSystem = "strict"; - RemoveIPC = true; - Restart = "on-failure"; - RestrictAddressFamilies = [ - "AF_INET" - "AF_INET6" - "AF_UNIX" - ]; - RestrictNamespaces = true; - RestrictRealtime = true; - RestrictSUIDSGID = true; - StateDirectory = "overseerr"; - StateDirectoryMode = "0700"; - SystemCallArchitectures = "native"; - SystemCallErrorNumber = "EPERM"; - SystemCallFilter = [ - "@system-service" - "~@privileged" - "~@resources" - ]; - Type = "exec"; - }; - }; - - networking.firewall = lib.mkIf cfg.openFirewall { - allowedTCPPorts = [ cfg.port ]; - }; - }; -} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 78f9940fb6fd..5d06b7326e94 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1303,7 +1303,6 @@ in osrm-backend = runTest ./osrm-backend.nix; outline = runTest ./outline.nix; overlayfs = runTest ./overlayfs.nix; - overseerr = runTest ./overseerr.nix; owi = runTest ./owi.nix; owncast = runTest ./owncast.nix; oxidized = handleTest ./oxidized.nix { }; diff --git a/nixos/tests/overseerr.nix b/nixos/tests/overseerr.nix deleted file mode 100644 index f6e38b5d746c..000000000000 --- a/nixos/tests/overseerr.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, pkgs, ... }: -{ - name = "overseerr"; - meta.maintainers = with lib.maintainers; [ jf-uu ]; - - nodes.machine = - { pkgs, ... }: - { - environment.systemPackages = [ pkgs.jq ]; - services.overseerr.enable = true; - }; - - testScript = '' - machine.wait_for_unit("overseerr.service") - machine.wait_for_open_port(5055) - - version = machine.succeed("curl --fail http://localhost:5055/api/v1/status | jq --raw-output .version").rstrip("\n") - assert version == "${pkgs.overseerr.version}", f"expected version to be ${pkgs.overseerr.version}, got {version}" - ''; -} diff --git a/pkgs/by-name/ov/overseerr/package.nix b/pkgs/by-name/ov/overseerr/package.nix deleted file mode 100644 index e9331a5c7b6e..000000000000 --- a/pkgs/by-name/ov/overseerr/package.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - fetchFromGitHub, - fetchYarnDeps, - lib, - makeWrapper, - node-gyp, - node-pre-gyp, - nodejs, - python3, - stdenv, - yarnBuildHook, - yarnConfigHook, - yarnInstallHook, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "overseerr"; - version = "1.34.0"; - - src = fetchFromGitHub { - owner = "sct"; - repo = "overseerr"; - tag = "v${finalAttrs.version}"; - hash = "sha256-4332XsupUGjkFo0+4wn2fUyK5/y6EQoPaAuayBH/myk="; - }; - - offlineCache = fetchYarnDeps { - yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-f30P+/DxDz9uBmdgvaYK4YOAUmVce8MUnNHBXr8/yKc="; - }; - - env.CYPRESS_INSTALL_BINARY = 0; - - nativeBuildInputs = [ - makeWrapper - node-gyp - node-pre-gyp - nodejs - python3 - yarnBuildHook - yarnConfigHook - yarnInstallHook - ]; - - postInstall = '' - # Fixes "Error: Cannot find module" (bcrypt) and "SQLite package has not been found installed". - pushd $out/lib/node_modules/overseerr/node_modules - for module in bcrypt sqlite3; do - pushd $module - node-pre-gyp rebuild --build-from-source --nodedir=${nodejs} --prefer-offline - popd - done - - makeWrapper "${lib.getExe nodejs}" "$out/bin/overseerr" \ - --set NODE_ENV production \ - --chdir "$out/lib/node_modules/overseerr" \ - --add-flags "dist/index.js" \ - --add-flags "--" - ''; - - meta = { - badPlatforms = [ - # FileNotFoundError: [Errno 2] No such file or directory: 'xcodebuild' - lib.systems.inspect.patterns.isDarwin - ]; - changelog = "https://github.com/sct/overseerr/releases/tag/v${finalAttrs.version}"; - description = "Request management and media discovery tool for the Plex ecosystem"; - homepage = "https://github.com/sct/overseerr"; - license = lib.licenses.mit; - mainProgram = "overseerr"; - maintainers = with lib.maintainers; [ jf-uu ]; - }; -})