mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-11 15:27:20 +03:00
Merge pull request #219387 from Yarny0/dtv-scan-tables
dtv-scan-tables: use linuxtv-version, drop tvheadend-version
This commit is contained in:
commit
c021277a75
@ -4,18 +4,12 @@
|
||||
, v4l-utils
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
version_ = "2022-04-30-57ed29822750";
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dtv-scan-tables";
|
||||
version = "${version_}-linuxtv";
|
||||
version = "2022-04-30-57ed29822750";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://linuxtv.org/downloads/${pname}/${pname}-${version_}.tar.bz2";
|
||||
url = "https://linuxtv.org/downloads/${pname}/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-amJoqjkkWTePo6E5IvwBWj+mP/gi9LDWTTPXE1Cm7J4=";
|
||||
};
|
||||
|
@ -1,45 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, v4l-utils
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dtv-scan-tables";
|
||||
version = "20221027-tvheadend";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tvheadend";
|
||||
repo = "dtv-scan-tables";
|
||||
rev = "2a3dbfbab129c00d3f131c9c2f06b2be4c06fec6";
|
||||
hash = "sha256-bJ+naUs3TDFul4PmpnWYld3j1Se+1X6U9jnECe3sno0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
v4l-utils
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=$(out)"
|
||||
];
|
||||
|
||||
allowedReferences = [ ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Digital TV (DVB) channel/transponder scan tables";
|
||||
homepage = "https://github.com/tvheadend/dtv-scan-tables";
|
||||
license = with licenses; [ gpl2Only lgpl21Only ];
|
||||
longDescription = ''
|
||||
When scanning for dvb channels,
|
||||
most applications require an initial set of
|
||||
transponder coordinates (frequencies etc.).
|
||||
These coordinates differ, depending of the
|
||||
receiver's location or on the satellite.
|
||||
The package delivers a collection of transponder
|
||||
tables ready to be used by software like "dvbv5-scan".
|
||||
The package at hand is maintained and used by tvheadend,
|
||||
it is a fork of the original one hosted by linuxtv.org.
|
||||
'';
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
@ -388,6 +388,8 @@ mapAliases ({
|
||||
double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22
|
||||
draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14
|
||||
dragon-drop = throw "'dragon-drop' has been removed in favor of 'xdragon'"; # Added 2022-04-10;
|
||||
dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03
|
||||
dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03
|
||||
dust = throw "dust has been removed: abandoned by upstream"; # Added 2022-04-21
|
||||
dvb_apps = throw "dvb_apps has been removed"; # Added 2020-11-03
|
||||
dwarf_fortress = throw "'dwarf_fortress' has been renamed to/replaced by 'dwarf-fortress'"; # Converted to throw 2022-02-22
|
||||
|
@ -492,9 +492,7 @@ with pkgs;
|
||||
|
||||
dsq = callPackage ../tools/misc/dsq { };
|
||||
|
||||
dtv-scan-tables_linuxtv = callPackage ../data/misc/dtv-scan-tables/linuxtv.nix { };
|
||||
dtv-scan-tables_tvheadend = callPackage ../data/misc/dtv-scan-tables/tvheadend.nix { };
|
||||
dtv-scan-tables = dtv-scan-tables_linuxtv;
|
||||
dtv-scan-tables = callPackage ../data/misc/dtv-scan-tables { };
|
||||
|
||||
dufs = callPackage ../servers/http/dufs {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
@ -38685,9 +38683,7 @@ with pkgs;
|
||||
|
||||
tvbrowser = callPackage ../applications/misc/tvbrowser { };
|
||||
|
||||
tvheadend = callPackage ../servers/tvheadend {
|
||||
dtv-scan-tables = dtv-scan-tables_tvheadend;
|
||||
};
|
||||
tvheadend = callPackage ../servers/tvheadend { };
|
||||
|
||||
twiggy = callPackage ../development/tools/twiggy { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user