From 709c75309a5f7b94c1d97afdadb9ef2508859a21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 2 Nov 2024 11:34:48 +0100 Subject: [PATCH 1/3] vdr-markad: 3.6.0 -> 4.2.5 --- .../applications/video/vdr/markad/default.nix | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix index c86a8ff29643..96375c04a5aa 100644 --- a/pkgs/applications/video/vdr/markad/default.nix +++ b/pkgs/applications/video/vdr/markad/default.nix @@ -1,21 +1,25 @@ -{ lib -, stdenv -, vdr -, fetchFromGitHub -, ffmpeg +{ + lib, + stdenv, + vdr, + fetchFromGitHub, + ffmpeg, }: stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "3.6.0"; + version = "4.2.5"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - sha256 = "sha256-O958GNQI6Z+m4sIJfGQzLaCrzyrdpn+ZY8COx7RoUZs="; + hash = "sha256-zN52wyER1PuMr0oAj/BWaiX7kHqq5qW8JZqGXrVPtbU="; rev = "V${version}"; }; - buildInputs = [ vdr ffmpeg ]; + buildInputs = [ + vdr + ffmpeg + ]; postPatch = '' substituteInPlace command/Makefile --replace '/usr' "" @@ -35,13 +39,11 @@ stdenv.mkDerivation rec { installFlags = buildFlags; - meta = with lib; { + meta = { inherit (src.meta) homepage; description = "Plugin for VDR that marks advertisements"; mainProgram = "markad"; - maintainers = [ maintainers.ck3d ]; - license = licenses.gpl2; - inherit (vdr.meta) platforms; + maintainers = [ lib.maintainers.ck3d ]; + inherit (vdr.meta) platforms license; }; - } From 4986f2e594270b5cd6d6b84a9e859da4298d1b85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 2 Nov 2024 11:37:48 +0100 Subject: [PATCH 2/3] vdr-epgsearch: 2.4.2 -> 2.4.3 --- .../video/vdr/epgsearch/default.nix | 61 +++++++++++++++++++ pkgs/applications/video/vdr/plugins.nix | 56 ++--------------- 2 files changed, 65 insertions(+), 52 deletions(-) create mode 100644 pkgs/applications/video/vdr/epgsearch/default.nix diff --git a/pkgs/applications/video/vdr/epgsearch/default.nix b/pkgs/applications/video/vdr/epgsearch/default.nix new file mode 100644 index 000000000000..208ce7fb953f --- /dev/null +++ b/pkgs/applications/video/vdr/epgsearch/default.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + fetchFromGitHub, + vdr, + util-linux, + groff, + perl, + pcre, +}: +stdenv.mkDerivation rec { + pname = "vdr-epgsearch"; + version = "2.4.3"; + + src = fetchFromGitHub { + repo = "vdr-plugin-epgsearch"; + owner = "vdr-projects"; + sha256 = "sha256-hOMISobeEt/jB4/18t5ZeN+EcPHhm8Jz8Kar72KYS3E="; + rev = "v${version}"; + }; + + postPatch = '' + for f in *.sh; do + patchShebangs "$f" + done + ''; + + nativeBuildInputs = [ + perl # for pod2man and pos2html + util-linux + groff + ]; + + buildInputs = [ + vdr + pcre + ]; + + buildFlags = [ + "SENDMAIL=" + "REGEXLIB=pcre" + ]; + + installFlags = [ + "DESTDIR=$(out)" + ]; + + outputs = [ + "out" + "man" + ]; + + meta = { + inherit (src.meta) homepage; + description = "Searchtimer and replacement of the VDR program menu"; + mainProgram = "createcats"; + maintainers = [ lib.maintainers.ck3d ]; + license = lib.licenses.gpl2; + inherit (vdr.meta) platforms; + }; +} diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index a0d12156f774..ef497d5a8c9e 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -1,6 +1,6 @@ { lib, stdenv, vdr, fetchFromGitHub -, graphicsmagick, pcre -, boost, libgcrypt, perl, util-linux, groff, ncurses +, graphicsmagick +, boost, libgcrypt, ncurses , callPackage }: let mkPlugin = name: stdenv.mkDerivation { @@ -12,6 +12,8 @@ }; in { + epgsearch = callPackage ./epgsearch {}; + markad = callPackage ./markad {}; nopacity = callPackage ./nopacity {}; @@ -57,56 +59,6 @@ in { }; - epgsearch = stdenv.mkDerivation rec { - pname = "vdr-epgsearch"; - version = "2.4.2"; - - src = fetchFromGitHub { - repo = "vdr-plugin-epgsearch"; - owner = "vdr-projects"; - sha256 = "sha256-C+WSdGTnDBTWLvpjG5GBaK8pYbht431nL5iaL/a0H4Y="; - rev = "v${version}"; - }; - - postPatch = '' - for f in *.sh; do - patchShebangs "$f" - done - ''; - - nativeBuildInputs = [ - perl # for pod2man and pos2html - util-linux - groff - ]; - - buildInputs = [ - vdr - pcre - ]; - - buildFlags = [ - "SENDMAIL=" - "REGEXLIB=pcre" - ]; - - installFlags = [ - "DESTDIR=$(out)" - ]; - - outputs = [ "out" "man" ]; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Searchtimer and replacement of the VDR program menu"; - mainProgram = "createcats"; - maintainers = [ maintainers.ck3d ]; - license = licenses.gpl2; - inherit (vdr.meta) platforms; - }; - - }; - vnsiserver = stdenv.mkDerivation rec { pname = "vdr-vnsiserver"; version = "1.8.3"; From 68a437ea0f5fced96b24c8b352c429deaebc7d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 2 Nov 2024 11:39:47 +0100 Subject: [PATCH 3/3] vdr-skin-nopacity: 1.1.17 -> 1.1.18 --- .../applications/video/vdr/nopacity/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/vdr/nopacity/default.nix b/pkgs/applications/video/vdr/nopacity/default.nix index c413206b8257..6c04f49fb49a 100644 --- a/pkgs/applications/video/vdr/nopacity/default.nix +++ b/pkgs/applications/video/vdr/nopacity/default.nix @@ -1,16 +1,25 @@ -{ stdenv, lib, fetchFromGitLab, vdr, graphicsmagick }: +{ + stdenv, + lib, + fetchFromGitLab, + vdr, + graphicsmagick, +}: stdenv.mkDerivation rec { pname = "vdr-skin-nopacity"; - version = "1.1.17"; + version = "1.1.18"; src = fetchFromGitLab { repo = "SkinNopacity"; owner = "kamel5"; - hash = "sha256-QJKlh5my7e+H5R4E0fCWB/PtwIAXCXw4drQEQzhzfag="; + hash = "sha256-Aq5PtD6JV8jdBURADl9KkdVQvfmeQD/Zh62g5ansuC4="; rev = version; }; - buildInputs = [ vdr graphicsmagick ]; + buildInputs = [ + vdr + graphicsmagick + ]; installFlags = [ "DESTDIR=$(out)" ];