diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 25a9beb55e80..7d6e3e5be501 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -340,6 +340,9 @@ request #332259](https://github.com/NixOS/nixpkgs/pull/332259) if you are interested in maintaining a newer version. +- The `antennas` package and the `services.antennas` module have been + removed as they only work with `tvheadend` (see above). + ## Other Notable Changes {#sec-release-24.11-notable-changes} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 812179b6962a..3f06bcfdf859 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -968,7 +968,6 @@ ./services/networking/adguardhome.nix ./services/networking/alice-lg.nix ./services/networking/amuled.nix - ./services/networking/antennas.nix ./services/networking/aria2.nix ./services/networking/asterisk.nix ./services/networking/atftpd.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 71a4da5419e1..91ef9b43cd3e 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -51,6 +51,7 @@ in The hidepid module was removed, since the underlying machinery is broken when using cgroups-v2. '') + (mkRemovedOptionModule [ "services" "antennas" ] "The antennas package and the corresponding module have been removed as they only work with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version.") (mkRemovedOptionModule [ "services" "baget" "enable" ] "The baget module was removed due to the upstream package being unmaintained.") (mkRemovedOptionModule [ "services" "beegfs" ] "The BeeGFS module has been removed") (mkRemovedOptionModule [ "services" "beegfsEnable" ] "The BeeGFS module has been removed") diff --git a/nixos/modules/services/networking/antennas.nix b/nixos/modules/services/networking/antennas.nix deleted file mode 100644 index e98b81588044..000000000000 --- a/nixos/modules/services/networking/antennas.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let cfg = config.services.antennas; -in - -{ - options = { - services.antennas = { - enable = mkEnableOption "Antennas"; - - tvheadendUrl = mkOption { - type = types.str; - default = "http://localhost:9981"; - description = "URL of Tvheadend."; - }; - - antennasUrl = mkOption { - type = types.str; - default = "http://127.0.0.1:5004"; - description = "URL of Antennas."; - }; - - tunerCount = mkOption { - type = types.int; - default = 6; - description = "Numbers of tuners in tvheadend."; - }; - - deviceUUID = mkOption { - type = types.str; - default = "2f70c0d7-90a3-4429-8275-cbeeee9cd605"; - description = "Device tuner UUID. Change this if you are running multiple instances."; - }; - }; - }; - - config = mkIf cfg.enable { - systemd.services.antennas = { - description = "Antennas HDHomeRun emulator for Tvheadend."; - wantedBy = [ "multi-user.target" ]; - - # Config - environment = { - TVHEADEND_URL = cfg.tvheadendUrl; - ANTENNAS_URL = cfg.antennasUrl; - TUNER_COUNT = toString cfg.tunerCount; - DEVICE_UUID = cfg.deviceUUID; - }; - - serviceConfig = { - ExecStart = "${pkgs.antennas}/bin/antennas"; - - # Hardening - CapabilityBoundingSet = [ "" ]; - DynamicUser = true; - LockPersonality = true; - ProcSubset = "pid"; - PrivateDevices = true; - PrivateUsers = true; - PrivateTmp = true; - ProtectClock = true; - ProtectControlGroups = true; - ProtectHome = true; - ProtectHostname = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - ProtectProc = "invisible"; - ProtectSystem = "strict"; - RestrictNamespaces = true; - RestrictRealtime = true; - }; - }; - }; -} diff --git a/pkgs/servers/antennas/default.nix b/pkgs/servers/antennas/default.nix deleted file mode 100644 index f9db26ab93e4..000000000000 --- a/pkgs/servers/antennas/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "antennas"; - version = "4.2.0"; - - src = fetchFromGitHub { - owner = "jfarseneau"; - repo = "antennas"; - rev = "v${version}"; - hash = "sha256-UQ+wvm7+x/evmtGwzCkUkrrDMCIZzUL4iSkLmYKJ3Mc="; - }; - - npmDepsHash = "sha256-D5ss7nCDY3ogZy64iFqLVKbmibAg7C/A+rEHJaE9c2U="; - - dontNpmBuild = true; - - doCheck = true; - - checkPhase = '' - runHook preCheck - - npm run test - - runHook postCheck - ''; - - meta = { - description = "HDHomeRun emulator for Plex DVR to connect to Tvheadend"; - homepage = "https://github.com/jfarseneau/antennas"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ bachp ]; - mainProgram = "antennas"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b71bd5483295..5ba24464de62 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -110,6 +110,7 @@ mapAliases ({ ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16 ansible_2_13 = throw "Ansible 2.13 goes end of life in 2023/11"; # Added 2023-12-30 ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11 + antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21 androidndkPkgs_23b = lib.warn "The package set `androidndkPkgs_23b` has been renamed to `androidndkPkgs_23`." androidndkPkgs_23; # Added 2024-07-21 apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12 apacheKafka_2_8 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca628fe80bf3..6ef13babfd59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3379,8 +3379,6 @@ with pkgs; httpServer = true; }; - antennas = callPackage ../servers/antennas { }; - apg = callPackage ../tools/security/apg { }; apt-dater = callPackage ../tools/package-management/apt-dater {