vdrPlugins: updates for 24.11 (#353084)

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;
+  };
+}

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;
   };
-
 }

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)" ];
 

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";