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..28528318c162 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,23 +44,23 @@ 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; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; 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}"; }; @@ -88,11 +90,11 @@ 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; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; @@ -101,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}"; }; @@ -136,18 +139,18 @@ 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; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; vnsiserver = stdenv.mkDerivation rec { pname = "vdr-vnsiserver"; - version = "1.8.0"; + version = "1.8.1"; buildInputs = [ vdr ]; @@ -155,17 +158,17 @@ 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; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; @@ -201,7 +204,7 @@ in { description = "VDR Text2Skin Plugin"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; @@ -222,11 +225,11 @@ 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; - 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..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,11 +40,11 @@ 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; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; } 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;