guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: Merge branch 'master' into staging


From: guix-commits
Subject: 01/01: Merge branch 'master' into staging
Date: Tue, 27 Dec 2022 19:03:47 -0500 (EST)

mbakke pushed a commit to branch staging
in repository guix.

commit ec0fbb471dfc6f72796da9ebafbb0630daa91267
Merge: f5ef7d34e4 0cb8f7125b
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Wed Dec 28 01:02:47 2022 +0100

    Merge branch 'master' into staging

 .guix-authorizations                               |   3 +
 NEWS                                               |  32 +-
 doc/contributing.texi                              |   2 +-
 doc/guix.texi                                      | 263 +++++-
 doc/htmlxref.cnf                                   |  12 +-
 etc/guix-daemon.cil.in                             |  21 +-
 etc/guix-install.sh                                |  12 +-
 etc/snippets/tempel/text-mode                      |   2 +-
 etc/teams.scm.in                                   |  19 +
 gnu/bootloader/u-boot.scm                          |   2 +-
 gnu/build/activation.scm                           |  11 +-
 gnu/build/hurd-boot.scm                            |   2 +-
 gnu/build/install.scm                              |  23 +-
 gnu/home/services/xdg.scm                          |  37 +-
 gnu/installer/final.scm                            |  30 +-
 gnu/installer/newt.scm                             |   2 +-
 gnu/installer/utils.scm                            |  26 +-
 gnu/local.mk                                       |  17 +-
 gnu/packages/admin.scm                             |  50 +-
 gnu/packages/algebra.scm                           |   4 +-
 gnu/packages/arcan.scm                             |   2 +-
 gnu/packages/aspell.scm                            |   8 +
 gnu/packages/astronomy.scm                         |   8 +-
 gnu/packages/audio.scm                             |  33 +-
 gnu/packages/backup.scm                            |   4 +-
 gnu/packages/benchmark.scm                         |   4 +-
 gnu/packages/bioconductor.scm                      | 465 ++++++++--
 gnu/packages/bioinformatics.scm                    | 986 ++++++++++++++-------
 gnu/packages/bootloaders.scm                       | 117 ++-
 gnu/packages/c.scm                                 |   8 +-
 gnu/packages/ccache.scm                            |   4 +-
 gnu/packages/check.scm                             |  87 +-
 gnu/packages/chromium.scm                          |   8 +-
 gnu/packages/code.scm                              |   4 +-
 gnu/packages/compression.scm                       |  17 +-
 gnu/packages/containers.scm                        |   2 +-
 gnu/packages/cpp.scm                               |   4 +-
 gnu/packages/cran.scm                              | 833 ++++++++++++++---
 gnu/packages/crates-io.scm                         |  24 +
 gnu/packages/crypto.scm                            |  26 +-
 gnu/packages/databases.scm                         | 211 ++++-
 gnu/packages/debian.scm                            |   4 +-
 gnu/packages/diffoscope.scm                        |   8 +-
 gnu/packages/dns.scm                               |  12 +-
 gnu/packages/education.scm                         |   6 +-
 gnu/packages/emacs-xyz.scm                         | 582 ++++++++----
 gnu/packages/emulators.scm                         |   8 +-
 gnu/packages/engineering.scm                       |   6 +-
 gnu/packages/erlang.scm                            |  40 +
 gnu/packages/file-systems.scm                      |  39 +-
 gnu/packages/finance.scm                           |  17 +-
 gnu/packages/firmware.scm                          | 431 +++++++--
 gnu/packages/flashing-tools.scm                    |   4 +-
 gnu/packages/fpga.scm                              |  37 +-
 gnu/packages/game-development.scm                  |   2 +-
 gnu/packages/games.scm                             |  42 +-
 gnu/packages/geo.scm                               | 160 ++--
 gnu/packages/gnome-xyz.scm                         |  14 +-
 gnu/packages/gnome.scm                             |  44 +-
 gnu/packages/gnunet.scm                            |   2 +-
 gnu/packages/gnupg.scm                             |   4 +-
 gnu/packages/gnuzilla.scm                          |  20 +-
 gnu/packages/graph.scm                             |   4 +-
 gnu/packages/graphics.scm                          |  10 +-
 gnu/packages/graphviz.scm                          |  23 +-
 gnu/packages/gstreamer.scm                         |  11 +
 gnu/packages/guile-xyz.scm                         | 165 +++-
 gnu/packages/hardware.scm                          |  15 +-
 gnu/packages/haskell-apps.scm                      |   4 +-
 gnu/packages/ibus.scm                              |  76 +-
 gnu/packages/image-processing.scm                  |   4 +-
 gnu/packages/irc.scm                               |  17 +-
 gnu/packages/jami.scm                              |  13 +-
 gnu/packages/java.scm                              |  42 +-
 gnu/packages/julia-jll.scm                         |   2 +-
 gnu/packages/julia-xyz.scm                         | 717 ++++++++++-----
 gnu/packages/kde-multimedia.scm                    |   2 +-
 gnu/packages/kde-utils.scm                         |   2 +-
 gnu/packages/kodi.scm                              |   2 +-
 gnu/packages/lighting.scm                          |  84 +-
 gnu/packages/linphone.scm                          |   2 +-
 gnu/packages/linux.scm                             | 418 +++++----
 gnu/packages/lisp-xyz.scm                          | 422 ++++++++-
 gnu/packages/machine-learning.scm                  | 136 ++-
 gnu/packages/mail.scm                              |  83 +-
 gnu/packages/man.scm                               |   5 +-
 gnu/packages/mastodon.scm                          |   4 +-
 gnu/packages/maths.scm                             | 180 ++--
 gnu/packages/mercury.scm                           |  19 +-
 gnu/packages/messaging.scm                         |   8 +-
 gnu/packages/monitoring.scm                        |   2 +-
 gnu/packages/mp3.scm                               |   2 +-
 gnu/packages/mpd.scm                               |  10 +-
 gnu/packages/music.scm                             | 184 ++--
 gnu/packages/nano.scm                              |   4 +-
 gnu/packages/ncdu.scm                              |  33 +-
 gnu/packages/networking.scm                        |  32 +-
 gnu/packages/ocaml.scm                             | 587 +++++++++++-
 gnu/packages/onc-rpc.scm                           |   9 +-
 gnu/packages/openldap.scm                          | 276 +++---
 gnu/packages/package-management.scm                |  12 +-
 gnu/packages/pascal.scm                            |  58 +-
 gnu/packages/password-utils.scm                    |   4 +-
 gnu/packages/patches/ceph-boost-compat.patch       |  18 -
 gnu/packages/patches/ceph-rocksdb-compat.patch     | 303 -------
 .../patches/flashrom-fix-building-on-aarch64.patch |  89 ++
 gnu/packages/patches/jami-fix-qml-imports.patch    |  78 --
 .../patches/jami-fix-unit-tests-build.patch        | 139 ---
 gnu/packages/patches/jami-no-webengine.patch       | 243 -----
 gnu/packages/patches/jami-sip-contacts.patch       |  38 -
 gnu/packages/patches/jami-sip-unregister.patch     |  48 -
 .../patches/jami-sipaccount-segfault.patch         |  30 -
 gnu/packages/patches/jami-xcb-link.patch           |  72 --
 gnu/packages/patches/julia-tracker-16-compat.patch |  40 -
 .../libgeotiff-fix-tests-with-proj-9.1.1.patch     | 100 +++
 gnu/packages/patches/openbios-gcc-warnings.patch   |  95 ++
 .../patches/python-apsw-3.39.2.1-test-fix.patch    |  27 -
 .../python-flask-restful-werkzeug-compat.patch     |  36 -
 .../patches/python-telingo-fix-comparison.patch    |  19 +
 gnu/packages/pciutils.scm                          |   4 +-
 gnu/packages/pdf.scm                               |   8 +-
 gnu/packages/python-web.scm                        |  35 +-
 gnu/packages/python-xyz.scm                        | 330 +++----
 gnu/packages/qt.scm                                |   2 +-
 gnu/packages/radio.scm                             | 297 ++++---
 gnu/packages/raspberry-pi.scm                      |  88 ++
 gnu/packages/rdesktop.scm                          |   2 +-
 gnu/packages/regex.scm                             |   4 +-
 gnu/packages/ruby.scm                              |  18 +
 gnu/packages/scheme.scm                            |  58 +-
 gnu/packages/security-token.scm                    |   4 +-
 gnu/packages/shells.scm                            |  15 +-
 gnu/packages/shellutils.scm                        |  14 +-
 gnu/packages/skarnet.scm                           |  36 +-
 gnu/packages/speech.scm                            |  49 +-
 gnu/packages/ssh.scm                               |   4 +-
 gnu/packages/statistics.scm                        |  63 +-
 gnu/packages/storage.scm                           | 216 +++--
 gnu/packages/tbb.scm                               |  45 +-
 gnu/packages/telephony.scm                         |   4 +-
 gnu/packages/texinfo.scm                           |   3 +-
 gnu/packages/text-editors.scm                      |   5 +-
 gnu/packages/tls.scm                               |   2 +
 gnu/packages/tmux.scm                              |  50 ++
 gnu/packages/tor.scm                               |  37 +-
 gnu/packages/version-control.scm                   |  47 +-
 gnu/packages/video.scm                             |  94 +-
 gnu/packages/vim.scm                               |   4 +-
 gnu/packages/virtualization.scm                    | 124 ++-
 gnu/packages/vpn.scm                               |   4 +-
 gnu/packages/web-browsers.scm                      |   6 +-
 gnu/packages/web.scm                               |  22 +-
 gnu/packages/wm.scm                                |   4 +-
 gnu/packages/wxwidgets.scm                         |   4 +-
 gnu/packages/xdisorg.scm                           |  51 ++
 gnu/packages/xfce.scm                              |  13 +-
 gnu/packages/xorg.scm                              |   4 +-
 gnu/services/base.scm                              |  22 +-
 gnu/services/configuration.scm                     |   5 +-
 gnu/services/desktop.scm                           |   4 +-
 gnu/services/ganeti.scm                            |  23 +-
 gnu/services/guix.scm                              |  48 +-
 gnu/services/ldap.scm                              | 317 +++++++
 gnu/services/mail.scm                              | 120 +--
 gnu/services/monitoring.scm                        |   5 +-
 gnu/services/nix.scm                               |  11 +-
 gnu/services/security.scm                          |  26 +-
 gnu/services/vpn.scm                               |  15 +-
 gnu/system/examples/asus-c201.tmpl                 |   1 +
 gnu/system/examples/bare-bones.tmpl                |   1 +
 gnu/system/examples/beaglebone-black.tmpl          |   1 +
 gnu/system/examples/desktop.tmpl                   |   1 +
 gnu/system/examples/docker-image.tmpl              |   1 +
 gnu/system/examples/lightweight-desktop.tmpl       |   1 +
 gnu/system/examples/raspberry-pi-64-nfs-root.tmpl  |   1 +
 gnu/system/examples/raspberry-pi-64.tmpl           |   1 +
 gnu/system/examples/vm-image.tmpl                  |   1 +
 gnu/system/examples/yggdrasil.tmpl                 |  60 --
 gnu/system/image.scm                               |   9 +-
 gnu/system/images/wsl2.scm                         |  15 +-
 gnu/system/install.scm                             |  15 +-
 gnu/system/vm.scm                                  |  27 +-
 gnu/tests/base.scm                                 |  46 +-
 gnu/tests/docker.scm                               |   4 +-
 guix/build-system/ocaml.scm                        |  27 +
 guix/build/kconfig.scm                             |  30 +-
 guix/gnu-maintenance.scm                           | 185 ++--
 guix/import/cpan.scm                               |  32 +-
 guix/import/cran.scm                               |  27 +-
 guix/import/crate.scm                              |  10 +-
 guix/import/egg.scm                                |  10 +-
 guix/import/elpa.scm                               |  11 +-
 guix/import/gem.scm                                |   7 +-
 guix/import/git.scm                                |  39 +-
 guix/import/github.scm                             |  36 +-
 guix/import/gnome.scm                              |  47 +-
 guix/import/gnu.scm                                |   2 +-
 guix/import/hackage.scm                            |  12 +-
 guix/import/hexpm.scm                              |   9 +-
 guix/import/kde.scm                                |  61 +-
 guix/import/launchpad.scm                          |  10 +-
 guix/import/minetest.scm                           |  12 +-
 guix/import/opam.scm                               |  11 +-
 guix/import/pypi.scm                               |  14 +-
 guix/import/stackage.scm                           |  10 +-
 guix/packages.scm                                  |  36 +-
 guix/pki.scm                                       |   8 +-
 guix/read-print.scm                                |   2 +
 guix/records.scm                                   |   9 +-
 guix/scripts/refresh.scm                           |  49 +-
 guix/scripts/shell.scm                             |   5 +-
 guix/scripts/system.scm                            |   5 +-
 guix/store/deduplication.scm                       |   7 +-
 guix/ui.scm                                        |   1 +
 guix/upstream.scm                                  |  25 +-
 nix/libstore/build.cc                              |   2 +-
 nix/libutil/hash.cc                                |   2 +-
 nix/libutil/util.cc                                |   4 +-
 po/doc/guix-manual.de.po                           |   4 +-
 po/doc/guix-manual.es.po                           |   4 +-
 po/doc/guix-manual.fr.po                           |   4 +-
 po/doc/guix-manual.pt_BR.po                        |   4 +-
 po/doc/guix-manual.ru.po                           |   4 +-
 po/doc/guix-manual.zh_CN.po                        |   4 +-
 tests/cpio.scm                                     |  12 +-
 tests/guix-package.sh                              |   4 +-
 tests/import-github.scm                            |   2 +-
 tests/packages.scm                                 |   4 +
 tests/pki.scm                                      |   6 +-
 tests/records.scm                                  |   4 +-
 tests/store-deduplication.scm                      |  17 +-
 tests/transformations.scm                          |   8 +-
 tests/ui.scm                                       |  11 +-
 233 files changed, 8950 insertions(+), 4415 deletions(-)

diff --cc gnu/local.mk
index 7991f0e2e5,0d4028a161..a9b823eec3
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1606,7 -1598,9 +1599,8 @@@ dist_patch_DATA =                               
                
    %D%/packages/patches/onnx-use-system-googletest.patch       \
    %D%/packages/patches/onnx-shared-libraries.patch    \
    %D%/packages/patches/onnx-skip-model-downloads.patch                \
+   %D%/packages/patches/openbios-gcc-warnings.patch            \
    %D%/packages/patches/openboardview-use-system-imgui.patch   \
 -  %D%/packages/patches/openboardview-use-system-utf8.patch    \
    %D%/packages/patches/openbox-python3.patch                  \
    %D%/packages/patches/opencascade-oce-glibc-2.26.patch               \
    %D%/packages/patches/openfoam-4.1-cleanup.patch                     \
diff --cc gnu/packages/video.scm
index 4e2c7ff040,456376d597..4e7c183eee
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@@ -2407,6 -2429,54 +2408,38 @@@ To load this plugin, specify the follow
      (license license:bsd-3)
      (home-page "https://www.webmproject.org/";)))
  
 -;;; TODO: Merge into libvpx on staging.
 -(define-public libvpx-next
 -  (package
 -    (inherit libvpx)
 -    (name "libvpx")
 -    (version "1.12.0")
 -    (source (origin
 -              (inherit (package-source libvpx))
 -              (uri (git-reference
 -                    (url "https://chromium.googlesource.com/webm/libvpx";)
 -                    (commit (string-append "v" version))))
 -              (file-name (git-file-name name version))
 -              (sha256
 -               (base32
 -                "1x12f2bd4jqd532rnixmwvcx8d29yxiacpcxqqh86qczc49la8gm"))))))
 -
+ (define-public orf-dl
+   (let ((commit "2dbbe7ef4e0efe0f3c1d59c503108e22d9065999")
+         (revision "1"))
+     (package
+       (name "orf-dl")
+       (version (git-version "0" revision commit))
+       (source (origin
+                 (method git-fetch)
+                 (uri (git-reference
+                       (url "https://github.com/tpoechtrager/orf_dl";)
+                       (commit commit)))
+                 (file-name (git-file-name name version))
+                 (sha256
+                  (base32
+                   "1w413miy01cm7rzb5c6wwfdnc2sqv87cvxwikafgrkswpimvdjsk"))))
+       (build-system copy-build-system)
+       (arguments
+        (list #:install-plan #~`(("orf_dl.php" "bin/orf-dl"))
+              #:phases
+              #~(modify-phases %standard-phases
+                  (add-after 'unpack 'patch-source
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      (substitute* "orf_dl.php"
+                        (("ffmpeg")
+                         (search-input-file inputs "bin/ffmpeg"))))))))
+       (inputs (list php ffmpeg))
+       (home-page "https://github.com/tpoechtrager/orf_dl";)
+       (synopsis "Download videos from tvthek.orf.at")
+       (description "This package provides a PHP-based command line application
+ to download videos from Austria's national television broadcaster.")
+       (license license:gpl2+))))
+ 
  (define-public youtube-dl
    (package
      (name "youtube-dl")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]