From 62c7443beb8221418eba1d987e5d78be85de8a16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Mon, 3 Oct 2022 09:46:19 +0200 Subject: [PATCH 1/7] vdr: Set platform to linux --- pkgs/applications/video/vdr/default.nix | 2 +- pkgs/applications/video/vdr/plugins.nix | 12 ++++++------ pkgs/applications/video/vdr/softhddevice/default.nix | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index 5584e63ab446..68750ac918cb 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -50,7 +50,7 @@ homepage = "http://www.tvdr.de/"; description = "Video Disc Recorder"; maintainers = [ maintainers.ck3d ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = platforms.linux; license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 6719b0412b82..9d25e03710e7 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -46,7 +46,7 @@ in { description = "DVB Frontend Status Monitor plugin for VDR"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; @@ -92,7 +92,7 @@ in { description = "MarkAd marks advertisements in VDR recordings."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; @@ -140,7 +140,7 @@ in { description = "Searchtimer and replacement of the VDR program menu"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; @@ -165,7 +165,7 @@ in { description = "VDR plugin to handle KODI clients."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; @@ -201,7 +201,7 @@ in { description = "VDR Text2Skin Plugin"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; @@ -226,7 +226,7 @@ in { description = "A plugin for VDR to access AVMs Fritz Box routers"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; } diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 1b7f4128ca61..e09e01d1ea7c 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { description = "VDR SoftHDDevice Plug-in"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; } From 0aede75ecf9db5bc07119021fbfb3f51101b5fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Mon, 3 Oct 2022 10:26:27 +0200 Subject: [PATCH 2/7] vdrPlugins.femon: switch src --- pkgs/applications/video/vdr/plugins.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 9d25e03710e7..d4c989182bcf 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -32,9 +32,11 @@ in { buildInputs = [ vdr ]; - src = fetchurl { - url = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${pname}-${version}.tgz"; - sha256 = "1hra1xslj8s68zbyr8zdqp8yap0aj1p6rxyc6cwy1j122kwcnapp"; + src = fetchFromGitHub { + repo = "vdr-plugin-femon"; + owner = "rofafor"; + sha256 = "sha256-0qBMYgNKk7N9Bj8fAoOokUo+G9gfj16N5e7dhoKRBqs="; + rev = "v${version}"; }; postPatch = "substituteInPlace Makefile --replace /bin/true true"; @@ -42,7 +44,7 @@ in { makeFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { - homepage = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/"; + inherit (src.meta) homepage; description = "DVB Frontend Status Monitor plugin for VDR"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; From fe181e0f943b41060cd90c777d34b69fb73aa0e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Mon, 3 Oct 2022 10:27:08 +0200 Subject: [PATCH 3/7] vdrPlugins.markad: 3.0.25 -> 3.0.26 --- pkgs/applications/video/vdr/plugins.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index d4c989182bcf..117043e03672 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -55,12 +55,12 @@ in { markad = stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "3.0.25"; + version = "3.0.26"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - sha256 = "sha256-m7cUAxwXj62spelHYH6uTIoViSavSR0d4psr7+KLJg8="; + sha256 = "sha256-0J6XeLgr9IZSWsheQZWVNRLIxp8iyCvR9Y0z/yrbTnI="; rev = "v${version}"; }; @@ -90,7 +90,7 @@ in { installFlags = buildFlags; meta = with lib; { - homepage = "https://github.com/kfb77/vdr-plugin-markad"; + inherit (src.meta) homepage; description = "MarkAd marks advertisements in VDR recordings."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; From 2de6316bbfc1028309210aac1f608d8629115b84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Mon, 3 Oct 2022 10:27:45 +0200 Subject: [PATCH 4/7] vdrPlugins.epgsearch: switch src --- pkgs/applications/video/vdr/plugins.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 117043e03672..e3f0c4a3d8cb 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -103,8 +103,9 @@ in { pname = "vdr-epgsearch"; version = "2.4.1"; - src = fetchgit { - url = "git://projects.vdr-developer.org/vdr-plugin-epgsearch.git"; + src = fetchFromGitHub { + repo = "vdr-plugin-epgsearch"; + owner = "vdr-projects"; sha256 = "sha256-UlbPCkUFN0Gyxjw9xq2STFTDZRVcPPNjadSQd4o2o9U="; rev = "v${version}"; }; @@ -138,7 +139,7 @@ in { outputs = [ "out" "man" ]; meta = with lib; { - homepage = "http://winni.vdr-developer.org/epgsearch"; + inherit (src.meta) homepage; description = "Searchtimer and replacement of the VDR program menu"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; From 360892caf563ea0c2eb9a86327eb4701775287ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Mon, 3 Oct 2022 10:28:18 +0200 Subject: [PATCH 5/7] vdrPlugins.vnsiserver: 1.8.0 -> 1.8.1 --- pkgs/applications/video/vdr/plugins.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index e3f0c4a3d8cb..d43a78a04a4d 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -150,7 +150,7 @@ in { vnsiserver = stdenv.mkDerivation rec { pname = "vdr-vnsiserver"; - version = "1.8.0"; + version = "1.8.1"; buildInputs = [ vdr ]; @@ -158,13 +158,13 @@ in { src = fetchFromGitHub { repo = "vdr-plugin-vnsiserver"; - owner = "FernetMenta"; - rev = "v${version}"; - sha256 = "0n7idpxqx7ayd63scl6xwdx828ik4kb2mwz0c30cfjnmnxxd45lw"; + owner = "vdr-projects"; + rev = version; + sha256 = "sha256-1C0Z7NoU+FNch4BhrAcbJdzVvGuH1YDaxJ+9PflR78E="; }; meta = with lib; { - homepage = "https://github.com/FernetMenta/vdr-plugin-vnsiserver"; + inherit (src.meta) homepage; description = "VDR plugin to handle KODI clients."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; From 59bb395f1c527afa9e5adbd51c3972183ac1d650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Mon, 3 Oct 2022 10:29:13 +0200 Subject: [PATCH 6/7] vdrPlugins.softhddevice: 1.9.0 -> 1.9.2 --- pkgs/applications/video/vdr/softhddevice/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index e09e01d1ea7c..187a493b2502 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-IqG1Jr+fV4MMyTTOUGY34HNqS8qvAH+CSi2IEyVGVFo="; + sha256 = "sha256-2kh8qMxaAjekvgjMVRmm1nPzlN2wjY/6qYjFyo6CLlg="; rev = "v${version}"; }; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/ua0lnj/vdr-plugin-softhddevice"; + inherit (src.meta) homepage; description = "VDR SoftHDDevice Plug-in"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; From 7fae1d6f7a1c702040133ee04083f9ee08aa8a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Mon, 3 Oct 2022 10:29:51 +0200 Subject: [PATCH 7/7] vdrPlugins: get homepage from src --- pkgs/applications/video/vdr/plugins.nix | 2 +- pkgs/applications/video/vdr/streamdev/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index d43a78a04a4d..28528318c162 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -225,7 +225,7 @@ in { installFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { - homepage = "https://github.com/jowi24/vdr-fritz"; + inherit (src.meta) homepage; description = "A plugin for VDR to access AVMs Fritz Box routers"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; diff --git a/pkgs/applications/video/vdr/streamdev/default.nix b/pkgs/applications/video/vdr/streamdev/default.nix index 6ef00deab096..de45b31d8690 100644 --- a/pkgs/applications/video/vdr/streamdev/default.nix +++ b/pkgs/applications/video/vdr/streamdev/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; meta = with lib;{ - homepage = "https://github.com/vdr-projects/vdr-plugin-streamdev"; + inherit (src.meta) homepage; description = "This PlugIn is a VDR implementation of the VTP (Video Transfer Protocol) Version 0.0.3 (see file PROTOCOL) and a basic HTTP Streaming Protocol."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2;