From 0a2b99bbc2cc727dcdacb3196df67114269565f1 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 14 Jan 2023 12:49:17 +0100 Subject: [PATCH] dtv-scan-tables: rename to `dtv-scan-tables_tvheadend` This happens in preparation of the introduction of an alternate version, maintained by linuxtv. --- .../misc/dtv-scan-tables/{default.nix => tvheadend.nix} | 2 +- pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) rename pkgs/data/misc/dtv-scan-tables/{default.nix => tvheadend.nix} (97%) diff --git a/pkgs/data/misc/dtv-scan-tables/default.nix b/pkgs/data/misc/dtv-scan-tables/tvheadend.nix similarity index 97% rename from pkgs/data/misc/dtv-scan-tables/default.nix rename to pkgs/data/misc/dtv-scan-tables/tvheadend.nix index 0c53436f8e5f..b2edc34e5ea1 100644 --- a/pkgs/data/misc/dtv-scan-tables/default.nix +++ b/pkgs/data/misc/dtv-scan-tables/tvheadend.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "dtv-scan-tables"; - version = "20221027"; + version = "20221027-tvheadend"; src = fetchFromGitHub { owner = "tvheadend"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b78cb7e02726..0cf56a4936b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -455,7 +455,7 @@ with pkgs; dsq = callPackage ../tools/misc/dsq { }; - dtv-scan-tables = callPackage ../data/misc/dtv-scan-tables { }; + dtv-scan-tables_tvheadend = callPackage ../data/misc/dtv-scan-tables/tvheadend.nix { }; dufs = callPackage ../servers/http/dufs { inherit (darwin.apple_sdk.frameworks) Security; @@ -37818,7 +37818,9 @@ with pkgs; tvbrowser-bin = callPackage ../applications/misc/tvbrowser/bin.nix { }; - tvheadend = callPackage ../servers/tvheadend { }; + tvheadend = callPackage ../servers/tvheadend { + dtv-scan-tables = dtv-scan-tables_tvheadend; + }; twiggy = callPackage ../development/tools/twiggy { };