From b948496d975bc5866b0c9b73af547a86ae4307e5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 21 Dec 2022 16:53:27 +0100 Subject: [PATCH] dtv-scan-tables: 2020-05-18 -> 2022-10-27 Extracted from tvheadend and exposed as top-level attribute. --- pkgs/data/misc/dtv-scan-tables/default.nix | 32 ++++++++++++++++++++++ pkgs/servers/tvheadend/default.nix | 14 +--------- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 35 insertions(+), 13 deletions(-) create mode 100644 pkgs/data/misc/dtv-scan-tables/default.nix diff --git a/pkgs/data/misc/dtv-scan-tables/default.nix b/pkgs/data/misc/dtv-scan-tables/default.nix new file mode 100644 index 000000000000..741823871f4a --- /dev/null +++ b/pkgs/data/misc/dtv-scan-tables/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchFromGitHub +, v4l-utils +}: + +stdenv.mkDerivation rec { + pname = "dtv-scan-tables"; + version = "20221027"; + + src = fetchFromGitHub { + owner = "tvheadend"; + repo = "dtv-scan-tables"; + rev = "2a3dbfbab129c00d3f131c9c2f06b2be4c06fec6"; + hash = "sha256-bJ+naUs3TDFul4PmpnWYld3j1Se+1X6U9jnECe3sno0="; + }; + + nativeBuildInputs = [ + v4l-utils + ]; + + installFlags = [ + "DATADIR=$(out)" + ]; + + meta = with lib; { + description = "Digital TV scan tables"; + homepage = "https://github.com/tvheadend/dtv-scan-tables"; + license = with licenses; [ gpl2Only lgpl21Only ]; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index b46588e41d7e..72945ffaedbb 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -13,6 +13,7 @@ , avahi , bzip2 , dbus +, dtv-scan-tables , ffmpeg , gettext , gnutar @@ -25,19 +26,6 @@ let version = "4.2.8"; - - dtv-scan-tables = stdenv.mkDerivation { - pname = "dtv-scan-tables"; - version = "2020-05-18"; - src = fetchFromGitHub { - owner = "tvheadend"; - repo = "dtv-scan-tables"; - rev = "e3138a506a064f6dfd0639d69f383e8e576609da"; - sha256 = "19ac9ds3rfc2xrqcywsbd1iwcpv7vmql7gp01iikxkzcgm2g2b6w"; - }; - nativeBuildInputs = [ v4l-utils ]; - installFlags = [ "DATADIR=$(out)" ]; - }; in stdenv.mkDerivation { pname = "tvheadend"; inherit version; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8e4e17ac52e..15f028b6da95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -458,6 +458,8 @@ with pkgs; dsq = callPackage ../tools/misc/dsq { }; + dtv-scan-tables = callPackage ../data/misc/dtv-scan-tables { }; + dufs = callPackage ../servers/http/dufs { inherit (darwin.apple_sdk.frameworks) Security; };