[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into staging
|
From: |
guix-commits |
|
Subject: |
01/02: Merge branch 'master' into staging |
|
Date: |
Sun, 8 Jan 2023 13:45:13 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit da91e790fdf4053a1503738e69f88c4b2054b096
Merge: 9123bb0fba 8cca1a35bc
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Jan 8 19:32:17 2023 +0100
Merge branch 'master' into staging
Makefile.am | 8 +-
doc/guix-cookbook.texi | 6 +-
doc/guix.texi | 83 +-
etc/kernels-manifest.scm | 4 +-
gnu/home/services.scm | 54 +-
gnu/home/services/shells.scm | 50 +-
gnu/local.mk | 13 +-
gnu/packages/admin.scm | 4 +-
gnu/packages/animation.scm | 133 +-
gnu/packages/antivirus.scm | 4 +-
gnu/packages/aspell.scm | 118 -
gnu/packages/astronomy.scm | 112 +-
gnu/packages/audio.scm | 35 +-
gnu/packages/aux-files/linux-libre/6.1-arm.conf | 10670 ++++++++
gnu/packages/aux-files/linux-libre/6.1-arm64.conf | 11198 ++++++++
gnu/packages/aux-files/linux-libre/6.1-i686.conf | 11536 ++++++++
gnu/packages/aux-files/linux-libre/6.1-x86_64.conf | 11681 ++++++++
gnu/packages/benchmark.scm | 50 +
gnu/packages/bioinformatics.scm | 459 +-
gnu/packages/bootloaders.scm | 224 +-
gnu/packages/chromium.scm | 2 +-
gnu/packages/compression.scm | 16 +
gnu/packages/cpp.scm | 148 +-
gnu/packages/cran.scm | 43 +-
gnu/packages/cross-base.scm | 74 +-
gnu/packages/databases.scm | 21 -
gnu/packages/display-managers.scm | 4 +-
gnu/packages/dlang.scm | 4 +-
gnu/packages/ebook.scm | 3 +-
gnu/packages/emacs-xyz.scm | 326 +-
gnu/packages/enchant.scm | 2 +-
gnu/packages/engineering.scm | 23 +-
gnu/packages/file-systems.scm | 4 +-
gnu/packages/firmware.scm | 9 +-
gnu/packages/freedesktop.scm | 102 +-
gnu/packages/game-development.scm | 27 +-
gnu/packages/games.scm | 11 +-
gnu/packages/geo.scm | 6 +-
gnu/packages/gettext.scm | 49 +-
gnu/packages/gimp.scm | 96 +-
gnu/packages/gnome-xyz.scm | 41 +
gnu/packages/gnome.scm | 60 +-
gnu/packages/gnuzilla.scm | 2 +-
gnu/packages/gpodder.scm | 53 +-
gnu/packages/graph.scm | 2 +-
gnu/packages/guile-xyz.scm | 105 +-
gnu/packages/hunspell.scm | 362 +-
gnu/packages/image-processing.scm | 28 +
gnu/packages/image.scm | 62 +-
gnu/packages/instrumentation.scm | 4 +-
gnu/packages/iso-codes.scm | 4 +-
gnu/packages/jami.scm | 12 -
gnu/packages/java.scm | 21 +
gnu/packages/kde-frameworks.scm | 2 +-
gnu/packages/kde-plasma.scm | 6 +-
gnu/packages/kde-systemtools.scm | 2 +-
gnu/packages/kodi.scm | 11 +-
gnu/packages/language.scm | 23 -
gnu/packages/libreoffice.scm | 233 +-
gnu/packages/linux.scm | 138 +-
gnu/packages/make-bootstrap.scm | 12 +-
gnu/packages/messaging.scm | 2 +-
gnu/packages/mpd.scm | 2 +-
gnu/packages/music.scm | 30 +-
gnu/packages/package-management.scm | 6 +-
gnu/packages/patches/guile-email-fix-tests.patch | 35 -
.../patches/ruby-sanitize-system-libxml.patch | 38 -
.../patches/wdl-link-libs-and-fix-jnetlib.patch | 53 +
gnu/packages/perl.scm | 96 +
gnu/packages/python-build.scm | 14 +-
gnu/packages/python-check.scm | 2 +-
gnu/packages/python-science.scm | 51 +
gnu/packages/python-web.scm | 25 +-
gnu/packages/python-xyz.scm | 127 +-
gnu/packages/ruby.scm | 574 +-
gnu/packages/scribus.scm | 1 +
gnu/packages/simulation.scm | 104 +
gnu/packages/ssh.scm | 4 +-
gnu/packages/stenography.scm | 38 +-
gnu/packages/suckless.scm | 8 +-
gnu/packages/sugar.scm | 322 +
gnu/packages/task-management.scm | 2 +-
gnu/packages/telegram.scm | 4 +-
gnu/packages/terminals.scm | 63 +-
gnu/packages/tex.scm | 29 +-
gnu/packages/text-editors.scm | 8 +-
gnu/packages/video.scm | 8 +-
gnu/packages/webkit.scm | 6 +-
gnu/packages/zig-xyz.scm | 65 +
gnu/services/certbot.scm | 2 +-
gnu/system.scm | 3 +
gnu/system/shadow.scm | 33 +-
guix/gnu-maintenance.scm | 31 +-
guix/import/stackage.scm | 15 +-
guix/import/test.scm | 88 +
guix/import/utils.scm | 24 +-
guix/scripts/environment.scm | 12 +-
guix/scripts/home.scm | 4 +-
guix/scripts/publish.scm | 25 +-
guix/substitutes.scm | 17 +
po/doc/guix-manual.de.po | 26552 +++++++++---------
po/doc/guix-manual.es.po | 26551 +++++++++---------
po/doc/guix-manual.fr.po | 26492 +++++++++---------
po/doc/guix-manual.pt_BR.po | 26476 +++++++++---------
po/doc/guix-manual.ru.po | 26857 ++++++++++---------
po/doc/guix-manual.zh_CN.po | 26449 +++++++++---------
po/guix/LINGUAS | 1 +
po/guix/de.po | 103 +-
po/guix/fi.po | 56 +-
po/guix/it.po | 3570 ++-
po/guix/{fi.po => ka.po} | 231 +-
po/guix/nl.po | 8 +-
po/guix/ru.po | 114 +-
po/guix/sk.po | 36 +-
po/guix/sv.po | 13 +-
po/guix/uk.po | 217 +-
po/packages/LINGUAS | 1 +
po/packages/fa.po | 19 +-
po/packages/{fa.po => uk.po} | 121 +-
tests/guix-home.sh | 4 +-
tests/guix-refresh.sh | 117 +
121 files changed, 133029 insertions(+), 81525 deletions(-)
diff --cc gnu/packages/image.scm
index a4ca328b5d,195d127b31..f48776469d
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@@ -2165,38 -2166,47 +2166,45 @@@ This package can be used to create @cod
(file-name (git-file-name name version))
(sha256
(base32
- "1yxmgjlxm1srm98zyj79bj8r8vmg67daqnq0ggcvxknq54plkznk"))))
+ "02zmb62g0yx6rfz4w1isyzfrckv5i7dzyz26rp2mspbx9w6v8j4r"))))
(build-system cmake-build-system)
(arguments
- (list #:configure-flags
- #~'("-DAVIF_CODEC_AOM=ON" "-DAVIF_CODEC_DAV1D=ON"
- #$@(if (string-prefix? "x86_64"
- (or (%current-target-system)
- (%current-system)))
- '("-DAVIF_CODEC_RAV1E=ON")
- '())
- "-DAVIF_BUILD_TESTS=ON")
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'install 'install-readme
- (lambda _
- (let ((doc (string-append #$output "/share/doc/libavif-"
- #$(package-version this-package))))
- (install-file "../source/README.md" doc)))))))
+ (list
+ #:configure-flags
+ #~(list "-DAVIF_CODEC_AOM=ON" "-DAVIF_CODEC_DAV1D=ON"
+ #$@(if (this-package-input "rav1e")
+ '("-DAVIF_CODEC_RAV1E=ON")
+ '())
+ "-DAVIF_BUILD_TESTS=ON" "-DAVIF_BUILD_APPS=ON")
+ #:phases
+ #~(modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "./aviftest" "../source/tests/data"))))
+ (add-after 'install 'install-readme
+ (lambda _
- (let ((doc (string-append #$output "/share/doc/libavif-"
#$version)))
++ (let ((doc (string-append #$output "/share/doc/libavif-"
++ #$(package-version this-package))))
+ (install-file "../source/README.md" doc))))
+ (add-after 'install 'split
+ (lambda _
+ (let* ((avifenc (string-append #$output "/bin/avifenc"))
+ (avifenc* (string-append #$output:tools "/bin/avifenc"))
+ (avifdec (string-append #$output "/bin/avifdec"))
+ (avifdec* (string-append #$output:tools "/bin/avifdec")))
+ (mkdir-p (string-append #$output:tools "/bin"))
+
+ (for-each (lambda (old new)
+ (copy-file old new)
+ (delete-file old)
+ (chmod new #o555))
+ (list avifenc avifdec)
+ (list avifenc* avifdec*))))))))
+ (native-inputs (list googletest))
(inputs
(append
- (list dav1d
- libaom
- libjpeg-turbo
- libpng
- zlib)
- ;; XXX: rav1e depends on rust, which currently only works on x86_64.
- ;; See also the related configure flag when changing this.
- (if (string-prefix? "x86_64" (or (%current-target-system)
- (%current-system)))
- (list rav1e)
- '())))
+ (if (member (%current-system) (package-transitive-supported-systems
rav1e))
+ (list rav1e) '())
+ (list dav1d libaom zlib libpng libjpeg-turbo)))
+ (outputs (list "out"
+ "tools")) ; avifenc & avifdec
(synopsis "Encode and decode AVIF files")
(description "Libavif is a C implementation of @acronym{AVIF, the AV1
Image
File Format}. It can encode and decode all YUV formats and bit depths
supported
diff --cc gnu/packages/video.scm
index 182c1e5add,fc430b9196..4dc50b31a3
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@@ -1924,10 -1946,9 +1924,10 @@@ videoformats depend on the configuratio
"https://download.videolan.org/pub/videolan/vlc/";
(car (string-split version #\-))
"/vlc-" version ".tar.xz"))
+ (patches (search-patches "vlc-dav1d-compat.patch"))
(sha256
(base32
- "0cs1vnv91mg7p6253v6wms3zlz91xzphpwaw14dmrd2gibc64nlc"))))
+ "1v7db9icrb12yz7banq2wvpjpvqfrj031yj1kf5smn35qcwl82ap"))))
(build-system gnu-build-system)
(native-inputs
(list flex bison gettext-minimal pkg-config))