From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 05 04:01:53 2022 Received: (at 56983) by debbugs.gnu.org; 5 Aug 2022 08:01:53 +0000 Received: from localhost ([127.0.0.1]:56058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oJsHI-0005Jc-LL for submit@debbugs.gnu.org; Fri, 05 Aug 2022 04:01:53 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:57425) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oJsHG-0005JT-S2 for 56983@debbugs.gnu.org; Fri, 05 Aug 2022 04:01:51 -0400 Received: from lprikler-laptop.ist.intra (gw.ist.tugraz.at [129.27.202.101]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4LzdN74h8tz1LZWB; Fri, 5 Aug 2022 10:01:43 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4LzdN74h8tz1LZWB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1659686503; bh=82R8c59+eOb+e5ei88ZpYMAUJM0U2HxMfgkUazm3tXE=; h=Subject:From:To:Date:In-Reply-To:References:From; b=rhHarH61sLeU14XpXiqk9T0bGelHas7Wn3ttymCFTlKleyOHAgumTOgDIPg9xc3Z6 PFkswhKGSLqPR6F13+xyuvs5c6WAaYoHIvVbQdg6ksZU+qpctDtFZAoSI9qSW8nC0i rsMyVlhVDLjWeMjkeNnxXg/AGoBZS+vXAPl5sfMo= Message-ID: <26f9b3120f00ca03839ac9a8a974a61759bfcff4.camel@ist.tugraz.at> Subject: Re: [PATCH] gnu: yt-dlp: Update to 2022.07.18, use gexps and new style inputs. From: Liliana Marie Prikler To: kiasoc5 , 56983@debbugs.gnu.org Date: Fri, 05 Aug 2022 10:01:42 +0200 In-Reply-To: <20220805053011.387828-1-kiasoc5@disroot.org> References: <20220805053011.387828-1-kiasoc5@disroot.org> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: waObeELIUl4ypBWmcn/8wQ X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 56983 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Am Freitag, dem 05.08.2022 um 01:30 -0400 schrieb kiasoc5: > * gnu/packages/video.scm (yt-dlp): Update to 2022.07.18. -- Split -- > [arguments]: Use gexps. > [inputs]: Use new style. > [native-inputs]: Likewise. For the second patch, use "gnu: yt-dlp: Use new package style." as title. > --- >  gnu/packages/video.scm | 70 ++++++++++++++++++++---------------------- >  1 file changed, 34 insertions(+), 36 deletions(-) > > diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm > index 04049fd9c8..8cd6d03688 100644 > --- a/gnu/packages/video.scm > +++ b/gnu/packages/video.scm > @@ -2474,7 +2474,7 @@ (define-public youtube-dl >  (define-public yt-dlp >    (package/inherit youtube-dl >      (name "yt-dlp") > -    (version "2022.06.22.1") > +    (version "2022.07.18") >      (source (origin >                (method url-fetch) >                (uri (string-append "https://github.com/yt-dlp/yt-dlp/" > @@ -2482,7 +2482,7 @@ (define-public yt-dlp >                                    version "/yt-dlp.tar.gz")) >                (sha256 >                 (base32 > -                > "1nr6g3dhvjc10jzhyvgjrrxqhsgi3hiw8bswp8bi6bscimd9vhps")) > +                > "1wmzfqhysx1mqdba4ikvm6nbahasihi4xgqwqad20y3vs701slyj")) >                (snippet >                 '(begin >                    ;; Delete the pre-generated files, except for the > man page Haven't checked the hash, but on the premise that it's good, LGTM. -- Split -- > @@ -2497,40 +2497,38 @@ (define-public yt-dlp >       (substitute-keyword-arguments (package-arguments youtube-dl) >         ((#:tests? _) #t) >         ((#:phases phases) > -        `(modify-phases ,phases > -           ;; See the comment for the corresponding phase in > youtube-dl. > -           (replace 'default-to-the-ffmpeg-input > -             (lambda _ > -               (substitute* "yt_dlp/postprocessor/ffmpeg.py" > -                 (("\\.get_param\\('ffmpeg_location'\\)" match) > -                  (format #f "~a or '~a'" match (which > "ffmpeg")))))) > -           (replace 'build-generated-files > -             (lambda _ > -               ;; Avoid the yt-dlp.1 target, which requires pandoc. > -               (invoke "make" "PYTHON=python" "yt-dlp" > "completions"))) > -           (replace 'fix-the-data-directories > -             (lambda* (#:key outputs #:allow-other-keys) > -               (let ((prefix (assoc-ref outputs "out"))) > -                 (substitute* "setup.py" > -                   (("'etc/") > -                    (string-append "'" prefix "/etc/")) > -                   (("'share/") > -                    (string-append "'" prefix "/share/")))))) > -           (delete 'install-completion) > -           (replace 'check > -             (lambda* (#:key tests? #:allow-other-keys) > -               (when tests? > -                 (invoke "pytest" "-k" "not download")))))))) > -    (inputs > -     `(("python-brotli" ,python-brotli) > -       ("python-certifi" ,python-certifi) > -       ("python-mutagen" ,python-mutagen) > -       ("python-pycryptodomex" ,python-pycryptodomex) > -       ("python-websockets" ,python-websockets) > -       ,@(package-inputs youtube-dl))) > -    (native-inputs > -     `(("python-pytest" ,python-pytest) > -       ,@(package-native-inputs youtube-dl))) > +         #~(modify-phases #$phases > +            ;; See the comment for the corresponding phase in > youtube-dl. > +            (replace 'default-to-the-ffmpeg-input > +              (lambda _ > +                (substitute* "yt_dlp/postprocessor/ffmpeg.py" > +                  (("\\.get_param\\('ffmpeg_location'\\)" match) > +                   (format #f "~a or '~a'" match (which > "ffmpeg")))))) > +            (replace 'build-generated-files > +              (lambda _ > +                ;; Avoid the yt-dlp.1 target, which requires pandoc. > +                (invoke "make" "PYTHON=python" "yt-dlp" > "completions"))) > +            (replace 'fix-the-data-directories > +              (lambda* (#:key outputs #:allow-other-keys) > +                (let ((prefix (assoc-ref outputs "out"))) > +                  (substitute* "setup.py" > +                    (("'etc/") > +                     (string-append "'" prefix "/etc/")) > +                    (("'share/") > +                     (string-append "'" prefix "/share/")))))) > +            (delete 'install-completion) > +            (replace 'check > +              (lambda* (#:key tests? #:allow-other-keys) > +                (when tests? > +                  (invoke "pytest" "-k" "not download")))))))) The indentation here seems a little off. Did you TAB in Emacs? > +    (inputs (modify-inputs (package-inputs youtube-dl) > +              (append python-brotli > +                      python-certifi > +                      python-mutagen > +                      python-pycryptodomex > +                      python-websockets))) > +    (native-inputs (modify-inputs (package-native-inputs youtube-dl) > +                     (append python-pytest))) LGTM. Cheers