From bde97e0417964f1ae215319ac32874ab6d8bac76 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Fri, 22 Jan 2016 18:04:52 +0000 Subject: [PATCH 1/2] get_iplayer: remove irrelevant warning --- pkgs/applications/misc/get_iplayer/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 08fad5a021d0..3786f6effb1b 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -8,10 +8,15 @@ buildPerlPackage { preConfigure = "touch Makefile.PL"; doCheck = false; + patchPhase = '' + sed -e 's|^update_script|#update_script|' \ + -e '/WARNING.*updater/d' \ + -i get_iplayer + ''; + installPhase = '' mkdir -p $out/bin cp get_iplayer $out/bin - sed -i 's|^update_script|#update_script|' $out/bin/get_iplayer wrapProgram $out/bin/get_iplayer --suffix PATH : ${ffmpeg}/bin:${flvstreamer}/bin:${vlc}/bin:${rtmpdump}/bin --prefix PERL5LIB : $PERL5LIB ''; From 546679f2e30c12bd91b24d1ada95b5cfd8b9bb59 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Fri, 22 Jan 2016 18:05:27 +0000 Subject: [PATCH 2/2] get_iplayer: 2.86 -> 2.94 --- pkgs/applications/misc/get_iplayer/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 3786f6effb1b..488a9a3732e2 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, vlc, rtmpdump}: buildPerlPackage { - name = "get_iplayer-2.86"; + name = "get_iplayer-2.94"; buildInputs = [makeWrapper perl]; - propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP]; + propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP XMLSimple]; preConfigure = "touch Makefile.PL"; doCheck = false; @@ -21,8 +21,8 @@ buildPerlPackage { ''; src = fetchurl { - url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.86.tar.gz; - sha256 = "0zhcw0ikxrrz1jayx7jjgxmdf7gzk4pmzfvpraxmv64xwzgc1sc1"; + url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.94.tar.gz; + sha256 = "16p0bw879fl8cs6rp37g1hgrcai771z6rcqk2nvm49kk39dx1zi4"; }; }