diff options
author | Marius Bakke <marius@gnu.org> | 2022-09-07 18:20:23 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2022-09-07 18:20:23 +0200 |
commit | 6cfb2e6270b2759fb98a0de665235bcbb9b9eccf (patch) | |
tree | 83c467772a94cbf72f96b26b08f0a29d1822b1c1 /gnu/packages/video.scm | |
parent | 92fdda5a6351dd5246b65165547d50d0b827cef3 (diff) | |
parent | 453e7dd8c4b9422a7c80e3b3e75589b6471f5af1 (diff) | |
download | guix-6cfb2e6270b2759fb98a0de665235bcbb9b9eccf.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/video.scm')
-rw-r--r-- | gnu/packages/video.scm | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 3393a9db65..15cfd58f68 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1566,14 +1566,14 @@ operate properly.") (define-public ffmpeg-5 (package (name "ffmpeg") - (version "5.1") + (version "5.1.1") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "00wbd5skv6ba5yqq4ca505ncckhvpzwflcsall7madg2bsmnmssm")))) + "0d84pjmlb5ss1yybxic3wlyrr31wcsg29ysqx5qiwlcnqkw3zgwm")))) (build-system gnu-build-system) (inputs (append @@ -2482,7 +2482,7 @@ YouTube.com and many more sites.") (define-public yt-dlp (package/inherit youtube-dl (name "yt-dlp") - (version "2022.08.08") + (version "2022.09.01") (source (origin (method git-fetch) @@ -2491,7 +2491,7 @@ YouTube.com and many more sites.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "07qz1zdndlpki0asw35zk5hdjcwpl3n1g54nxg4yb1iykbyv7rll")))) + (base32 "0h46624zdqhjf79m78303v00m2r013yaccanv0010rls17v7y6pq")))) (arguments (substitute-keyword-arguments (package-arguments youtube-dl) ((#:tests? _) (not (%current-target-system))) @@ -5210,7 +5210,12 @@ result in several formats: (string-append name "-" version ".tar.gz")) (sha256 (base32 - "006bfcmjwg0phg8gc25b1sl2ngjrb2bh1b3fd0s5gbf9nlkr8qsn")))) + "006bfcmjwg0phg8gc25b1sl2ngjrb2bh1b3fd0s5gbf9nlkr8qsn")) + (modules '((guix build utils))) + (snippet + '(substitute* "Cargo.toml" + (("\\[package\\]" m) + (string-append "cargo-features = [\"rust-version\"]\n" m)))))) (build-system cargo-build-system) (arguments `(;; Strip the '--release' flag to work around the doctest failures with |