Merge pull request #309331 from Yarny0/dtv-scan-tables-update

dtv-scan-tables: update and migrate to by-name and finalAttrs
This commit is contained in:
Sandro 2024-06-26 01:06:53 +02:00 committed by GitHub
commit 9d4de0f96e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 10 deletions

View File

@ -4,13 +4,13 @@
, v4l-utils
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "dtv-scan-tables";
version = "2022-04-30-57ed29822750";
version = "2024-03-24-7098bdd27548";
src = fetchurl {
url = "https://linuxtv.org/downloads/${pname}/${pname}-${version}.tar.bz2";
hash = "sha256-amJoqjkkWTePo6E5IvwBWj+mP/gi9LDWTTPXE1Cm7J4=";
url = "https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${finalAttrs.version}.tar.bz2";
hash = "sha256-P0yJgbOkgpBms5arwNonDlx+Z0tdGQ6SUyoGlRoH6Y4=";
};
nativeBuildInputs = [
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
allowedReferences = [ ];
meta = with lib; {
meta = {
# git repo with current revision is here:
#downloadPage = "https://git.linuxtv.org/dtv-scan-tables.git";
# Weekly releases are supposed to be here
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
# but sometimes they lag behind several weeks or even months.
description = "Digital TV (DVB) channel/transponder scan tables";
homepage = "https://www.linuxtv.org/wiki/index.php/Dtv-scan-tables";
license = with licenses; [ gpl2Only lgpl21Only ];
license = with lib.licenses; [ gpl2Only lgpl21Only ];
longDescription = ''
When scanning for dvb channels,
most applications require an initial set of
@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
The package delivers a collection of transponder
tables ready to be used by software like "dvbv5-scan".
'';
maintainers = with maintainers; [ yarny ];
maintainers = with lib.maintainers; [ yarny ];
};
}
})

View File

@ -587,8 +587,6 @@ with pkgs;
dt = callPackage ../tools/text/dt { };
dtv-scan-tables = callPackage ../data/misc/dtv-scan-tables { };
dufs = callPackage ../servers/http/dufs { };
dynein = callPackage ../development/tools/database/dynein {