[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/10: Merge remote-tracking branch 'origin/master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/10: Merge remote-tracking branch 'origin/master' into core-updates |
|
Date: |
Mon, 30 Jan 2023 13:10:24 -0500 (EST) |
efraim pushed a commit to branch core-updates
in repository guix.
commit 4cf1acc7f3033b50b0bf19e02c9f522d522d338c
Merge: edb8c09add 595b53b74e
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Jan 30 11:33:18 2023 +0200
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
doc/guix.texi
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/base.scm
gnu/packages/chromium.scm
gnu/packages/compression.scm
gnu/packages/databases.scm
gnu/packages/diffoscope.scm
gnu/packages/freedesktop.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/guile.scm
gnu/packages/inkscape.scm
gnu/packages/llvm.scm
gnu/packages/openldap.scm
gnu/packages/pciutils.scm
gnu/packages/ruby.scm
gnu/packages/samba.scm
gnu/packages/sqlite.scm
gnu/packages/statistics.scm
gnu/packages/syndication.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/copy.scm
guix/scripts/home.scm
.editorconfig | 16 +
.guix-authorizations | 9 +-
.patman | 10 +
Makefile.am | 106 +-
NEWS | 52 +-
doc/build.scm | 2 +-
doc/contributing.texi | 277 +-
doc/guix-cookbook.texi | 1083 +-
doc/guix.texi | 2573 +-
doc/htmlxref.cnf | 12 +-
doc/local.mk | 12 +
etc/guix-daemon.cil.in | 21 +-
etc/guix-daemon.service.in | 8 +-
etc/guix-install.sh | 144 +-
etc/guix-publish.service.in | 4 +-
etc/kernels-manifest.scm | 35 +
etc/news.scm | 395 +-
etc/release-manifest.scm | 15 +-
etc/snippets/tempel/text-mode | 258 +-
.../guix-vc-commit-message-add-package | 9 +
.../guix-vc-commit-message-remove-package | 9 +
.../guix-vc-commit-message-rename-package | 14 +
.../guix-vc-commit-message-update-package | 12 +
.../guix-vc-commit-message-use-https-home-page | 9 +
etc/teams.scm.in | 182 +-
gnu/bootloader.scm | 105 +-
gnu/bootloader/grub.scm | 222 +-
gnu/bootloader/u-boot.scm | 18 +
gnu/build/activation.scm | 11 +-
gnu/build/file-systems.scm | 8 +-
gnu/build/hurd-boot.scm | 52 +-
gnu/build/image.scm | 5 +-
gnu/build/install.scm | 83 +-
gnu/build/linux-modules.scm | 135 +-
gnu/build/marionette.scm | 54 +-
gnu/ci.scm | 6 +-
gnu/home/services.scm | 58 +-
gnu/home/services/desktop.scm | 58 +-
gnu/home/services/mcron.scm | 91 +-
gnu/home/services/pm.scm | 145 +
gnu/home/services/shells.scm | 100 +-
gnu/home/services/shepherd.scm | 3 +-
gnu/home/services/xdg.scm | 91 +-
gnu/installer.scm | 58 +-
gnu/installer/dump.scm | 10 +-
gnu/installer/final.scm | 32 +-
gnu/installer/hardware.scm | 90 +
gnu/installer/newt.scm | 13 +-
gnu/installer/newt/final.scm | 8 +-
gnu/installer/newt/network.scm | 11 +-
gnu/installer/newt/page.scm | 12 +-
gnu/installer/newt/partition.scm | 18 +-
gnu/installer/newt/substitutes.scm | 2 +-
gnu/installer/newt/welcome.scm | 60 +-
gnu/installer/parted.scm | 55 +-
gnu/installer/record.scm | 2 +-
gnu/installer/services.scm | 21 +-
gnu/installer/steps.scm | 8 +-
gnu/installer/utils.scm | 74 +-
gnu/local.mk | 117 +-
gnu/machine/digital-ocean.scm | 118 +-
gnu/machine/ssh.scm | 32 +-
gnu/packages.scm | 16 +-
gnu/packages/accessibility.scm | 4 +-
gnu/packages/admin.scm | 586 +-
gnu/packages/aidc.scm | 3 +-
gnu/packages/algebra.scm | 176 +-
gnu/packages/android.scm | 2 +-
gnu/packages/animation.scm | 143 +-
gnu/packages/antivirus.scm | 4 +-
gnu/packages/apparmor.scm | 202 +
gnu/packages/arcan.scm | 2 +-
gnu/packages/aspell.scm | 133 +-
gnu/packages/assembly.scm | 11 +-
gnu/packages/astronomy.scm | 849 +-
gnu/packages/audio.scm | 510 +-
gnu/packages/authentication.scm | 5 +-
gnu/packages/aux-files/linux-libre/4.9-i686.conf | 9062 --
gnu/packages/aux-files/linux-libre/4.9-x86_64.conf | 8910 --
.../linux-libre/{5.19-arm.conf => 6.1-arm.conf} | 523 +-
.../{5.19-arm64.conf => 6.1-arm64.conf} | 639 +-
.../linux-libre/{5.19-i686.conf => 6.1-i686.conf} | 580 +-
.../{5.19-x86_64.conf => 6.1-x86_64.conf} | 695 +-
gnu/packages/aux-files/python/sanity-check-next.py | 99 +
gnu/packages/avr.scm | 8 +-
gnu/packages/axoloti.scm | 8 +-
gnu/packages/backup.scm | 216 +-
gnu/packages/base.scm | 63 +-
gnu/packages/bash.scm | 3 +-
gnu/packages/batik.scm | 4 +-
gnu/packages/benchmark.scm | 54 +-
gnu/packages/bioconductor.scm | 4165 +-
gnu/packages/bioinformatics.scm | 2951 +-
gnu/packages/bootloaders.scm | 1561 +-
gnu/packages/bootstrap.scm | 3 +-
gnu/packages/bqn.scm | 134 +-
gnu/packages/browser-extensions.scm | 4 +-
gnu/packages/build-tools.scm | 328 +-
gnu/packages/busybox.scm | 4 +-
gnu/packages/c.scm | 130 +-
gnu/packages/calendar.scm | 37 +
gnu/packages/ccache.scm | 15 +-
gnu/packages/cdrom.scm | 6 +-
gnu/packages/check.scm | 266 +-
gnu/packages/chemistry.scm | 765 +-
gnu/packages/chez.scm | 21 +-
gnu/packages/chromium.scm | 154 +-
gnu/packages/ci.scm | 14 +-
gnu/packages/cinnamon.scm | 81 +
gnu/packages/clojure.scm | 26 +-
gnu/packages/cluster.scm | 4 +-
gnu/packages/cobol.scm | 43 +-
gnu/packages/code.scm | 53 +-
gnu/packages/commencement.scm | 16 +-
gnu/packages/compression.scm | 141 +-
gnu/packages/compton.scm | 22 +-
gnu/packages/configuration-management.scm | 2 +-
gnu/packages/containers.scm | 9 +-
gnu/packages/cook.scm | 4 +-
gnu/packages/coq.scm | 6 +-
gnu/packages/cpp.scm | 546 +-
gnu/packages/cran.scm | 3368 +-
gnu/packages/crates-graphics.scm | 424 +-
gnu/packages/crates-gtk.scm | 166 -
gnu/packages/crates-io.scm | 12409 +--
gnu/packages/cross-base.scm | 244 +-
gnu/packages/crypto.scm | 61 +-
gnu/packages/cups.scm | 10 +-
gnu/packages/curl.scm | 5 +-
gnu/packages/databases.scm | 401 +-
gnu/packages/dav.scm | 39 +-
gnu/packages/dbm.scm | 7 +-
gnu/packages/debian.scm | 4 +-
gnu/packages/debug.scm | 63 +-
gnu/packages/dezyne.scm | 6 +-
gnu/packages/dictionaries.scm | 39 +
gnu/packages/diffoscope.scm | 163 +-
gnu/packages/digest.scm | 12 +-
gnu/packages/disk.scm | 113 +-
gnu/packages/display-managers.scm | 4 +-
gnu/packages/dlang.scm | 44 +-
gnu/packages/dns.scm | 36 +-
gnu/packages/docker.scm | 2 +-
gnu/packages/documentation.scm | 70 +-
gnu/packages/ebook.scm | 25 +-
gnu/packages/education.scm | 58 +-
gnu/packages/elf.scm | 31 +-
gnu/packages/elm.scm | 18 +
gnu/packages/emacs-xyz.scm | 5704 +-
gnu/packages/emacs.scm | 20 +-
gnu/packages/embedded.scm | 71 +
gnu/packages/emulators.scm | 120 +-
gnu/packages/enchant.scm | 2 +-
gnu/packages/engineering.scm | 207 +-
gnu/packages/enlightenment.scm | 4 +-
gnu/packages/entr.scm | 9 +-
gnu/packages/erlang.scm | 40 +
gnu/packages/fabric-management.scm | 10 +-
gnu/packages/fcitx5.scm | 105 +-
gnu/packages/file-systems.scm | 274 +-
gnu/packages/finance.scm | 156 +-
gnu/packages/firmware.scm | 595 +-
gnu/packages/flashing-tools.scm | 4 +-
gnu/packages/fonts.scm | 196 +-
gnu/packages/fontutils.scm | 96 +-
gnu/packages/fpga.scm | 75 +-
gnu/packages/freedesktop.scm | 527 +-
gnu/packages/freeipmi.scm | 4 +-
gnu/packages/ftp.scm | 10 +-
gnu/packages/game-development.scm | 405 +-
gnu/packages/games.scm | 516 +-
gnu/packages/gcc.scm | 10 +-
gnu/packages/gdb.scm | 21 +
gnu/packages/geo.scm | 423 +-
gnu/packages/gettext.scm | 59 +-
gnu/packages/gimp.scm | 96 +-
gnu/packages/gl.scm | 39 +-
gnu/packages/glib.scm | 56 +
gnu/packages/gnome-xyz.scm | 187 +-
gnu/packages/gnome.scm | 718 +-
gnu/packages/gnunet.scm | 2 +-
gnu/packages/gnupg.scm | 43 +-
gnu/packages/gnuzilla.scm | 957 +-
gnu/packages/golang.scm | 1683 +-
gnu/packages/gpodder.scm | 53 +-
gnu/packages/gps.scm | 4 +-
gnu/packages/graph.scm | 208 +-
gnu/packages/graphics.scm | 360 +-
gnu/packages/graphviz.scm | 23 +-
gnu/packages/groff.scm | 26 +
gnu/packages/groovy.scm | 1 +
gnu/packages/gstreamer.scm | 23 +-
gnu/packages/gtk.scm | 87 +-
gnu/packages/guile-xyz.scm | 926 +-
gnu/packages/guile.scm | 56 +-
gnu/packages/hardware.scm | 206 +-
gnu/packages/haskell-apps.scm | 34 +-
gnu/packages/haskell-check.scm | 2 +-
gnu/packages/haskell-crypto.scm | 2 +-
gnu/packages/haskell-web.scm | 21 +
gnu/packages/haskell-xyz.scm | 58 +-
gnu/packages/haskell.scm | 820 +-
gnu/packages/haxe.scm | 2 +-
gnu/packages/heads.scm | 1 +
gnu/packages/high-availability.scm | 242 +
gnu/packages/hunspell.scm | 364 +-
gnu/packages/hyperledger.scm | 9 +-
gnu/packages/i2p.scm | 4 +-
gnu/packages/ibus.scm | 93 +-
gnu/packages/image-processing.scm | 433 +-
gnu/packages/image-viewers.scm | 14 +-
gnu/packages/image.scm | 223 +-
gnu/packages/inkscape.scm | 21 +
gnu/packages/instrumentation.scm | 4 +-
gnu/packages/irc.scm | 49 +-
gnu/packages/irods.scm | 4 +-
gnu/packages/iso-codes.scm | 4 +-
gnu/packages/jami.scm | 152 +-
gnu/packages/java-bootstrap.scm | 724 +
gnu/packages/java-compression.scm | 41 +
gnu/packages/java-xml.scm | 688 +
gnu/packages/java.scm | 1367 +-
gnu/packages/javascript.scm | 23 +
gnu/packages/julia-jll.scm | 2 +-
gnu/packages/julia-xyz.scm | 937 +-
gnu/packages/julia.scm | 265 +-
gnu/packages/kde-frameworks.scm | 719 +-
gnu/packages/kde-games.scm | 3 +-
gnu/packages/kde-internet.scm | 2 +-
gnu/packages/kde-multimedia.scm | 2 +-
gnu/packages/kde-pim.scm | 496 +-
gnu/packages/kde-plasma.scm | 2201 +-
gnu/packages/kde-systemtools.scm | 4 +-
gnu/packages/kde-utils.scm | 628 +
gnu/packages/kde.scm | 355 +-
gnu/packages/kodi.scm | 236 +-
gnu/packages/language.scm | 52 +-
gnu/packages/less.scm | 4 +-
gnu/packages/libdaemon.scm | 7 +-
gnu/packages/libevent.scm | 35 +-
gnu/packages/libreoffice.scm | 528 +-
gnu/packages/libusb.scm | 10 +-
gnu/packages/lighting.scm | 84 +-
gnu/packages/linphone.scm | 2 +-
gnu/packages/linux.scm | 1576 +-
gnu/packages/lirc.scm | 24 +-
gnu/packages/lisp-check.scm | 125 +-
gnu/packages/lisp-xyz.scm | 2951 +-
gnu/packages/lisp.scm | 103 +-
gnu/packages/llvm.scm | 656 +-
gnu/packages/logging.scm | 41 +-
gnu/packages/loko.scm | 75 +-
gnu/packages/lua.scm | 74 +-
gnu/packages/lxqt.scm | 110 +-
gnu/packages/machine-learning.scm | 612 +-
gnu/packages/mail.scm | 387 +-
gnu/packages/make-bootstrap.scm | 22 +-
gnu/packages/man.scm | 36 +-
gnu/packages/markup.scm | 28 +
gnu/packages/mastodon.scm | 11 +-
gnu/packages/mate.scm | 87 +-
gnu/packages/maths.scm | 535 +-
gnu/packages/matrix.scm | 15 +-
gnu/packages/maven.scm | 8 +-
gnu/packages/mercury.scm | 19 +-
gnu/packages/mes.scm | 19 +-
gnu/packages/messaging.scm | 102 +-
gnu/packages/minetest.scm | 86 +-
gnu/packages/monitoring.scm | 55 +-
gnu/packages/moreutils.scm | 62 +-
gnu/packages/mp3.scm | 2 +-
gnu/packages/mpd.scm | 144 +-
gnu/packages/mpi.scm | 22 +-
gnu/packages/mtools.scm | 4 +-
gnu/packages/multiprecision.scm | 73 +-
gnu/packages/music.scm | 760 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/ncdu.scm | 35 +-
gnu/packages/nettle.scm | 10 +-
gnu/packages/networking.scm | 256 +-
gnu/packages/nickle.scm | 4 +-
gnu/packages/node-xyz.scm | 2 +-
gnu/packages/node.scm | 2 +
gnu/packages/ocaml.scm | 963 +-
gnu/packages/onc-rpc.scm | 11 +-
gnu/packages/opencl.scm | 5 +-
gnu/packages/openldap.scm | 339 +-
gnu/packages/openstack.scm | 2 +-
gnu/packages/package-management.scm | 257 +-
gnu/packages/parallel.scm | 16 +-
gnu/packages/pascal.scm | 64 +-
gnu/packages/password-utils.scm | 274 +-
.../patches/audacity-ffmpeg-fallback.patch | 23 +-
.../bees-beesd-honor-destdir-on-installation.patch | 40 +
gnu/packages/patches/ceph-boost-compat.patch | 18 -
gnu/packages/patches/ceph-rocksdb-compat.patch | 303 -
.../patches/clang-15.0-libc-search-path.patch | 95 +
.../patches/crc32c-unbundle-googletest.patch | 21 +
.../patches/diffoscope-fix-llvm-test.patch | 28 -
.../patches/ecl-16-format-directive-limit.patch | 83 -
.../patches/ecl-16-ignore-stderr-write-error.patch | 17 -
gnu/packages/patches/ecl-16-libffi.patch | 16 -
.../patches/emacs-libgit-use-system-libgit2.patch | 88 -
.../patches/emacs-native-comp-driver-options.patch | 17 +
.../patches/emacs-telega-path-placeholder.patch | 41 +-
.../patches/flashrom-fix-building-on-aarch64.patch | 89 +
gnu/packages/patches/fp16-implicit-double.patch | 23 +
gnu/packages/patches/gemmi-fix-pegtl-usage.patch | 31 +
gnu/packages/patches/gemmi-fix-sajson-types.patch | 11 +
gnu/packages/patches/ghc-4.patch | 708 -
gnu/packages/patches/giara-fix-login.patch | 27 -
gnu/packages/patches/gromacs-tinyxml2.patch | 40 +-
gnu/packages/patches/guile-email-fix-tests.patch | 35 -
.../patches/guile-fibers-fd-finalizer-leak.patch | 54 +
.../icecat-use-older-reveal-hidden-html.patch | 70 -
.../patches/jami-disable-integration-tests.patch | 111 +
.../patches/jami-fix-crash-on-block-contact.patch | 32 -
.../patches/jami-libjami-headers-search.patch | 109 +
.../patches/julia-SOURCE_DATE_EPOCH-mtime.patch | 5 +-
.../patches/julia-allow-parallel-build.patch | 32 -
gnu/packages/patches/julia-tracker-16-compat.patch | 40 -
.../patches/kcontacts-incorrect-country-name.patch | 85 +
.../patches/kde-cli-tools-delay-mime-db.patch | 26 +
.../patches/kodi-increase-test-timeout.patch | 18 -
.../patches/kodi-set-libcurl-ssl-parameters.patch | 13 +-
gnu/packages/patches/kodi-skip-test-449.patch | 53 -
.../patches/kwayland-skip-flaky-test.patch | 13 +
.../libgeotiff-fix-tests-with-proj-9.1.1.patch | 100 +
...libksysguard-qdiriterator-follow-symlinks.patch | 24 +
.../libunwind-julia-fix-GCC10-fno-common.patch | 40 -
.../patches/linux-libre-infodocs-target.patch | 88 +
gnu/packages/patches/lirc-reproducible-build.patch | 69 +-
gnu/packages/patches/luajit-no_ldconfig.patch | 31 -
.../patches/memtest86+-build-reproducibly.patch | 115 +
gnu/packages/patches/mia-vtk-version.patch | 15 +
gnu/packages/patches/mia-vtk92.patch | 14 +
gnu/packages/patches/mrustc-riscv64-support.patch | 48 -
.../patches/nautilus-extension-search-path.patch | 75 +
.../patches/oath-toolkit-xmlsec-compat.patch | 79 +
gnu/packages/patches/openbios-gcc-warnings.patch | 95 +
...etri-foo-0.1.87-fix-recent-file-not-exist.patch | 24 +
.../patches/picard-fix-id3-rename-test.patch | 11 -
.../pocketfft-cpp-prefer-preprocessor-if.patch | 109 +
.../patches/protobuf-fix-build-on-32bit.patch | 139 +
.../patches/public-inbox-fix-spawn-test.patch | 43 -
.../python-afdko-suppress-copyright-test.patch | 20 +
.../patches/python-apsw-3.39.2.1-test-fix.patch | 27 -
.../python-flask-restful-werkzeug-compat.patch | 36 -
gnu/packages/patches/python-louvain-fix-test.patch | 15 +
...python-pypdf-annotate-tests-appropriately.patch | 96 +
gnu/packages/patches/python-seaborn-2690.patch | 268 -
gnu/packages/patches/python-seaborn-kde-test.patch | 36 -
.../patches/python-telingo-fix-comparison.patch | 19 +
.../patches/qtwayland-cleanup-callbacks.patch | 52 +
.../qtwayland-dont-recreate-callbacks.patch | 76 +
gnu/packages/patches/r-mixedpower-r2power.patch | 26 +
.../racket-backport-8.6-cross-install.patch | 126 -
.../racket-backport-8.6-docindex-write.patch | 36 -
.../patches/racket-backport-8.6-hurd.patch | 609 -
gnu/packages/patches/racket-backport-8.6-zuo.patch | 481 -
.../patches/racket-backport-8.7-pkg-strip.patch | 90 +
.../rdkit-unbundle-external-dependencies.patch | 384 +
gnu/packages/patches/rottlog-direntry.patch | 18 +
.../patches/ruby-sanitize-system-libxml.patch | 38 -
.../patches/rust-1.64-fix-riscv64-bootstrap.patch | 565 +
.../patches/rust-shell2batch-lint-fix.patch | 25 -
gnu/packages/patches/rw-igraph-0.10.patch | 17 +
gnu/packages/patches/sajson-build-with-gcc10.patch | 45 +
.../sajson-for-gemmi-numbers-as-strings.patch | 195 +
.../patches/scotch-build-parallelism.patch | 39 -
.../patches/scotch-integer-declarations.patch | 37 -
...spectre-meltdown-checker-externalize-fwdb.patch | 244 +
.../spectre-meltdown-checker-find-kernel.patch | 26 +
gnu/packages/patches/sssd-optional-systemd.patch | 45 -
gnu/packages/patches/tbb-fix-test-on-aarch64.patch | 35 -
gnu/packages/patches/tbb-other-arches.patch | 8 +-
.../telegram-desktop-allow-disable-libtgvoip.patch | 125 +
gnu/packages/patches/timescaledb-flaky-test.patch | 107 -
.../patches/timewarrior-time-sensitive-tests.patch | 163 +
.../patches/tinydir-fix-cbehave-test.patch | 16 +
.../patches/u-boot-allow-disabling-openssl.patch | 66 +
gnu/packages/patches/u-boot-infodocs-target.patch | 84 +
.../patches/u-boot-patman-guix-integration.patch | 1244 +
.../patches/ultrastar-deluxe-no-freesans.patch | 31 +
gnu/packages/patches/upx-CVE-2021-20285.patch | 76 -
.../vtk-fix-freetypetools-build-failure.patch | 32 -
.../patches/wacomtablet-add-missing-includes.patch | 11 +
gnu/packages/patches/wacomtablet-qt5.15.patch | 23 +
.../patches/wdl-link-libs-and-fix-jnetlib.patch | 53 +
...tc-for-telegram-desktop-fix-gcc12-cstdint.patch | 21 +
gnu/packages/pciutils.scm | 4 +-
gnu/packages/pdf.scm | 167 +-
gnu/packages/perl.scm | 506 +-
gnu/packages/photo.scm | 142 +-
gnu/packages/plotutils.scm | 20 +-
gnu/packages/pretty-print.scm | 41 +-
gnu/packages/protobuf.scm | 168 +-
gnu/packages/pypy.scm | 206 +
gnu/packages/python-build.scm | 74 +-
gnu/packages/python-check.scm | 92 +-
gnu/packages/python-compression.scm | 166 +-
gnu/packages/python-crypto.scm | 75 +-
gnu/packages/python-science.scm | 181 +-
gnu/packages/python-web.scm | 587 +-
gnu/packages/python-xyz.scm | 2125 +-
gnu/packages/python.scm | 210 +-
gnu/packages/qt.scm | 1003 +-
gnu/packages/racket.scm | 60 +-
gnu/packages/radio.scm | 565 +-
gnu/packages/raspberry-pi.scm | 344 +-
gnu/packages/ratpoison.scm | 67 +-
gnu/packages/rdesktop.scm | 2 +-
gnu/packages/readline.scm | 6 +-
gnu/packages/regex.scm | 4 +-
gnu/packages/rsync.scm | 4 +-
gnu/packages/ruby.scm | 619 +-
gnu/packages/rust-apps.scm | 609 +-
gnu/packages/rust.scm | 65 +-
gnu/packages/sagemath.scm | 21 -
gnu/packages/samba.scm | 49 +-
gnu/packages/sawfish.scm | 73 +-
gnu/packages/scheme.scm | 93 +-
gnu/packages/scribus.scm | 1 +
gnu/packages/sdl.scm | 20 +-
gnu/packages/search.scm | 4 +-
gnu/packages/security-token.scm | 22 +-
gnu/packages/selinux.scm | 13 +-
gnu/packages/sequoia.scm | 2 +-
gnu/packages/serialization.scm | 21 -
gnu/packages/shells.scm | 19 +-
gnu/packages/shellutils.scm | 71 +-
gnu/packages/simulation.scm | 193 +-
gnu/packages/skarnet.scm | 36 +-
gnu/packages/solidity.scm | 2 +-
gnu/packages/speech.scm | 53 +-
gnu/packages/sphinx.scm | 69 +
gnu/packages/sqlite.scm | 14 +-
gnu/packages/ssh.scm | 24 +-
gnu/packages/sssd.scm | 13 +-
gnu/packages/statistics.scm | 1311 +-
gnu/packages/stenography.scm | 86 +-
gnu/packages/storage.scm | 216 +-
gnu/packages/suckless.scm | 22 +-
gnu/packages/sugar.scm | 322 +
gnu/packages/sync.scm | 61 +-
gnu/packages/syncthing.scm | 7 +-
gnu/packages/syndication.scm | 179 +-
gnu/packages/task-management.scm | 84 +-
gnu/packages/tbb.scm | 55 +-
gnu/packages/telegram.scm | 291 +-
gnu/packages/telephony.scm | 136 +
gnu/packages/terminals.scm | 104 +-
gnu/packages/tex.scm | 309 +-
gnu/packages/texinfo.scm | 21 +-
gnu/packages/text-editors.scm | 239 +-
gnu/packages/textutils.scm | 10 +-
gnu/packages/tls.scm | 303 +-
gnu/packages/tmux.scm | 54 +-
gnu/packages/tor.scm | 57 +-
gnu/packages/unicode.scm | 9 +-
gnu/packages/upnp.scm | 4 +-
gnu/packages/valgrind.scm | 8 +-
gnu/packages/version-control.scm | 404 +-
gnu/packages/video.scm | 400 +-
gnu/packages/vim.scm | 41 +-
gnu/packages/virtualization.scm | 149 +-
gnu/packages/vnc.scm | 293 +-
gnu/packages/vpn.scm | 32 +-
gnu/packages/web-browsers.scm | 21 +-
gnu/packages/web.scm | 468 +-
gnu/packages/webkit.scm | 49 +-
gnu/packages/wget.scm | 4 +-
gnu/packages/wine.scm | 4 +-
gnu/packages/wm.scm | 504 +-
gnu/packages/wxwidgets.scm | 236 +-
gnu/packages/xdisorg.scm | 340 +-
gnu/packages/xfce.scm | 311 +-
gnu/packages/xml.scm | 703 +-
gnu/packages/xorg.scm | 165 +-
gnu/packages/zig-xyz.scm | 65 +
gnu/services/admin.scm | 20 +-
gnu/services/avahi.scm | 5 +-
gnu/services/base.scm | 1145 +-
gnu/services/certbot.scm | 4 +-
gnu/services/configuration.scm | 21 +-
gnu/services/cuirass.scm | 28 +-
gnu/services/databases.scm | 199 +-
gnu/services/dbus.scm | 2 +
gnu/services/desktop.scm | 25 +-
gnu/services/dict.scm | 3 +-
gnu/services/games.scm | 36 +-
gnu/services/ganeti.scm | 101 +-
gnu/services/getmail.scm | 68 +-
gnu/services/guix.scm | 243 +-
gnu/services/ldap.scm | 317 +
gnu/services/lightdm.scm | 22 +-
gnu/services/mail.scm | 234 +-
gnu/services/mcron.scm | 47 +-
gnu/services/monitoring.scm | 43 +-
gnu/services/networking.scm | 821 +-
gnu/services/nix.scm | 11 +-
gnu/services/samba.scm | 12 -
gnu/services/security.scm | 66 +-
gnu/services/shepherd.scm | 25 +-
gnu/services/sound.scm | 18 +-
gnu/services/ssh.scm | 6 +-
gnu/services/version-control.scm | 16 +-
gnu/services/virtualization.scm | 10 +-
gnu/services/vnc.scm | 247 +
gnu/services/vpn.scm | 80 +-
gnu/services/web.scm | 132 +-
gnu/services/xorg.scm | 213 +-
gnu/system.scm | 64 +-
gnu/system/examples/asus-c201.tmpl | 1 +
gnu/system/examples/bare-bones.tmpl | 4 +
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 | 71 +
gnu/system/examples/raspberry-pi-64.tmpl | 75 +
gnu/system/examples/vm-image.tmpl | 1 +
gnu/system/examples/yggdrasil.tmpl | 60 -
gnu/system/hurd.scm | 44 +-
gnu/system/image.scm | 12 +-
gnu/system/images/pine64.scm | 21 +-
gnu/system/images/wsl2.scm | 18 +-
gnu/system/install.scm | 35 +-
gnu/system/linux-container.scm | 28 +-
gnu/system/linux-initrd.scm | 7 +-
gnu/system/shadow.scm | 33 +-
gnu/system/vm.scm | 27 +-
gnu/tests/base.scm | 81 +-
gnu/tests/databases.scm | 3 +
gnu/tests/docker.scm | 4 +-
gnu/tests/gdm.scm | 127 +
gnu/tests/lightdm.scm | 7 +-
gnu/tests/vnc.scm | 203 +
gnu/tests/web.scm | 7 +-
guix/build-system/copy.scm | 3 +
guix/build-system/gnu.scm | 4 +-
guix/build-system/go.scm | 1 +
guix/build-system/linux-module.scm | 4 +-
guix/build-system/meson.scm | 1 +
guix/build-system/ocaml.scm | 27 +
guix/build-system/pyproject.scm | 147 +
guix/build-system/python.scm | 3 +-
guix/build-system/qt.scm | 2 +
guix/build-system/r.scm | 2 +-
guix/build-system/scons.scm | 4 +-
guix/build/ant-build-system.scm | 3 +-
guix/build/cargo-build-system.scm | 5 +-
guix/build/clojure-build-system.scm | 3 +-
guix/build/debug-link.scm | 12 +-
guix/build/dub-build-system.scm | 3 +-
guix/build/dune-build-system.scm | 4 +-
guix/build/emacs-utils.scm | 13 +-
guix/build/java-utils.scm | 3 +-
guix/build/kconfig.scm | 181 +
guix/build/pyproject-build-system.scm | 381 +
guix/build/syscalls.scm | 9 +-
guix/channels.scm | 37 +-
guix/ci.scm | 23 +-
guix/derivations.scm | 10 +-
guix/download.scm | 10 +-
guix/gexp.scm | 1 -
guix/git.scm | 22 +-
guix/gnu-maintenance.scm | 231 +-
guix/grafts.scm | 170 +-
guix/import/cpan.scm | 32 +-
guix/import/cran.scm | 285 +-
guix/import/crate.scm | 13 +-
guix/import/egg.scm | 15 +-
guix/import/elm.scm | 2 +-
guix/import/elpa.scm | 11 +-
guix/import/gem.scm | 10 +-
guix/import/git.scm | 39 +-
guix/import/github.scm | 36 +-
guix/import/gnome.scm | 47 +-
guix/import/gnu.scm | 5 +-
guix/import/go.scm | 5 +-
guix/import/hackage.scm | 17 +-
guix/import/hexpm.scm | 11 +-
guix/import/kde.scm | 61 +-
guix/import/launchpad.scm | 10 +-
guix/import/minetest.scm | 17 +-
guix/import/opam.scm | 17 +-
guix/import/print.scm | 3 +-
guix/import/pypi.scm | 16 +-
guix/import/stackage.scm | 30 +-
guix/import/test.scm | 88 +
guix/import/texlive.scm | 4 +-
guix/import/utils.scm | 392 +-
guix/inferior.scm | 88 +-
guix/licenses.scm | 64 +-
guix/lint.scm | 64 +-
guix/modules.scm | 4 +-
guix/packages.scm | 82 +-
guix/pki.scm | 8 +-
guix/platform.scm | 55 +-
guix/profiles.scm | 2 +-
guix/read-print.scm | 28 +-
guix/records.scm | 90 +-
guix/scripts.scm | 1 -
guix/scripts/archive.scm | 1 -
guix/scripts/build.scm | 13 +-
guix/scripts/challenge.scm | 1 -
guix/scripts/deploy.scm | 3 +-
guix/scripts/describe.scm | 3 +
guix/scripts/environment.scm | 462 +-
guix/scripts/gc.scm | 11 +
guix/scripts/graph.scm | 14 +-
guix/scripts/home.scm | 9 +-
guix/scripts/import.scm | 4 +-
guix/scripts/import/cran.scm | 21 +-
guix/scripts/offload.scm | 40 +-
guix/scripts/pack.scm | 205 +-
guix/scripts/package.scm | 1 -
guix/scripts/publish.scm | 25 +-
guix/scripts/pull.scm | 1 -
guix/scripts/refresh.scm | 140 +-
guix/scripts/repl.scm | 14 +-
guix/scripts/shell.scm | 105 +-
guix/scripts/size.scm | 1 -
guix/scripts/style.scm | 16 +-
guix/scripts/substitute.scm | 169 +-
guix/scripts/system.scm | 14 +-
guix/scripts/system/reconfigure.scm | 20 +-
guix/scripts/system/search.scm | 4 +-
guix/scripts/weather.scm | 1 -
guix/self.scm | 14 +-
guix/store.scm | 36 +
guix/store/database.scm | 9 +-
guix/store/deduplication.scm | 7 +-
guix/substitutes.scm | 17 +
guix/svn-download.scm | 107 +-
guix/transformations.scm | 169 +-
guix/ui.scm | 40 +-
guix/upstream.scm | 68 +-
nix/libstore/build.cc | 2 +-
nix/libutil/hash.cc | 9 +-
nix/libutil/util.cc | 4 +-
po/doc/guix-cookbook.de.po | 2884 +-
po/doc/guix-cookbook.fr.po | 2872 +-
po/doc/guix-cookbook.ko.po | 2557 +-
po/doc/guix-cookbook.sk.po | 2553 +-
po/doc/guix-manual.de.po | 32206 ++++---
po/doc/guix-manual.es.po | 30929 ++++---
po/doc/guix-manual.fr.po | 88383 ++++++-------------
po/doc/guix-manual.pt_BR.po | 30492 ++++---
po/doc/guix-manual.ru.po | 31062 ++++---
po/doc/guix-manual.zh_CN.po | 58240 +++++-------
po/guix/LINGUAS | 2 +
po/guix/POTFILES.in | 6 +
po/guix/bn.po | 2625 +-
po/guix/cs.po | 2637 +-
po/guix/da.po | 2689 +-
po/guix/de.po | 2906 +-
po/guix/eo.po | 2654 +-
po/guix/es.po | 2925 +-
po/guix/fa.po | 2630 +-
po/guix/fi.po | 2656 +-
po/guix/fr.po | 2949 +-
po/guix/hu.po | 2646 +-
po/guix/it.po | 3570 +-
po/guix/ja.po | 2624 +-
po/guix/{ja.po => ka.po} | 2763 +-
po/guix/ko.po | 2687 +-
po/guix/{ja.po => lt.po} | 2740 +-
po/guix/nl.po | 2756 +-
po/guix/oc.po | 2625 +-
po/guix/pl.po | 3149 +-
po/guix/pt_BR.po | 2739 +-
po/guix/ru.po | 2850 +-
po/guix/si.po | 2624 +-
po/guix/sk.po | 2782 +-
po/guix/sr.po | 2637 +-
po/guix/sv.po | 2698 +-
po/guix/ta.po | 2683 +-
po/guix/tr.po | 2627 +-
po/guix/uk.po | 3008 +-
po/guix/vi.po | 2653 +-
po/guix/zh_CN.po | 2634 +-
po/packages/LINGUAS | 2 +
po/packages/POTFILES.in | 5 -
po/packages/da.po | 19844 ++++-
po/packages/de.po | 17780 +++-
po/packages/eo.po | 19939 ++++-
po/packages/es.po | 23597 +++--
po/packages/fa.po | 17156 +++-
po/packages/fi.po | 17127 +++-
po/packages/fr.po | 20351 ++++-
po/packages/hu.po | 17965 +++-
po/packages/it.po | 17468 +++-
po/packages/ko.po | 17150 +++-
po/packages/nl.po | 17206 +++-
po/packages/oc.po | 17259 +++-
po/packages/pl.po | 17501 +++-
po/packages/pt_BR.po | 17229 +++-
po/packages/sk.po | 17181 +++-
po/packages/sr.po | 17221 +++-
po/packages/tr.po | 17146 +++-
po/packages/{fr.po => uk.po} | 21876 +++--
po/packages/{fr.po => vi.po} | 21906 +++--
po/packages/zh_CN.po | 17564 +++-
tests/builders.scm | 1 -
tests/channels.scm | 1 -
tests/cpan.scm | 2 +-
tests/cpio.scm | 12 +-
tests/derivations.scm | 53 +-
tests/gexp.scm | 5 +-
tests/git.scm | 32 +-
tests/gnu-maintenance.scm | 9 +-
tests/grafts.scm | 5 +-
tests/graph.scm | 1 -
tests/guix-build-branch.sh | 4 +-
tests/guix-daemon.sh | 4 +-
tests/guix-environment-container.sh | 67 +
tests/guix-home.sh | 16 +-
tests/guix-pack.sh | 2 +-
tests/guix-package.sh | 4 +-
tests/guix-refresh.sh | 118 +
tests/guix-shell.sh | 3 +
tests/guix-system.sh | 10 +
tests/import-github.scm | 2 +-
tests/import-utils.scm | 53 +-
tests/lint.scm | 34 +-
tests/monads.scm | 1 -
tests/pack.scm | 1 -
tests/packages.scm | 15 +-
tests/pki.scm | 6 +-
tests/print.scm | 23 +
tests/profiles.scm | 1 -
tests/read-print.scm | 7 +-
tests/records.scm | 33 +
tests/store-deduplication.scm | 17 +-
tests/substitute.scm | 113 +
tests/system.scm | 1 -
tests/transformations.scm | 59 +-
tests/ui.scm | 11 +-
740 files changed, 550207 insertions(+), 318126 deletions(-)
diff --cc doc/guix.texi
index a173bea15f,2b1ad77ba5..eddfc58cb3
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@@ -9155,18 -9301,9 +9301,18 @@@ output
When the input JavaScript files are not all located in the @file{src}
directory, the parameter @code{#:javascript-files} can be used to
specify a list of file names to feed to the minifier.
- @end defvr
+ @end defvar
- @defvr {Scheme Variable} mozilla-build-system
++@defvar mozilla-build-system
+This variable is exported by @code{(guix build-system mozilla)}. It
+sets the @code{--target} and @code{--host} configuration flags to what
+software developed by Mozilla expects -- due to historical reasons,
+Mozilla software expects @code{--host} to be the system that is
+cross-compiled from and @code{--target} to be the system that is
+cross-compiled to, contrary to the standard Autotools conventions.
- @end defvr
++@end defvar
+
- @defvr {Scheme Variable} ocaml-build-system
+ @defvar ocaml-build-system
This variable is exported by @code{(guix build-system ocaml)}. It implements
a build procedure for @uref{https://ocaml.org, OCaml} packages, which consists
of choosing the correct set of commands to run for each package. OCaml
@@@ -42429,13 -43553,25 +43548,13 @@@ The graph below shows the resulting dep
@code{gcc-core-mesboot0}, the bootstrap compiler used for the
traditional bootstrap of the rest of the Guix System.
-@c ./pre-inst-env guix graph -e '(@@ (gnu packages commencement)
gcc-core-mesboot0)' | sed -re
's,((bootstrap-mescc-tools|bootstrap-mes|guile-bootstrap).*shape =) box,\1
ellipse,' > doc/images/gcc-core-mesboot0-graph.dot
+@c ./pre-inst-env guix graph -e '(@@ (gnu packages commencement)
gcc-core-mesboot0)' | sed -re 's,((bootstrap-seeds|guile-bootstrap).*shape =)
box,\1 ellipse,' > doc/images/gcc-core-mesboot0-graph.dot
@image{images/gcc-core-mesboot0-graph,6in,,Dependency graph of
gcc-core-mesboot0}
-The only significant binary bootstrap seeds that remain@footnote{
-Ignoring the 68KB @code{mescc-tools}; that will be removed later,
-together with @code{mes}.} are a Scheme interpreter and a Scheme
-compiler: GNU Mes and GNU Guile@footnote{Not shown in this graph are the
-static binaries for @file{bash}, @code{tar}, and @code{xz} that are used
-to get Guile running.}.
-
-This further reduction has brought down the size of the binary seed to
-about 60MB for @code{i686-linux} and @code{x86_64-linux}.
-
-Work is ongoing to remove all binary blobs from our free software
-bootstrap stack, working towards a Full Source Bootstrap. Also ongoing
-is work to bring these bootstraps to the @code{arm-linux} and
+Work is ongoing to to bring these bootstraps to the @code{arm-linux} and
@code{aarch64-linux} architectures and to the Hurd.
- If you are interested, join us on @samp{#bootstrappable} on the Freenode
+ If you are interested, join us on @samp{#bootstrappable} on the Libera.Chat
IRC network or discuss on @email{bug-mes@@gnu.org} or
@email{gash-devel@@nongnu.org}.
diff --cc gnu/local.mk
index 8821c3fd8b,2d54c258ce..36f16c94a3
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -7,10 -7,10 +7,10 @@@
# Copyright © 2016, 2017, 2018 Kei Kebreau <kkebreau@posteo.net>
# Copyright © 2016, 2017 Rene Saavedra <rennes@openmailbox.org>
# Copyright © 2016 Adonay "adfeno" Felipe Nogueira
<https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
- # Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus
<rekado@elephly.net>
+ # Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Ricardo Wurmus
<rekado@elephly.net>
# Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
# Copyright © 2016, 2017, 2018, 2019 Alex Vong <alexvong1995@gmail.com>
-# Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner
<efraim@flashner.co.il>
+# Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner
<efraim@flashner.co.il>
# Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Jan (janneke)
Nieuwenhuizen <janneke@gnu.org>
# Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
# Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
@@@ -923,8 -939,10 +938,9 @@@ dist_patch_DATA =
%D%/packages/patches/bsd-games-prevent-name-collisions.patch \
%D%/packages/patches/bsd-games-stdio.h.patch \
%D%/packages/patches/beancount-disable-googleapis-fonts.patch \
+ %D%/packages/patches/bees-beesd-honor-destdir-on-installation.patch \
%D%/packages/patches/beignet-correct-file-names.patch \
%D%/packages/patches/bidiv-update-fribidi.patch \
- %D%/packages/patches/binutils-2.37-file-descriptor-leak.patch \
%D%/packages/patches/binutils-boot-2.20.1a.patch \
%D%/packages/patches/binutils-loongson-workaround.patch \
%D%/packages/patches/binutils-mingw-w64-timestamp.patch \
@@@ -1168,13 -1189,12 +1182,14 @@@
%D%/packages/patches/gdm-wayland-session-wrapper-from-env.patch \
%D%/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch \
%D%/packages/patches/geeqie-clutter.patch \
+ %D%/packages/patches/gemmi-fix-pegtl-usage.patch \
+ %D%/packages/patches/gemmi-fix-sajson-types.patch \
%D%/packages/patches/genimage-mke2fs-test.patch \
%D%/packages/patches/geoclue-config.patch \
+ %D%/packages/patches/gettext-libunicode-update.patch \
- %D%/packages/patches/ghc-4.patch \
%D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
%D%/packages/patches/ghc-testsuite-dlopen-pie.patch \
+ %D%/packages/patches/ghc-testsuite-grep-compat.patch \
%D%/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch \
%D%/packages/patches/ghostscript-no-header-id.patch \
%D%/packages/patches/ghostscript-no-header-uuid.patch \
@@@ -1249,6 -1271,6 +1263,7 @@@
%D%/packages/patches/guile-1.8-cpp-4.5.patch \
%D%/packages/patches/guile-2.2-skip-oom-test.patch \
%D%/packages/patches/guile-2.2-skip-so-test.patch \
++ %D%/packages/patches/guile-cross-compilation.patch \
%D%/packages/patches/guile-default-utf8.patch \
%D%/packages/patches/guile-2.2-default-utf8.patch \
%D%/packages/patches/guile-relocatable.patch \
@@@ -1301,11 -1322,9 +1315,10 @@@
%D%/packages/patches/i7z-gcc-10.patch \
%D%/packages/patches/icecat-makeicecat.patch \
%D%/packages/patches/icecat-avoid-bundled-libraries.patch \
- %D%/packages/patches/icecat-use-older-reveal-hidden-html.patch \
%D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \
%D%/packages/patches/icecat-use-system-media-libs.patch \
- %D%/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch\
+ %D%/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch \
+ %D%/packages/patches/icedtea-7-hotspot-pointer-comparison.patch \
%D%/packages/patches/id3lib-CVE-2007-4460.patch \
%D%/packages/patches/id3lib-UTF16-writing-bug.patch \
%D%/packages/patches/idris-test-ffi008.patch \
@@@ -1346,11 -1365,13 +1360,10 @@@
%D%/packages/patches/jfsutils-add-sysmacros.patch \
%D%/packages/patches/jfsutils-gcc-compat.patch \
%D%/packages/patches/jfsutils-include-systypes.patch \
- %D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \
- %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \
- %D%/packages/patches/jsoncpp-pkg-config-version.patch \
+ %D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \
+ %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \
%D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \
- %D%/packages/patches/julia-tracker-16-compat.patch \
- %D%/packages/patches/julia-allow-parallel-build.patch \
- %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \
- %D%/packages/patches/libffi-float128-powerpc64le.patch \
+ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch \
%D%/packages/patches/libobjc2-unbundle-robin-map.patch \
%D%/packages/patches/librime-fix-build-with-gcc10.patch \
%D%/packages/patches/libvirt-add-install-prefix.patch \
@@@ -1433,9 -1456,7 +1448,8 @@@
%D%/packages/patches/libtirpc-CVE-2021-46828.patch \
%D%/packages/patches/libtirpc-hurd.patch \
%D%/packages/patches/libtommath-fix-linkage.patch \
+ %D%/packages/patches/libtool-grep-compat.patch \
%D%/packages/patches/libtool-skip-tests2.patch \
- %D%/packages/patches/libunwind-julia-fix-GCC10-fno-common.patch \
%D%/packages/patches/libusb-0.1-disable-tests.patch \
%D%/packages/patches/libusb-for-axoloti.patch \
%D%/packages/patches/libutils-add-includes.patch \
@@@ -1452,10 -1475,10 +1466,11 @@@
%D%/packages/patches/lierolibre-remove-arch-warning.patch \
%D%/packages/patches/lierolibre-try-building-other-arch.patch \
%D%/packages/patches/linbox-fix-pkgconfig.patch \
- %D%/packages/patches/linphone-desktop-without-sdk.patch \
+ %D%/packages/patches/linphone-desktop-without-sdk.patch \
+ %D%/packages/patches/linux-libre-infodocs-target.patch \
%D%/packages/patches/linux-libre-support-for-Pinebook-Pro.patch \
%D%/packages/patches/linux-pam-no-setfsuid.patch \
+ %D%/packages/patches/linux-pam-unix_chkpwd.patch \
%D%/packages/patches/linuxdcpp-openssl-1.1.patch \
%D%/packages/patches/lirc-localstatedir.patch \
%D%/packages/patches/lirc-reproducible-build.patch \
@@@ -1531,6 -1554,8 +1547,7 @@@
%D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \
%D%/packages/patches/musl-cross-locale.patch \
%D%/packages/patches/mutt-store-references.patch \
- %D%/packages/patches/m4-gnulib-libio.patch \
+ %D%/packages/patches/nautilus-extension-search-path.patch \
%D%/packages/patches/ncompress-fix-softlinks.patch \
%D%/packages/patches/ncftp-reproducible.patch \
%D%/packages/patches/netcdf-date-time.patch \
@@@ -1600,7 -1623,11 +1619,8 @@@
%D%/packages/patches/pam-krb5-CVE-2020-10595.patch \
%D%/packages/patches/pango-skip-libthai-test.patch \
%D%/packages/patches/password-store-tree-compat.patch \
- %D%/packages/patches/pciutils-hurd-configure.patch \
- %D%/packages/patches/pciutils-hurd-fix.patch \
- %D%/packages/patches/petri-foo-0.1.87-fix-recent-file-not-exist.patch
\
%D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \
+ %D%/packages/patches/pocketfft-cpp-prefer-preprocessor-if.patch
\
%D%/packages/patches/pokerth-boost.patch \
%D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \
%D%/packages/patches/pthreadpool-system-libraries.patch \
@@@ -1685,7 -1713,8 +1707,7 @@@
%D%/packages/patches/python-3-search-paths.patch \
%D%/packages/patches/python-3-fix-tests.patch \
%D%/packages/patches/python-3-hurd-configure.patch \
- %D%/packages/patches/python-apsw-3.39.2.1-test-fix.patch \
- %D%/packages/patches/python-3-no-static-lib.patch \
+ %D%/packages/patches/python-afdko-suppress-copyright-test.patch \
%D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \
%D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \
%D%/packages/patches/python-cross-compile.patch \
@@@ -1832,10 -1860,10 +1853,11 @@@
%D%/packages/patches/syslinux-strip-gnu-property.patch \
%D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch \
%D%/packages/patches/snappy-add-inline-for-GCC.patch \
+ %D%/packages/patches/source-highlight-gcc-compat.patch \
+ %D%/packages/patches/spectre-meltdown-checker-externalize-fwdb.patch \
+ %D%/packages/patches/spectre-meltdown-checker-find-kernel.patch \
%D%/packages/patches/sphinxbase-fix-doxygen.patch \
%D%/packages/patches/spice-vdagent-glib-2.68.patch \
- %D%/packages/patches/sssd-optional-systemd.patch \
%D%/packages/patches/sssd-system-directories.patch \
%D%/packages/patches/steghide-fixes.patch \
%D%/packages/patches/suitesparse-mongoose-cmake.patch \
@@@ -1863,8 -1889,8 +1884,9 @@@
%D%/packages/patches/tcsh-fix-autotest.patch \
%D%/packages/patches/teensy-loader-cli-help.patch \
%D%/packages/patches/tensorflow-c-api-fix.patch \
+ %D%/packages/patches/texinfo-headings-single.patch \
%D%/packages/patches/texinfo-5-perl-compat.patch \
+ %D%/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch \
%D%/packages/patches/telegram-purple-adjust-test.patch \
%D%/packages/patches/texi2html-document-encoding.patch \
%D%/packages/patches/texi2html-i18n.patch \
@@@ -1940,9 -1969,10 +1965,8 @@@
%D%/packages/patches/unzip-zipbomb-part2.patch \
%D%/packages/patches/unzip-zipbomb-part3.patch \
%D%/packages/patches/unzip-32bit-zipbomb-fix.patch \
- %D%/packages/patches/upx-CVE-2021-20285.patch \
%D%/packages/patches/ustr-fix-build-with-gcc-5.patch \
%D%/packages/patches/util-linux-tests.patch \
- %D%/packages/patches/util-linux-CVE-2021-3995.patch \
- %D%/packages/patches/util-linux-CVE-2021-3996.patch \
%D%/packages/patches/valgrind-enable-arm.patch \
%D%/packages/patches/valgrind-fix-default-debuginfo-path.patch \
%D%/packages/patches/vboot-utils-fix-format-load-address.patch \
diff --cc gnu/packages/admin.scm
index b2aadcc458,5cea17d562..3c03002a02
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@@ -319,10 -325,13 +325,10 @@@ interface and is based on GNU Guile."
(license license:gpl3+)
(home-page "https://www.gnu.org/software/shepherd/";)))
-;; Update on the next rebuild cycle.
-(define-public shepherd shepherd-0.8)
-
(define-public shepherd-0.9
(package
- (inherit shepherd)
+ (inherit shepherd-0.8)
- (version "0.9.2")
+ (version "0.9.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/shepherd/shepherd-"
@@@ -360,12 -358,13 +355,15 @@@
(this-package-input "guile-fibers")
"/lib/guile/3.0/site-ccache"))))))
#~%standard-phases)))
- (native-inputs (list pkg-config guile-3.0
+
+ ;; Note: Use 'guile-3.0-latest' to address the continuation-related memory
+ ;; leak reported at <https://issues.guix.gnu.org/58631>.
+ (native-inputs (list pkg-config guile-3.0-latest
guile-fibers-1.1)) ;for cross-compilation
- (inputs (list guile-3.0 guile-fibers-1.1))))
+ (inputs (list guile-3.0-latest guile-fibers-1.1))))
+(define-public shepherd shepherd-0.9)
+
(define-public guile2.2-shepherd
(package
(inherit shepherd-0.9)
diff --cc gnu/packages/backup.scm
index d0d89bd910,10512cc1cd..05e5295567
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@@ -13,9 -13,9 +13,9 @@@
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Alex Vong <alexvong1995@gmail.com>
-;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2019, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
- ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+ ;;; Copyright © 2020, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Marcin Karpezo <sirmacik@wioo.waw.pl>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2021 Timothy Sample <samplet@ngyro.com>
diff --cc gnu/packages/base.scm
index 291f2e15f0,36b27a4e25..5ffa159740
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@@ -20,7 -20,7 +20,8 @@@
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2022 zamfofex <zamfofex@twdb.moe>
+ ;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/check.scm
index 794a3f4c22,aaa41777dc..ebe4a01cab
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@@ -88,9 -91,9 +91,10 @@@
#:use-module (guix build-system gnu)
#:use-module (guix build-system go)
#:use-module (guix build-system meson)
+ #:use-module (guix build-system pyproject)
#:use-module (guix build-system python)
#:use-module (guix build-system trivial)
+ #:use-module (guix deprecation)
#:use-module (srfi srfi-1))
(define-public pict
@@@ -1031,9 -1246,30 +1244,31 @@@ and functions, detailed info on failin
and many external plugins.")
(license license:expat)))
-(define-public python-pytest-6 python-pytest)
+(define-deprecated python-pytest-6 python-pytest)
+(export python-pytest-6)
+ ;; Astropy started using hard dependencies for Pytest 7+, which might
+ ;; happen for some other projects. It could be set as default in staging.
+ (define-public python-pytest-7.1
+ (package
+ (inherit python-pytest)
+ (version "7.1.3")
+ (name "python-pytest")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "pytest" version))
+ (sha256
+ (base32
+ "0f8c31v5r2kgjixvy267n0nhc4xsy65g3n9lz1i1377z5pn5ydjg"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments python-pytest)
+ ((#:phases phases #~%standard-phases)
+ #~(modify-phases #$phases
+ (add-before 'build 'pretend-version
+ (lambda _
+ (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version)))))))))
+
(define-public python-pytest-bootstrap
(package
(inherit python-pytest)
@@@ -2006,11 -2298,23 +2260,11 @@@ instantly."
much larger range of examples than you would ever want to write by hand. It’s
based on the Haskell library, Quickcheck, and is designed to integrate
seamlessly into your existing Python unit testing work flow.")
- (home-page "https://github.com/HypothesisWorks/hypothesis";)
+ (home-page "https://hypothesis.works/";)
(license license:mpl2.0)))
-;;; TODO: Make the default python-hypothesis in the next rebuild cycle.
-(define-public python-hypothesis-next
- (package
- (inherit python-hypothesis)
- (version "6.43.3")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "hypothesis" version))
- (sha256
- (base32
- "0d67dlc5a47i48fxzmji2mnybzby0h1wdscmj54555fghcyp1045"))))
- (propagated-inputs
- (modify-inputs (package-propagated-inputs python-hypothesis)
- (append python-pytest))))) ;to satisfy the sanity-check phase
+(define-deprecated python-hypothesis-next python-hypothesis)
+(export python-hypothesis-next)
(define-public python-hypothesmith
(package
diff --cc gnu/packages/compression.scm
index e1f47d1e3e,653bde38d8..c25446593a
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@@ -35,7 -35,8 +35,9 @@@
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Ahmad Jarara <git@ajarara.io>
+;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
+ ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
+ ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -264,9 -283,29 +269,13 @@@ adding and extracting files to/from a t
(add-after 'unpack 'use-absolute-name-of-gzip
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "gunzip.in"
- (("exec gzip")
+ (("exec 'gzip'")
(string-append "exec " (assoc-ref outputs "out")
- "/bin/gzip")))
- #t)))))
+ "/bin/gzip"))))))))
+ (inputs
+ `(,@(if (%current-target-system)
+ `(("bash" ,bash-minimal))
+ '())))
(description
"GNU Gzip provides data compression and decompression utilities; the
typical extension is \".gz\". Unlike the \"zip\" format, it compresses a
single
@@@ -616,8 -663,14 +633,14 @@@ some compression ratio)."
version ".tar.gz"))
(sha256
(base32
- "0j59hx72258334rmkwn57ahr6s69nlrx0a5ip1jw2fbiwr12sd63"))))
+ "03985xc696210irdzv475mlvf30ylahni3msanfz4ppivm3w14j7"))))
(build-system gnu-build-system)
+ (arguments
+ ;; The configure script doesn't recognise the --build or --host
+ ;; arguments, so set CXX here
+ `(,@(if (%current-target-system)
+ `(#:make-flags (list ,(string-append "CXX=" (cxx-for-target))))
+ '())))
(home-page "https://www.nongnu.org/lzip/lzip.html";)
(synopsis "Lossless data compressor based on the LZMA algorithm")
(description
diff --cc gnu/packages/cpp.scm
index c8bff7dbce,0eecab50fb..f83674fd58
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@@ -1038,9 -1083,18 +1083,18 @@@ Google's C++ code base."
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:configure-flags flags)
- `(cons* "-DBUILD_TESTING=ON"
+ `(cons* "-DABSL_BUILD_TESTING=ON"
(delete "-DABSL_RUN_TESTS=ON" ,flags))))))))
+ (define-public abseil-cpp-cxxstd17
+ (let ((base abseil-cpp))
+ (hidden-package
+ (package/inherit base
+ (arguments
+ (substitute-keyword-arguments (package-arguments base)
+ ((#:configure-flags flags)
+ #~(cons* "-DCMAKE_CXX_STANDARD=17" #$flags))))))))
+
(define-public pegtl
(package
(name "pegtl")
diff --cc gnu/packages/diffoscope.scm
index 3c4650e7a8,0dda89d860..fd13d440df
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@@ -152,78 -151,83 +150,79 @@@
xxd))
(native-inputs
(append
- (list help2man
+ (list help2man
- ;; Below are packages used for tests.
- binwalk
- python-pytest
- python-chardet
- python-h5py
- python-pypdf2
- python-progressbar33
+ ;; Below are packages used for tests.
+ binwalk
+ python-pytest
+ python-chardet
+ python-h5py
+ python-pypdf
+ python-progressbar33
- abootimg
- bdb
- binutils
- bzip2
- cdrtools
- colord
- cpio
- docx2txt
- dtc
- e2fsprogs
- ffmpeg)
+ abootimg
+ bdb
+ binutils
+ bzip2
+ cdrkit-libre
+ colord
+ cpio
+ docx2txt
+ dtc
+ e2fsprogs
- ffmpeg
-
- ;; XXX: Must be the same version as python-magic uses;
- ;; remove when 'file' is updated.
- file-next)
++ ffmpeg)
- (match (%current-system)
- ;; fpc is only available on x86 currently.
- ((or "x86_64-linux" "i686-linux")
- (list fpc))
- (_ '()))
+ (match (%current-system)
+ ;; fpc is only available on x86 currently.
+ ((or "x86_64-linux" "i686-linux")
+ (list fpc))
+ (_ '()))
- (list gettext-minimal
- ghostscript
- `(,giflib "bin")
- gnumeric
- gnupg
- hdf5
- imagemagick
- libarchive
- llvm-9
- lz4
- ocaml
- odt2txt
- openssh
- openssl
- pgpdump
- poppler
- python-jsbeautifier
- r-minimal
- rpm
- sng
- sqlite
- squashfs-tools
- tcpdump
- unzip
- wabt
- xxd
- xz
- zip
- zstd)
+ (list gettext-minimal
+ ghostscript
+ `(,giflib "bin")
+ gnumeric
+ gnupg
+ hdf5
+ imagemagick
+ libarchive
+ llvm
+ lz4
+ lzip
+ ocaml
+ odt2txt
+ openssh
+ openssl
+ pgpdump
+ poppler
+ python-jsbeautifier
+ r-minimal
+ rpm
+ sng
+ sqlite
+ squashfs-tools
+ tcpdump
+ unzip
+ wabt
+ xxd
+ xz
+ zip
+ zstd)
- ;; Also for tests. The test suite skips tests when these are missing.
- (match (%current-system)
- ;; ghc is only available on x86 currently.
- ((or "x86_64-linux" "i686-linux")
- (list ghc))
- (_ '()))
- (match (%current-system)
- ;; openjdk and dependent packages are only
- ;; available on x86_64 currently.
- ((or "x86_64-linux")
- (list enjarify)
- ;; No unversioned openjdk available.
- (list `(,openjdk12 "jdk")))
- (_ '()))))
+ ;; Also for tests. The test suite skips tests when these are missing.
+ (match (%current-system)
+ ;; ghc is only available on x86 currently.
+ ((or "x86_64-linux" "i686-linux")
+ (list ghc))
+ (_ '()))
+ (match (%current-system)
+ ;; openjdk and dependent packages are only
+ ;; available on x86_64 currently.
+ ((or "x86_64-linux")
+ (list enjarify)
+ ;; No unversioned openjdk available.
+ (list `(,openjdk12 "jdk")))
+ (_ '()))))
(home-page "https://diffoscope.org/";)
(synopsis "Compare files, archives, and directories in depth")
(description
diff --cc gnu/packages/freedesktop.scm
index 3b44bb77c4,02898bfe36..f58d53e7ac
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@@ -26,12 -26,11 +26,12 @@@
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021 Robby Zambito <contact@robbyzambito.me>
;;; Copyright © 2021, 2022 Maxime Devos <maximedevos@telenet.be>
- ;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
+ ;;; Copyright © 2021, 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2021, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
-;;; Copyright © 2022 muradm <mail@muradm.net>
+;;; Copyright © 2022 Wamm K. D. <jaft.r@outlook.com>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
+;;; Copyright © 2022 muradm <mail@muradm.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -1130,6 -1267,43 +1276,29 @@@ protocol either in Wayland core, or som
. "https://wayland.freedesktop.org/releases.html";)))
(license license:expat)))
-(define-public wayland-protocols-next
- (package
- (inherit wayland-protocols)
- (name "wayland-protocols")
- (version "1.26")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://wayland.freedesktop.org/releases/";
- "wayland-protocols-" version ".tar.xz"))
- (sha256
- (base32
- "04vgllmpmrv14x3x64ns01vgwx4hriljayjkz9idgbv83i63hly5"))))))
-
+ (define-public wayland-utils
+ (package
+ (name "wayland-utils")
+ (version "1.1.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url
"https://gitlab.freedesktop.org/wayland/wayland-utils";)
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "04k1yhyh7h4xawbhpz9pf6cpfmmp1l862fdgsvvnyp4hg9n3j9aj"))))
+ (build-system meson-build-system)
+ (native-inputs (list pkg-config))
- (inputs (list libdrm wayland wayland-protocols-next))
++ (inputs (list libdrm wayland wayland-protocols))
+ (home-page "https://wayland.freedesktop.org/";)
+ (synopsis "Display information about the Wayland protocols")
+ (description "This package provides @code{wayland-info} tool that can be
+ used to check which Wayland protocols and versions are advertised by the
Wayland
+ compositor.")
+ (license license:expat)))
+
(define-public waylandpp
(package
(name "waylandpp")
@@@ -1164,43 -1338,43 +1333,43 @@@
(source (origin
(method url-fetch)
(uri (string-append
- "https://wayland.freedesktop.org/releases/";
- "weston-" version ".tar.xz"))
+
"https://gitlab.freedesktop.org/wayland/weston/-/releases/";
+ version "/downloads/weston-" version ".tar.xz"))
(sha256
(base32
- "1zlql0xgiqc3pvgbpnnvj4xvpd91pwva8qf83xfb23if377ddxaw"))))
+ "1rs92p7sfkw9lqlkfnqh5af19ym3x8l3hp3yfv117m7qv6h6qr49"))))
(build-system meson-build-system)
(native-inputs
- (list mscgen pkg-config xorg-server))
+ (list mscgen pkg-config python-3 xorg-server))
(inputs
- `(("cairo" ,cairo-xcb)
- ("colord" ,colord)
- ("dbus" ,dbus)
- ("elogind" ,elogind)
- ("freerdp" ,freerdp)
- ("glib" ,glib)
- ("gstreamer" ,gstreamer)
- ("gst-plugins-base" ,gst-plugins-base)
- ("lcms" ,lcms)
- ("libdrm" ,libdrm)
- ("libevdev" ,libevdev)
- ("libinput" ,libinput-minimal)
- ("libjpeg" ,libjpeg-turbo)
- ("libpng" ,libpng)
- ("libunwind" ,libunwind)
- ("libva" ,libva)
- ("libwebp" ,libwebp)
- ("libx11" ,libx11)
- ("libxcb" ,libxcb)
- ("libxcursor" ,libxcursor)
- ("libxml2" ,libxml2)
- ("mesa" ,mesa)
- ("mtdev" ,mtdev)
- ("linux-pam" ,linux-pam)
- ("pango" ,pango)
- ("pipewire" ,pipewire)
- ("wayland-protocols" ,wayland-protocols)
- ("xorg-server-xwayland" ,xorg-server-xwayland)))
+ (list cairo-xcb
+ colord
+ dbus
+ elogind
+ freerdp
+ glib
+ gstreamer
+ gst-plugins-base
+ lcms
+ libdrm
+ libevdev
+ libinput-minimal
+ libjpeg-turbo
+ libpng
+ libunwind
+ libva
+ libwebp
+ libx11
+ libxcb
+ libxcursor
+ libxml2
+ mesa
+ mtdev
+ linux-pam
+ pango
+ pipewire
- wayland-protocols-next
++ wayland-protocols
+ xorg-server-xwayland))
(propagated-inputs
(list libxkbcommon pixman wayland))
(arguments
diff --cc gnu/packages/gcc.scm
index c07fdd2c80,bb154cac62..5e2783d0dc
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@@ -1264,17 -1246,16 +1271,16 @@@ provides the GNU compiler for the Go pr
(define-public isl
(package
(name "isl")
- (version "0.23")
+ (version "0.24")
(source (origin
(method url-fetch)
- ;; Used to be at isl.gforge.inria.fr.
(uri (list (string-append "mirror://sourceforge/libisl/isl-"
- version ".tar.bz2")
+ version ".tar.xz")
(string-append %gcc-infrastructure
- "isl-" version ".tar.bz2")))
+ "isl-" version ".tar.xz")))
(sha256
(base32
- "0k91zck10zxs9sk3yrbb92y1j3w981w3fbwkfwd7kl779b0j52f5"))))
+ "1bgbk6n93qqn7w8v21kxf4x6dc3z0ypqrzvgfd46nhagak60ac84"))))
(build-system gnu-build-system)
(outputs '("out" "static"))
(arguments
diff --cc gnu/packages/geo.scm
index c49cda3b0b,432903acc9..78d1131788
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@@ -307,9 -387,10 +387,9 @@@ topology functions."
libhandy
librsvg
libsecret
- libshumate
+ libshumate
libsoup
libxml2
- pango-next ;TODO: remove when it's the default
rest-next
webkitgtk))
(synopsis "Graphical map viewer and wayfinding program")
diff --cc gnu/packages/gnome.scm
index b0a3a1d6d5,f8b02670f7..0b1f30edc8
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -4408,7 -4494,61 +4439,7 @@@ passwords in the GNOME keyring."
(define-public vala
(package
(name "vala")
- (version "0.56.2")
- (version "0.54.2")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/vala/"
- (version-major+minor version) "/"
- "vala-" version ".tar.xz"))
- (sha256
- (base32
- "048k5c6c6y7jyb961krnrb7m0kghr0yrkpnfx3j5ckbx652yfkc8"))))
- (build-system glib-or-gtk-build-system)
- (arguments
- '(#:configure-flags '("--enable-coverage")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-docbook-xml
- (lambda* (#:key inputs #:allow-other-keys)
- (with-directory-excursion "doc/manual"
- (substitute* '("manual.xml" "version.xml.in")
- (("http://www.oasis-open.org/docbook/xml/4.4/";)
- (string-append (assoc-ref inputs "docbook-xml")
- "/xml/dtd/docbook/"))))))
- (add-before 'check 'pre-check
- (lambda _
- (setenv "CC" "gcc")
- (substitute* "valadoc/tests/libvaladoc\
-/tests-extra-environment.sh"
- (("export PKG_CONFIG_PATH=" m)
- (string-append m "$PKG_CONFIG_PATH:"))))))))
- (native-inputs
- `(("bison" ,bison)
- ("dbus" ,dbus) ; for dbus tests
- ("docbook-xml" ,docbook-xml-4.4)
- ("docbook-xsl" ,docbook-xsl)
- ("flex" ,flex)
- ("gobject-introspection" ,gobject-introspection) ; for gir tests
- ("help2man" ,help2man)
- ("perl" ,perl)
- ("pkg-config" ,pkg-config)
- ("xsltproc" ,libxslt)))
- (propagated-inputs
- `(("glib" ,glib) ; required by libvala-0.40.pc
- ("libgvc" ,graphviz)))
- (home-page "https://wiki.gnome.org/Projects/Vala/";)
- (synopsis "Compiler using the GObject type system")
- (description "Vala is a programming language using modern high level
-abstractions without imposing additional runtime requirements and without
using
-a different ABI compared to applications and libraries written in C. Vala
uses
-the GObject type system and has additional code generation routines that make
-targeting the GNOME stack simple.")
- (license license:lgpl2.1+)))
-
-(define-public vala-next
- (package
- (inherit vala)
+ (version "0.56.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/vala/"
@@@ -4416,8 -4556,7 +4447,8 @@@
"vala-" version ".tar.xz"))
(sha256
(base32
- "0k0jj3xwjq222x0hbqqy5bykhgk1f1wsb85bqcdgsnbqn6dn3jb6"))))
+ "1gwrnr0d0bqkh6m4bgz39mh3pcswcj43hyijlwgwp2bvpwhn41p1"))))
+ (build-system glib-or-gtk-build-system)
(arguments
(list
#:configure-flags #~(list "CC=gcc" "--enable-coverage")
@@@ -4902,10 -5093,10 +5002,10 @@@ libxml to ease remote use of the RESTfu
(append gettext-minimal
gi-docgen
gsettings-desktop-schemas)))
- (inputs (list gtksourceview json-glib libadwaita))
+ (inputs (list json-glib))
(propagated-inputs
(modify-inputs (package-propagated-inputs rest)
- (replace "libsoup" libsoup)
+ (replace "libsoup-minimal" libsoup)
(append json-glib)))))
(define-public libshumate
@@@ -8513,6 -8765,64 +8670,63 @@@ Cisco's AnyConnect SSL VPN."
;; so that 'network-manager-service-type' creates it.
(user-accounts . ("nm-openconnect"))))))
+ (define-public network-manager-fortisslvpn
+ (package
+ (name "network-manager-fortisslvpn")
+ (version "1.4.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://gnome/sources/NetworkManager-fortisslvpn/"
+ (version-major+minor version)
+ "/NetworkManager-fortisslvpn-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1ynsqmv8xz1cffnai4hfh0ab0dmlazpv72krhlsv45mm95iy4mdh"))
+ (modules '((guix build utils)))
+ (snippet '(substitute* "Makefile.in"
+ ;; do not try to make state directory
+ (("\\$\\(DESTDIR\\)\\$\\(fortisslvpn_statedir\\)")
+ "")
+ ;; use state directory of the NetworkManager service
+ (("\\$\\(fortisslvpn_statedir\\)")
+ "/var/lib/NetworkManager")))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var"
+ "--with-gtk4=yes")
+ #:phases (modify-phases %standard-phases
+ (add-after 'configure 'patch-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let* ((ovpn (search-input-file inputs
+ "/bin/openfortivpn"))
+ (pretty-ovpn (string-append "\"" ovpn "\"")))
+ (for-each (lambda (file)
+ (substitute* file
+ (("\"/usr/local/bin/openfortivpn\"")
+ pretty-ovpn)
+ (("\"/usr/bin/openfortivpn\"")
+ pretty-ovpn)))
+ '("src/nm-fortisslvpn-service.c"
+
"properties/nm-fortisslvpn-editor.c"))))))))
+ (native-inputs (list intltool
+ `(,glib "bin") pkg-config))
+ (inputs (list gtk+
+ gtk
+ kmod
+ libnma
+ libsecret
+ network-manager
+ openfortivpn
- pango-next ;TODO: remove after it's the default
+ ppp))
+ (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN";)
+ (synopsis "Fortinet SSLVPN plug-in for NetworkManager")
+ (description
+ "This extension of NetworkManager allows it to take care of connections
+ to virtual private networks (VPNs) via Fortinet SSLVPN.")
+ (license license:gpl2+)
+ (properties `((upstream-name . "NetworkManager-fortisslvpn")))))
+
(define-public mobile-broadband-provider-info
(package
(name "mobile-broadband-provider-info")
@@@ -9899,92 -10199,93 +10100,93 @@@ world."
(build-system trivial-build-system)
(arguments '(#:builder (begin (mkdir %output) #t)))
(propagated-inputs
- `(;; GNOME-Core-OS-Services
- ("accountsservice" ,accountsservice)
- ("network-manager" ,network-manager)
- ("packagekit" ,packagekit)
- ("upower" ,upower)
- ;; GNOME-Core-Shell
- ("adwaita-icon-theme" ,adwaita-icon-theme)
- ("gdm" ,gdm)
- ("glib-networking" ,glib-networking)
- ("gnome-backgrounds" ,gnome-backgrounds)
- ("gnome-bluetooth" ,gnome-bluetooth)
- ("gnome-color-manager" ,gnome-color-manager)
- ("gnome-control-center" ,gnome-control-center)
- ("gnome-desktop" ,gnome-desktop)
- ("gnome-initial-setup" ,gnome-initial-setup)
- ("gnome-keyring" ,gnome-keyring)
- ("gnome-menus" ,gnome-menus)
- ("gnome-session" ,gnome-session)
- ("gnome-settings-daemon" ,gnome-settings-daemon)
- ("gnome-shell-extensions" ,gnome-shell-extensions)
- ("gnome-shell" ,gnome-shell)
- ("gnome-themes-extra" ,gnome-themes-extra)
- ("gnome-user-docs" ,gnome-user-docs)
- ("gnome-user-share" ,gnome-user-share)
- ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
- ("gvfs" ,gvfs)
- ("mutter" ,mutter)
- ("orca" ,orca)
- ("rygel" ,rygel)
- ("sushi" ,sushi)
- ;; GNOME-Core-Utilities
- ("baobab" ,baobab)
- ("cheese" ,cheese)
- ;; XXX: EoG requires librsvg-next, which depends on Rust, which
currently
- ;; only works on x86_64, so exclude it on other architectures.
- ,@(if (string-prefix? "x86_64" (%current-system))
- `(("eog" ,eog))
+ `(,@(if (string-prefix? "x86_64" (%current-system))
+ ;; XXX: EoG requires librsvg-next, which depends on Rust, which
currently
+ ;; only works on x86_64, so exclude it on other architectures.
+ (list eog)
'())
- ("epiphany" ,epiphany)
- ("evince" ,evince)
- ("file-roller" ,file-roller)
- ("gedit" ,gedit)
- ("gnome-boxes" ,gnome-boxes)
- ("gnome-calculator" ,gnome-calculator)
- ("gnome-calendar" ,gnome-calendar)
- ("gnome-characters" ,gnome-characters)
- ("gnome-clocks" ,gnome-clocks)
- ("gnome-contacts" ,gnome-contacts)
- ("gnome-disk-utility" ,gnome-disk-utility)
- ("gnome-font-viewer" ,gnome-font-viewer)
- ("gnome-maps" ,gnome-maps)
- ("gnome-music" ,gnome-music)
- ("gnome-photos" ,gnome-photos)
- ("gnome-screenshot" ,gnome-screenshot)
- ("gnome-system-monitor" ,gnome-system-monitor)
- ("gnome-terminal" ,gnome-terminal)
- ("gnome-weather" ,gnome-weather)
- ("nautilus" ,nautilus)
- ("simple-scan" ,simple-scan)
- ("totem" ,totem)
- ("tracker-miners" ,tracker-miners)
- ("yelp" ,yelp)
- ;; Others
- ("hicolor-icon-theme" ,hicolor-icon-theme)
- ("gnome-online-accounts" ,gnome-online-accounts)
-
- ;; Packages not part of GNOME proper but that are needed for a good
- ;; experience. See <https://bugs.gnu.org/39646>.
- ;; XXX: Find out exactly which ones are needed and why.
- ("font-abattis-cantarell" ,font-abattis-cantarell)
- ("font-dejavu" ,font-dejavu)
- ("at-spi2-core" ,at-spi2-core)
- ("dbus" ,dbus)
- ("dconf" ,dconf)
- ("desktop-file-utils" ,desktop-file-utils)
- ("gnome-default-applications" ,gnome-default-applications)
- ("gst-plugins-base" ,gst-plugins-base)
- ("gst-plugins-good" ,gst-plugins-good)
- ("gucharmap" ,gucharmap)
- ("pinentry-gnome3" ,pinentry-gnome3)
- ("pulseaudio" ,pulseaudio)
- ("shared-mime-info" ,shared-mime-info)
- ("system-config-printer" ,system-config-printer)
- ("xdg-user-dirs" ,xdg-user-dirs)
- ("yelp" ,yelp)
- ("zenity" ,zenity)))
+ ,@(list
+ ;; GNOME-Core-OS-Services.
+ accountsservice
+ network-manager
+ packagekit
+ upower
+ ;; GNOME-Core-Shell.
+ adwaita-icon-theme
+ gdm
+ glib-networking
+ gnome-backgrounds
+ gnome-bluetooth
+ gnome-color-manager
+ gnome-control-center
+ gnome-desktop
+ gnome-initial-setup
+ gnome-keyring
+ gnome-menus
+ gnome-session
+ gnome-settings-daemon
+ gnome-shell
+ gnome-shell-extensions
+ gnome-themes-extra
+ gnome-user-docs
+ gnome-user-share
+ gsettings-desktop-schemas
+ gvfs
+ mutter
+ orca
+ rygel
+ sushi
+ ;; GNOME-Core-Utilities.
+ baobab
+ cheese
+ epiphany
+ evince
+ file-roller
+ gnome-boxes
+ gnome-calculator
+ gnome-calendar
+ gnome-characters
+ gnome-clocks
+ gnome-console
+ gnome-contacts
+ gnome-disk-utility
+ gnome-font-viewer
+ gnome-maps
+ gnome-music
+ gnome-photos
+ gnome-screenshot
+ gnome-system-monitor
+ gnome-text-editor
+ gnome-weather
+ nautilus
+ simple-scan
+ totem
+ tracker-miners
+ yelp
+ ;; Others.
+ gnome-online-accounts
+ hicolor-icon-theme
+
+ ;; Packages not part of GNOME proper but that are needed for a good
+ ;; experience. See <https://bugs.gnu.org/39646>.
+ ;; XXX: Find out exactly which ones are needed and why.
- at-spi2-core-minimal
++ at-spi2-core
+ dbus
+ dconf
+ desktop-file-utils
+ font-abattis-cantarell
+ font-dejavu
+ gnome-default-applications
+ gst-plugins-base
+ gst-plugins-good
+ gucharmap
+ pinentry-gnome3
+ pulseaudio
+ shared-mime-info
+ system-config-printer
+ xdg-user-dirs
+ yelp
+ zenity)))
(synopsis "The GNU desktop environment")
(home-page "https://www.gnome.org/";)
(description
diff --cc gnu/packages/gnuzilla.scm
index 6002ff8410,0b39774a2e..2cd7f0f7d8
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@@ -368,171 -346,8 +366,8 @@@ from collections.abc import MutableSequ
rust
`(,rust "cargo")))
(inputs
- (list icu4c readline zlib))))
+ (list icu4c-69 readline zlib))))
- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- ;; Temporary packaging of rust-1.59, pending inclusion in (gnu packages rust)
- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
- (define rust-1.58-promise
- (delay
- (let ((rust-bootstrapped-package
- (@@ (gnu packages rust)
- rust-bootstrapped-package)))
- (rust-bootstrapped-package
- rust "1.58.1"
"1iq7kj16qfpkx8gvw50d8rf7glbm6s0pj2y1qkrz7mi56vfsyfd8"))))
-
- (define rust-1.59-promise
- (delay
- (let ((rust-bootstrapped-package
- (@@ (gnu packages rust)
- rust-bootstrapped-package)))
- (rust-bootstrapped-package
- (force rust-1.58-promise)
- "1.59.0" "1yc5bwcbmbwyvpfq7zvra78l0r8y3lbv60kbr62fzz2vx2pfxj57"))))
-
- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- ;; Temporary packaging of rust-cbindgen-0.23 and its dependencies
- ;; follow, pending their inclusion into (gnu packages rust-apps)
- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
- (define rust-textwrap-0.15-promise
- (delay
- (package
- (inherit rust-textwrap-0.12)
- (name "rust-textwrap")
- (version "0.15.0")
- (source (origin
- (method url-fetch)
- (uri (crate-uri "textwrap" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "1yw513k61lfiwgqrfvsjw1a5wpvm0azhpjr2kr0jhnq9c56is55i"))))
- (arguments
- `(#:skip-build? #t
- #:cargo-inputs (("rust-hyphenation" ,rust-hyphenation-0.8)
- ("rust-smawk" ,rust-smawk-0.3)
- ("rust-terminal-size" ,rust-terminal-size-0.1)
- ("rust-unicode-linebreak" ,rust-unicode-linebreak-0.1)
- ("rust-unicode-width" ,rust-unicode-width-0.1)))))))
-
- (define rust-clap-lex-0.2
- (package
- (name "rust-clap-lex")
- (version "0.2.4")
- (source (origin
- (method url-fetch)
- (uri (crate-uri "clap_lex" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "1ib1a9v55ybnaws11l63az0jgz5xiy24jkdgsmyl7grcm3sz4l18"))))
- (build-system cargo-build-system)
- (arguments
- `(#:skip-build? #t
- #:cargo-inputs (("rust-os-str-bytes" ,rust-os-str-bytes-6))))
- (home-page "https://github.com/clap-rs/clap/tree/master/clap_lex";)
- (synopsis "Minimal, flexible command line parser")
- (description "Minimal, flexible command line parser")
- (license (list license:expat license:asl2.0))))
-
- (define rust-clap-derive-3.2.15-promise
- (delay
- (package
- (inherit rust-clap-derive-3)
- (name "rust-clap-derive")
- (version "3.2.15")
- (source (origin
- (method url-fetch)
- (uri (crate-uri "clap_derive" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "1d2c4vs345fwihkd8cc7m6acbiydcwramkd5mnp36p0a7g6jm9cv"))))
- (arguments
- `(#:skip-build? #t
- #:cargo-inputs (("rust-heck" ,rust-heck-0.4)
- ("rust-proc-macro-error" ,rust-proc-macro-error-1)
- ("rust-proc-macro2" ,rust-proc-macro2-1)
- ("rust-quote" ,rust-quote-1)
- ("rust-syn" ,rust-syn-1)))))))
-
- (define rust-clap-3.2.16-promise
- (delay
- (package
- (inherit rust-clap-3)
- (name "rust-clap")
- (version "3.2.16")
- (source (origin
- (method url-fetch)
- (uri (crate-uri "clap" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "1af06z8z7m3327yz1xvzxfjanclgpvvy3lssb745rig7adkbpnx3"))))
- (arguments
- `(#:skip-build? #t
- #:cargo-inputs (("rust-atty" ,rust-atty-0.2)
- ("rust-backtrace" ,rust-backtrace-0.3)
- ("rust-bitflags" ,rust-bitflags-1)
- ("rust-clap-derive" ,(force
rust-clap-derive-3.2.15-promise))
- ("rust-clap-lex" ,rust-clap-lex-0.2)
- ("rust-indexmap" ,rust-indexmap-1)
- ("rust-once-cell" ,rust-once-cell-1)
- ("rust-regex" ,rust-regex-1)
- ("rust-strsim" ,rust-strsim-0.10)
- ("rust-termcolor" ,rust-termcolor-1)
- ("rust-terminal-size" ,rust-terminal-size-0.1)
- ("rust-textwrap" ,(force rust-textwrap-0.15-promise))
- ("rust-unicase" ,rust-unicase-2)
- ("rust-yaml-rust" ,rust-yaml-rust-0.4)))))))
-
- (define rust-cbindgen-0.24-promise
- (delay
- (package
- (inherit rust-cbindgen-0.19)
- (name "rust-cbindgen")
- (version "0.24.3")
- (source (origin
- (method url-fetch)
- (uri (crate-uri "cbindgen" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "1yqxqsz2d0cppd8zwihk2139g5gy38wqgl9snj6rnk8gyvnqsdd6"))))
- (arguments
- `(#:cargo-inputs (("rust-clap" ,(force rust-clap-3.2.16-promise))
- ("rust-heck" ,rust-heck-0.4)
- ("rust-indexmap" ,rust-indexmap-1)
- ("rust-log" ,rust-log-0.4)
- ("rust-proc-macro2" ,rust-proc-macro2-1)
- ("rust-quote" ,rust-quote-1)
- ("rust-serde" ,rust-serde-1)
- ("rust-serde-json" ,rust-serde-json-1)
- ("rust-syn" ,rust-syn-1)
- ("rust-tempfile" ,rust-tempfile-3)
- ("rust-toml" ,rust-toml-0.5))
- #:cargo-development-inputs (("rust-serial-test"
,rust-serial-test-0.5)))))))
-
- ;; Bug with IceCat 102 with cbindgen-0.24, see
- ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1773259#c5 for
- ;; possible patch (untested)
- (define rust-cbindgen-0.23-promise
- (delay
- (package
- (inherit (force rust-cbindgen-0.24-promise))
- (name "rust-cbindgen")
- (version "0.23.0")
- (source (origin
- (method url-fetch)
- (uri (crate-uri "cbindgen" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "006rn3fn4njayjxr2vd24g1awssr9i3894nbmfzkybx07j728vav")))))))
-
-
(define mozilla-compare-locales
(origin
(method hg-fetch)
diff --cc gnu/packages/gtk.scm
index 354a5b026d,5024455368..d92c9e0c28
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@@ -248,37 -340,26 +289,51 @@@ output. Experimental backends include
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/harfbuzz/harfbuzz";
- "/releases/download/" version
- "/harfbuzz-" version ".tar.xz"))
+ "/releases/download/" version "/harfbuzz-"
+ version ".tar.xz"))
(sha256
(base32
- "0c5mzwgz43d37h75p4b6cgjg4v24jdd96i7gjpgxirn8qks2i5m4"))))))
+ "0ka3nkk2lks2lgakq02vyibwdziv11dkpa2brkx230asnyby0v2a"))))
+ (build-system gnu-build-system)
+ (outputs '("out"
+ "bin")) ;160K, only hb-view depend on cairo
+ (inputs
+ (list cairo))
+ (propagated-inputs
+ ;; There are all in the Requires or Requires.private field of '.pc'.
+ (list glib graphite2 icu4c))
+ (native-inputs
+ (list `(,glib "bin") ;for glib-mkenums
+ gobject-introspection
+ pkg-config
+ python-wrapper
+ which))
+ (arguments
+ (list #:configure-flags
+ #~(list "--with-graphite2"
+ "--with-gobject"
+ (string-append "--bindir=" #$output:bin "/bin"))))
+ (synopsis "OpenType text shaping engine")
+ (description
+ "HarfBuzz is an OpenType text shaping engine.")
+ (license (license:x11-style "file://COPYING"
+ "See 'COPYING' in the distribution."))
+ (home-page "https://www.freedesktop.org/wiki/Software/HarfBuzz/";)))
+
+ (define-public harfbuzz-5
+ (package
+ (inherit harfbuzz)
+ (version "5.3.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/harfbuzz/harfbuzz";
+ "/releases/download/" version "/harfbuzz-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "0ka3nkk2lks2lgakq02vyibwdziv11dkpa2brkx230asnyby0v2a"))))))
+
(define-public libdatrie
(package
(name "libdatrie")
diff --cc gnu/packages/ibus.scm
index 4be80ecbe0,4c45671acc..2143624b92
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@@ -233,7 -238,17 +238,17 @@@
input method user interface. It comes with multilingual input support. It
may also simplify input method development.")
(home-page "https://github.com/ibus/ibus/wiki";)
- (license lgpl2.1+)))
+ (license lgpl2.1+)
+ (properties '((hidden? . #t)))))
+
+ (define-public ibus
+ (package/inherit ibus-minimal
+ (arguments (substitute-keyword-arguments (package-arguments ibus-minimal)
+ ((#:configure-flags flags)
+ #~(cons* "--enable-gtk4" #$flags))))
+ (inputs (modify-inputs (package-inputs ibus-minimal)
- (prepend gtk pango-next)))
++ (prepend gtk pango)))
+ (properties (alist-delete 'hidden? (package-properties ibus-minimal)))))
(define-public ibus-libpinyin
(package
diff --cc gnu/packages/inkscape.scm
index ba9ef8b1d1,d1ac5e7312..ffabc4cf33
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@@ -276,4 -255,25 +277,24 @@@ as the native format."
"inkscape-" version ".tar.xz"))
(sha256
(base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6"))))
+ (build-system cmake-build-system)
+ (arguments
+ (substitute-keyword-arguments (package-arguments inkscape/stable)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (replace 'wrap-program
+ ;; Ensure Python is available at runtime.
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (wrap-program (string-append out "/bin/inkscape")
+ `("GUIX_PYTHONPATH" prefix
+ (,(getenv "GUIX_PYTHONPATH")))
+ ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load
+ ;; its own icons in pure environments.
+ `("GDK_PIXBUF_MODULE_FILE" =
+ (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))))
+ (inputs (modify-inputs (package-inputs inkscape/stable)
- (replace "lib2geom" lib2geom-1.2)
+ (append bash-minimal
+ librsvg ;for the pixbuf loader
+ python-cssselect))) ;to render qrcode
(properties (alist-delete 'hidden? (package-properties
inkscape/stable)))))
diff --cc gnu/packages/kde-plasma.scm
index 265799cd94,2a3d86f801..b9e2db882f
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@@ -355,10 -1051,10 +1051,10 @@@ you login."
(inputs
(list plasma-wayland-protocols
qtbase-5
- qtwayland
+ qtwayland-5
kwayland
wayland
- wayland-protocols-next))
+ wayland-protocols))
(arguments
'(#:phases
(modify-phases %standard-phases
@@@ -386,3 -1082,1444 +1082,1444 @@@ wayland-server API."
;; src/server/drm_fourcc.h carries the MIT license.
license:expat))))
+ (define-public kwayland-integration
+ (package
+ (name "kwayland-integration")
+ (version "5.25.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/"
+ version "/" name "-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "10xl7yrj519b9s5vq0hqqfz3vvg1fdwggw96snzm44iwycqbgss8"))))
+ (build-system qt-build-system)
+ (arguments
+ (list #:phases #~(modify-phases %standard-phases
+ (delete 'check)
+ (add-after 'install 'check-after-install
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (setenv "HOME" (getcwd))
+ (setenv "XDG_RUNTIME_DIR" (getcwd))
+ (setenv "QT_QPA_PLATFORM" "offscreen")
+ ;; https://bugs.gentoo.org/668872
+ (invoke "ctest" "-E"
"(idleTest-kwayland-test)"))))
+ (add-before 'check-after-install 'check-setup
+ (lambda* (#:key outputs #:allow-other-keys)
+ (setenv "QT_PLUGIN_PATH"
+ (string-append #$output
+ "/lib/qt5/plugins:"
+ (getenv
"QT_PLUGIN_PATH"))))))))
+ (native-inputs (list extra-cmake-modules wayland-protocols pkg-config))
+ (inputs (list kguiaddons
+ kidletime
+ kwindowsystem
+ kwayland
+ libxkbcommon
+ wayland
+ qtbase-5
+ qtwayland-5))
+ (synopsis "KWayland runtime integration plugins")
+ (description "This package provides Wayland integration plugins for
various
+ KDE Frameworks components.")
+ (home-page "https://invent.kde.org/plasma/kwayland-integration";)
+ (license (list license:lgpl2.1 license:lgpl3))))
+
+ (define-public kwin
+ (package
+ (name "kwin")
+ (version "5.25.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/" version "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1dh7ydwxbb9r53p353d53gq7w9vmp7idvsr4s5ldxmah35436v2s"))))
+ (build-system qt-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute*
'("src/plugins/kdecorations/aurorae/src/aurorae.cpp")
+ (("(^\\s*QDirIterator it.path,
QDirIterator::Subdirectories)(\\);)"
+ _ a b)
+ (string-append a
+ " | QDirIterator::FollowSymlinks" b)))
+ (substitute*
+ '("autotests/integration/dont_crash_glxgears.cpp"
+ "autotests/integration/debug_console_test.cpp"
+ "autotests/integration/x11_window_test.cpp")
+ (("setProgram\\(QStringLiteral\\(\"glxgears\"\\)")
+ (string-append
+ "setProgram(QByteArrayLiteral(\"" (which "glxgears")
"\")")))
+ (substitute*
+ '("src/wayland/tests/renderingservertest.cpp"
+ "src/wayland/tests/waylandservertest.cpp")
+ (("QByteArrayLiteral\\(\"Xwayland\"\\)")
+ (string-append
+ "QByteArrayLiteral(\"" (which "Xwayland") "\")")))
+ (substitute* '("src/xwayland/xwaylandlauncher.cpp")
+
(("(m_xwaylandProcess->setProgram.QStringLiteral..)(Xwayland)(...;)"
+ _ a Xwayland b)
+ (string-append a
+ (which "Xwayland") b)))
+ (substitute* '("cmake/modules/Findhwdata.cmake")
+ (("/usr/share")
+ (string-append #$hwdata:pnp "/share")))))
+ (add-after 'install 'add-symlinks
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((kst5 (string-append #$output
+ "/share/kservicetypes5/")))
+ (symlink (string-append kst5 "kwineffect.desktop")
+ (string-append kst5 "kwin-effect.desktop"))
+ (symlink (string-append kst5 "kwinscript.desktop")
+ (string-append kst5 "kwin-script.desktop")))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (setenv "XDG_RUNTIME_DIR" (getcwd))
+ (setenv "HOME" (getcwd))
+ (setenv "XDG_DATA_DIRS"
+ (string-append #$output "/share:"
+ (getenv "XDG_DATA_DIRS")))
+ (setenv "QT_PLUGIN_PATH"
+ (string-append #$output
+ "/lib/qt5/plugins:"
+ (getenv "QT_PLUGIN_PATH")))
+ (setenv "DISPLAY" ":1")
+ (system "Xvfb :1 &")
+ (sleep 5)
+ (invoke "ctest" "-E"
+
"(kwayland-testXdgDecoration|kwin-testLockScreen|kwin-testPointerInput|kwin-testXdgShellWindow|kwin-testXdgShellWindow-waylandonly|kwin-testSceneOpenGLES|kwin-testSceneOpenGLES-waylandonly|kwin-testInputMethod|kwin-testInputMethod-waylandonly|kwin-testNightColor|kwin-testNightColor-waylandonly|kwin-testPlasmaWindow|kwin-testSceneQPainter|kwin-testLibinputDevice)")))))))
+ (native-inputs (list extra-cmake-modules
+ dbus
+ kdoctools
+ mesa-utils
+ pkg-config
+ qttools-5
- wayland-protocols-next
++ wayland-protocols
+ xorg-server-for-tests))
+ (inputs (list breeze
+ eudev
+ fontconfig
+ freetype
+ `(,hwdata "pnp")
+ kactivities
+ kcmutils
+ kcompletion
+ kconfig
+ kconfigwidgets
+ kcoreaddons
+ kcrash
+ kdbusaddons
+ kdeclarative
+ kdecoration
+ kglobalaccel
+ ki18n
+ kiconthemes
+ kidletime
+ kio
+ kirigami
+ knewstuff
+ knotifications
+ kpackage
+ krunner
+ kscreenlocker
+ ktextwidgets
+ kwayland
+ kwayland-server
+ kwindowsystem
+ kxmlgui
+ libqaccessibilityclient
+ lcms
+ libcap
+ libepoxy
+ libglvnd ; For OpenGLES
+ libinput
+ libxkbcommon
+ pipewire
+ plasma-framework
+ plasma-wayland-protocols
+ qtbase-5
+ qtdeclarative-5
+ qtmultimedia-5
+ qtwayland-5
+ qtx11extras
+ wayland
+ xcb-util ;fails at build time without this
+ xcb-util-cursor
+ xcb-util-keysyms
+ xcb-util-wm
+ xcmsdb
+ xinput ;XXX: Says disabled in configure phase
+ xorg-server-xwayland
+ zlib))
+ ;; Runtime-only dependency needed for mapping monitor hardware vendor IDs
to full names
+ ;; * QtQuick.Controls-QMLModule, QML module 'QtQuick.Controls' is a
runtime dependency.
+ ;; * org.kde.plasma.core-QMLModule, QML module 'org.kde.plasma.core' is a
runtime dependency.
+ ;; * org.kde.plasma.components-QMLModule, QML module
'org.kde.plasma.components' is a runtime dependency.
+ (home-page "https://userbase.kde.org/KWin";)
+ (synopsis "KDE Plasma Window Manager")
+ (description
+ "KWin is an easy to use, but flexible, composited Window Manager for
+ Xorg windowing systems (Wayland, X11) on Linux. Its primary usage is in
+ conjunction with the KDE Plasma Desktop.")
+ (license license:gpl2+)))
+
+ (define-public kwrited
+ (package
+ (name "kwrited")
+ (version "5.25.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/"
+ version "/" name "-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "03gw3czdgyf35n6x79x416rk6f7w1ayzmy5pb65v9733nx1j34mh"))))
+ (build-system qt-build-system)
+ (native-inputs (list extra-cmake-modules))
+ (inputs (list kcoreaddons ki18n kpty knotifications))
+ (home-page "https://invent.kde.org/plasma/kwrited";)
+ (synopsis "System notification daemon")
+ (description
+ "This package provides a daemon that listens to system notifications.")
+ (license license:gpl2+)))
+
+ (define-public lightly
+ (package
+ (name "lightly")
+ (version "0.4.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Luwx/Lightly";)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0qkjzgjplgwczhk6959iah4ilvazpprv7yb809jy75kkp1jw8mwk"))))
+ (build-system qt-build-system)
+ (native-inputs (list extra-cmake-modules))
+ (inputs (list kdecoration
+ kcoreaddons
+ kguiaddons
+ kconfigwidgets
+ kwindowsystem
+ ki18n
+ kiconthemes
+ qtx11extras))
+ (home-page "https://github.com/Luwx/Lightly";)
+ (synopsis "Modern style for Qt applications")
+ (description
+ "Lightly is a fork of the Breeze theme that aims to be visually modern
+ and minimalistic.")
+ (license license:gpl2+)))
+
+ (define-public milou
+ (package
+ (name "milou")
+ (version "5.25.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/"
+ version "/" name "-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "0ijdbiq169sy47g0x22pj9x6abldpfxcnski4w1jh9hi9qz1rc25"))))
+ (build-system qt-build-system)
+ (native-inputs (list extra-cmake-modules))
+ (inputs (list kcoreaddons
+ ki18n
+ kdeclarative
+ kitemmodels
+ kservice
+ plasma-framework
+ kwindowsystem
+ krunner
+ qtdeclarative-5))
+ (synopsis "Dedicated search application built on top of Baloo")
+ (description "This package provides a dedicated search application built
+ on top of Baloo.")
+ (home-page "https://invent.kde.org/plasma/milou";)
+ (license (list license:gpl2+))))
+
+ (define-public oxygen-sounds
+ (package
+ (name "oxygen-sounds")
+ (version "5.25.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/"
+ version "/" name "-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "04rn3ccqszznknvblz2i8r406m32hk4d3yzma4vzq93jfk57hdf1"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules))
+ (home-page "https://community.kde.org/Frameworks";)
+ (synopsis "Sounds for the KDE desktop")
+ (description "This package provides Oxygen sounds for the KDE desktop.")
+ (license license:lgpl3+)))
+
+ (define-public plasma
+ (package
+ (name "plasma")
+ (version "5.25.5")
+ (source #f)
+ (build-system trivial-build-system)
+ (arguments
+ (list #:builder #~(begin
+ (mkdir #$output))))
+ (propagated-inputs (list bluedevil
+ breeze
+ breeze-gtk
+ discover
+ drkonqi
+ kactivitymanagerd
+ kde-cli-tools
+ ;; kde-gtk-config
+ kdecoration
+ kdeplasma-addons
+ kgamma
+ khotkeys
+ kinfocenter
+ kmenuedit
+ kscreen
+ kscreenlocker
+ ksshaskpass
+ ksystemstats
+ kwallet-pam
+ kwayland-integration
+ kwin
+ kwrited
+ kinit
+ layer-shell-qt
+ libkscreen
+ libksysguard
+ milou
+ ;; oxygen
+ oxygen-sounds
+ plasma-browser-integration
+ plasma-desktop
+ plasma-disks
+ plasma-firewall
+ plasma-integration
+ plasma-nm
+ plasma-pa
+ plasma-systemmonitor
+ ;; plasma-thunderbolt ;; waiting for bolt
+ plasma-vault
+ plasma-workspace
+ plasma-workspace-wallpapers
+ polkit-kde-agent
+ powerdevil
+ sddm
+ system-settings
+ xdg-desktop-portal-kde))
+ (synopsis "The KDE Plasma desktop environment")
+ (home-page "https://kde.org/plasma-desktop/";)
+ (description
+ "KDE Plasma is an advanced graphical desktop system.")
+ (license license:gpl2+)))
+
+ (define-public plasma-bigscreen
+ (package
+ (name "plasma-bigscreen")
+ (version "5.25.90")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/unstable/plasma/" version
+ "/" name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1445j8hzfvh2z91fa8nxrc0z576c67cq5fxcs19pmzpnjjli1ads"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-startplasma
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "bin/plasma-bigscreen-wayland.in"
+ (("^startplasma-wayland")
+ (search-input-file inputs
+
"/bin/startplasma-wayland")))
+ (substitute* "bin/plasma-bigscreen-x11"
+ (("startplasma-x11")
+ (search-input-file inputs
+
"/bin/startplasma-x11"))))))))
+ (native-inputs (list extra-cmake-modules))
+ (inputs (list kactivities
+ kactivities-stats
+ plasma-framework
+ ki18n
+ kirigami
+ kdeclarative
+ kcmutils
+ knotifications
+ kio
+ kwayland
+ kwindowsystem
+ plasma-workspace
+ qtbase-5
+ qtmultimedia-5))
+ (home-page "https://invent.kde.org/plasma/plasma-bigscreen";)
+ (synopsis "Plasma shell for TVs")
+ (description
+ "This package provides a big launcher designed for large screens. It
+ is controllable via voice or TV remote.")
+ (license license:gpl2+)))
+
+ (define-public plasmatube
+ (package
+ (name "plasmatube")
+ (version "22.09")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma-mobile/"
+ version "/" name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "00w9p5fcpv4s406lmcdcbrxf19sgkvf9yy8pfjmf1asvvvi8bpnk"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules))
+ (inputs
+ (list kconfig
+ kirigami
+ ki18n
+ qtbase-5
+ qtdeclarative-5
+ qtmultimedia-5
+ qtquickcontrols2-5
+ qtsvg-5
+ youtube-dl))
+ (home-page "https://apps.kde.org/plasmatube/";)
+ (synopsis "Kirigami YouTube video player")
+ (description "This package provides YouTube video player based
+ on QtMultimedia and @command{yt-dlp}.")
+ (license license:gpl3+)))
+
+ (define-public plasma-active-window-control
+ (let ((commit "0b1c091b5662fb21917064d7809b3be8b4a8be47")
+ (revision "1"))
+ (package
+ (name "plasma-active-window-control")
+ (version (git-version "1.7.3" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url
"https://invent.kde.org/plasma/plasma-active-window-control";)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1lns1n7p6b64z7l3bn27hni100pp3k2whzzzg0adr4hiynycdix6"))))
+ (build-system qt-build-system)
+ (native-inputs (list extra-cmake-modules))
+ (inputs
+ (list kwindowsystem
+ libsm
+ plasma-framework
+ qtdeclarative-5
+ qtx11extras))
+ (home-page "https://invent.kde.org/plasma/plasma-active-window-control";)
+ (synopsis "Plasma applet for controlling the currently active window")
+ (description "This package provides window control applet for the current
+ active window on Plasma Desktop.")
+ (license (list license:gpl2 license:gpl3)))))
+
+ (define-public plasma-browser-integration
+ (package
+ (name "plasma-browser-integration")
+ (version "5.25.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/" version
+ "/" name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "18pbn5ic5l3m8i1y99yprpwd4x4746aq3abqn1f2cq5h2683h2ia"))))
+ (build-system qt-build-system)
+ (native-inputs (list extra-cmake-modules pkg-config))
+ ;; TODO: Figure out how to integrate this package into web browsers
+ ;; CHROMIUM_EXTENSIONS_DIR - extension for chromium
+ ;; MOZILLA_DIR - extension for firefox
+ (inputs (list kio
+ ki18n
+ kcoreaddons
+ kconfig
+ kcrash
+ kdbusaddons
+ knotifications
+ kitemmodels
+ krunner
+ kactivities
+ purpose
+ kfilemetadata
+ kjobwidgets
+ qtdeclarative-5))
+ (propagated-inputs (list plasma-workspace))
+ (home-page "https://invent.kde.org/plasma/plasma-browser-integration";)
+ (synopsis "Integrate browsers into the Plasma Desktop")
+ (description
+ "This package aims to provide better integration of web browsers with
+ the KDE Plasma 5 desktop.")
+ (license license:gpl3+)))
+
+ (define-public plasma-desktop
+ (package
+ (name "plasma-desktop")
+ (version "5.25.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/" version
+ "/" name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "05s1pkwr4xmkghp8jrwcyrvjm83n68ngmk2694055xcfgi0pxicg"))))
+ (build-system qt-build-system)
+ (native-inputs (list extra-cmake-modules
+ dbus
+ kdoctools
+ intltool
+ pkg-config
+ qtsvg-5
+ qttools-5))
+ (inputs (list packagekit-qt5
+ signon-plugin-oauth2
+ signond
+ attica
+ appstream-qt
+ baloo
+ breeze
+ breeze-icons
+ eudev
+ fontconfig
+ glib
+ ibus
+ kaccounts-integration
+ kactivities
+ kactivities-stats
+ kauth
+ karchive
+ kcmutils
+ kconfig
+ kcoreaddons
+ kcrash
+ kdbusaddons
+ kdeclarative
+ kded
+ kdesu
+ kdelibs4support
+ kglobalaccel
+ kguiaddons
+ kholidays
+ ki18n
+ kiconthemes
+ kidletime
+ kinit
+ kio
+ kitemmodels
+ knewstuff
+ knotifications
+ knotifyconfig
+ kpackage
+ kpeople
+ krunner
+ kscreenlocker
+ ktexteditor
+ ktextwidgets
+ kunitconversion
+ kuserfeedback
+ kwallet
+ kwayland
+ kwin
+ layer-shell-qt
+ libaccounts-qt
+ libcanberra
+ libkscreen
+ libksysguard
+ libqalculate
+ gmp
+ mpfr
+ libsm
+ libxi
+ libxft
+ libxkbcommon
+ libxrender
+ libxtst
+ networkmanager-qt
+ phonon
+ pipewire
+ plasma-framework
+ plasma-wayland-protocols
+ pulseaudio
+ prison
+ qqc2-desktop-style
+ qtbase-5
+ qtdeclarative-5
+ qtquickcontrols2-5
+ qtwayland
+ qtx11extras
+ wayland
+ wayland-protocols
+ xcb-util
+ xcb-util-image
+ xcb-util-keysyms
+ xdg-user-dirs
+
+ ;; These are needed for Xserver
+ xf86-input-libinput
+ xf86-input-evdev
+ xorg-server
+ xf86-input-synaptics
+ xkeyboard-config
+ libxkbfile
+ libxcursor
+ libxkbcommon))
+ (propagated-inputs (list iso-codes kirigami plasma-workspace))
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "kcms/keyboard/iso_codes.h"
+ (("\"/usr/share/xml/iso-codes\"")
+ (string-append "\"" (search-input-directory
+ inputs "/share/xml/iso-codes")
+ "\"")))))
+ (add-after 'unpack 'patch-qml-import-path
+ (lambda _
+ (substitute*
+ '("applets/pager/package/contents/ui/main.qml"
+
"containments/desktop/package/contents/ui/FolderView.qml"
+ "containments/desktop/package/contents/ui/main.qml"
+ "containments/panel/contents/ui/main.qml")
+ (("^import \"(utils|FolderTools|LayoutManager).js\" as "
+ line mod)
+ (string-append "import \"../code/" mod
+ ".js\" as ")))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (setenv "HOME" (getcwd))
+ (setenv "XDG_RUNTIME_DIR" (getcwd))
+ (setenv "XDG_CACHE_HOME" (getcwd))
+ (setenv "QT_QPA_PLATFORM" "offscreen")
+ (invoke "ctest" "-E" "foldermodeltest")))))))
+ (home-page "https://kde.org/plasma-desktop/";)
+ (synopsis "Plasma for the Desktop")
+ (description
+ "Plasma Desktop offers a beautiful looking desktop that takes
+ complete advantage of modern computing technology. Through the use of visual
+ effects and scalable graphics, the desktop experience is not only smooth but
+ also pleasant to the eye. The looks of Plasma Desktop not only provide
+ beauty, they are also used to support and improve your computer
+ activities effectively, without being distracting.")
+ (license license:gpl2+)))
+
+ (define-public plasma-disks
+ (package
+ (name "plasma-disks")
+ (version "5.25.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/"
+ version "/" name "-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "0vci2cf8vx2lclypys9rmvjb8haakv6ksrvqm5j28pazbq2kskvl"))))
+ (build-system qt-build-system)
+ (native-inputs (list extra-cmake-modules))
+ (inputs (list kcoreaddons
+ kdbusaddons
+ knotifications
+ ki18n
+ solid
+ kservice
+ kio
+ kauth
+ kdeclarative
+ smartmontools))
+ (synopsis "Monitors S.M.A.R.T. capable devices for imminent failure")
+ (description "This package provides interface to S.M.A.R.T. data of
disks.")
+ (home-page "https://invent.kde.org/plasma/plasma-disks";)
+ (license (list license:gpl2 license:gpl3))))
+
+ (define-public plasma-firewall
+ (package
+ (name "plasma-firewall")
+ (version "5.25.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/"
+ version "/" name "-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "0k3pc0dcsjr2hhh4hr8vhsvaddn66s6imm8skrr02icxqvljs6jh"))))
+ (build-system qt-build-system)
+ (native-inputs (list extra-cmake-modules))
+ (inputs (list iproute
+ kcoreaddons
+ kcmutils
+ ki18n
+ kdeclarative
+ python
+ qtdeclarative-5))
+ (synopsis "Control Panel for system firewall")
+ (description "This package provides interface to system firewall.")
+ (home-page "https://invent.kde.org/plasma/plasma-firewall";)
+ (license (list license:gpl2 license:gpl3))))
+
+ (define-public plasma-integration
+ (package
+ (name "plasma-integration")
+ (version "5.25.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/"
+ version "/" name "-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1pab56cg2zi8fcaar53lhhh98iw7l07f5lkymkqhsh8a5crfc3yr"))))
+ (build-system qt-build-system)
+ (arguments
+ (list #:tests? #f ;TODO: Failing tests
+ #:phases #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (setenv "HOME" (getcwd))
+ (setenv "XDG_RUNTIME_DIR" (getcwd))
+ (setenv "XDG_CACHE_HOME" (getcwd))
+ (setenv "QT_QPA_PLATFORM" "offscreen")
+ (invoke "ctest" "-E"
+
"(frameworkintegration-kdeplatformtheme_unittest|frameworkintegration-kfontsettingsdata_unittest|frameworkintegration-kfiledialog_unittest|qmltests|frameworkintegration-kfiledialogqml_unittest")))))))
+ (native-inputs (list extra-cmake-modules pkg-config))
+ (inputs (list breeze
+ kconfig
+ kio
+ ki18n
+ kwidgetsaddons
+ kconfigwidgets
+ kiconthemes
+ knotifications
+ libxcb
+ libxcursor
+ plasma-wayland-protocols
+ qtdeclarative-5
+ qtquickcontrols2-5
+ qtwayland-5
+ qtx11extras
+ wayland))
+ (home-page "https://invent.kde.org/plasma/plasma-integration";)
+ (synopsis
+ "Qt Platform Theme integration plugins for the Plasma workspaces")
+ (description
+ "This package provides a set of plugins responsible for better
+ integration of Qt applications when running on a KDE Plasma workspace.")
+ (license license:lgpl2.0)))
+
+ (define-public plasma-nano
+ (package
+ (name "plasma-nano")
+ (version "5.24.3")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://download.kde.org/stable/plasma/";
+ version "/plasma-nano-" version ".tar.xz"))
+ (sha256
+ (base32
+ "13jxhfi3c3dhg7zdyfqnsii661h1am0w9dsv82dalqvwr1mw28l5"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules pkg-config qttools))
+ (inputs (list qtbase-5
+ qtdeclarative-5
+ plasma-framework
+ kwindowsystem
+ kwayland
+ ki18n))
+ (home-page "https://plasma-mobile.org/";)
+ (synopsis "Minimal Plasma Shell package")
+ (description
+ "This package provides a minimal implementation of Plasma Shell.")
+ (license license:lgpl2.0+)))
+
+ (define-public plasma-nm
+ (package
+ (name "plasma-nm")
+ (version "5.25.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/"
+ version "/" name "-" version
+ ".tar.xz"))
+ (sha256
+ (base32
+ "036bx0qjrjanfxy8aiy6ab7rmm2h8l7wlkvlwhzw2hgl1w03xjps"))))
+ (build-system qt-build-system)
+ (arguments
+ (list #:phases #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "ctest" "-E"
"mobileproviderstest")))))))
+ (native-inputs (list extra-cmake-modules pkg-config))
+ (home-page "https://invent.kde.org/plasma/plasma-nm";)
+ (inputs (list kconfigwidgets
+ kcompletion
+ kcoreaddons
+ kdeclarative
+ kdbusaddons
+ kio
+ ki18n
+ networkmanager-qt
+ knotifications
+ kirigami
+ plasma-framework
+ modemmanager-qt
+ network-manager
+ qca
+ kservice
+ solid
+ prison
+ kwallet
+ kwidgetsaddons
+ kwindowsystem
+ openconnect
+ qtdeclarative-5))
+ (synopsis "Plasma applet for managing network connections")
+ (description "This package provides Plasma applet for managing network
+ connections.")
+ (license (list license:lgpl2.1 license:lgpl3))))
+
+ (define-public plasma-mobile
+ (package
+ (name "plasma-mobile")
+ (version "5.24.3")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://download.kde.org/stable/plasma/";
+ version "/plasma-mobile-" version
".tar.xz"))
+ (sha256
+ (base32
+ "1bwmy7xvd8wmh0snqqjh9jjgawib8ks2g30w48sqxwhplhf3da58"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:phases #~(modify-phases %standard-phases
+ (add-after 'install 'wrap-script
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (wrap-program (string-append #$output
+ "/bin/kwinwrapper")
+ `("PATH" ":" prefix
+ (,(string-append
#$plasma-framework
+ "/bin")))))))))
+ (native-inputs (list extra-cmake-modules pkg-config qttools))
+ (inputs (list bash-minimal
+ kdeclarative
+ ki18n
+ kio
+ knotifications
+ kwayland
+ kwin
+ modemmanager-qt
+ networkmanager-qt
+ plasma-framework
+ qtbase-5))
+ (home-page "https://plasma-mobile.org/";)
+ (synopsis
+ "General UI components for Plasma Phone including shell, containment and
applets")
+ (description "This package provides user-friendly, privacy-enabling and
+ customizable platform for mobile devices.")
+ (license (list license:gpl3+ license:lgpl2.1+))))
+
+ (define-public plasma-mobile-settings
+ (package
+ (name "plasma-mobile-settings")
+ (version "22.02")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma-mobile/" version
+ "/plasma-settings-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0b7lj3r9z9cz2vr0h15sqqxdaa7m07hsk8i2p8nf4a3yh02ywsxy"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules pkg-config))
+ (inputs (list qtbase-5
+ qtdeclarative-5
+ kio
+ modemmanager-qt
+ networkmanager-qt
+ ki18n
+ plasma-framework
+ kdeclarative
+ kdbusaddons))
+ (home-page "https://plasma-mobile.org/";)
+ (synopsis "Settings application for Plasma Mobile")
+ (description
+ "This package provides Settings application for Plasma Mobile.")
+ (license license:gpl2+)))
+
+ (define-public plasma-mobile-sounds
+ (package
+ (name "plasma-mobile-sounds")
+ (version "0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kde/stable/plasma-mobile-sounds/"
+ version "/plasma-mobile-sounds-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1br6kzicrr45vgg0ciqczxlcid21n5lfjm6zc06rw86ys7fx7bpi"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules pkg-config))
+ (home-page "https://plasma-mobile.org/";)
+ (synopsis "Sounds for Plasma Mobile devices")
+ (description "This package provides sound files for Plasma Mobile.")
+ (license (list license:cc0 license:cc-by4.0))))
+
+ (define-public plasma-pa
+ (package
+ (name "plasma-pa")
+ (version "5.25.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/"
+ version "/" name "-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "0g06pm1isnzx4hv6380rjpyr22s4j5iw9083s71vnl4npx28npvb"))))
+ (build-system qt-build-system)
+ (native-inputs (list extra-cmake-modules kdoctools pkg-config))
+ (inputs (list glib
+ kcoreaddons
+ kdeclarative
+ kglobalaccel
+ knotifications
+ kwindowsystem
+ kirigami
+ ki18n
+ qtdeclarative-5))
+ (propagated-inputs (list libcanberra pulseaudio plasma-framework))
+ (home-page "https://invent.kde.org/plasma/plasma-pa";)
+ (synopsis "Plasma applet for audio volume management using PulseAudio")
+ (description
+ "This package provides Plasma applet for audio volume management using
+ PulseAudio.")
+ (license (list license:lgpl2.1 license:lgpl3))))
+
+ (define-public plasma-pass
+ (package
+ (name "plasma-pass")
+ (version "1.2.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/" name "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "107pd6cnkd46px83pm3q7vbw10g5pd0qsw77jmr0c774k4xv1w01"))))
+ (build-system qt-build-system)
+ (native-inputs (list extra-cmake-modules))
+ (inputs (list ki18n kitemmodels kwindowsystem oath-toolkit
qtdeclarative-5))
+ (propagated-inputs (list plasma-framework))
+ (home-page "https://invent.kde.org/plasma/plasma-pass";)
+ (synopsis "Plasma applet for the Pass password manager")
+ (description
+ "This package provides a Plasma applet for the Pass password manager.")
+ (license license:lgpl2.1+)))
+
+ (define-public plasma-phonebook
+ (package
+ (name "plasma-phonebook")
+ (version "0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma-phonebook/"
+ version "/plasma-phonebook-" version
+ ".tar.xz"))
+ (sha256
+ (base32
+ "13nnzdzpganlp319sc9dm9w5hsjhw4f3w8rb80q3nd8q6nyrpky8"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules pkg-config))
+ (inputs (list kpeople
+ kirigami
+ kpeoplevcard
+ kcoreaddons
+ kcontacts
+ qtbase-5
+ qtdeclarative-5
+ qtquickcontrols2-5
+ qtsvg-5))
+ (home-page "https://plasma-mobile.org/";)
+ (synopsis "Phonebook for Plasma Mobile devices")
+ (description "This package provides contacts application which allows
+ adding, modifying and removing contacts.")
+ (license license:lgpl2.0+)))
+
+ (define-public plasma-phone-components
+ (package
+ (name "plasma-phone-components")
+ (version "5.23.4")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/" version
+ "/plasma-phone-components-" version
+ ".tar.xz"))
+ (sha256
+ (base32
+ "0ml5pyi90nlmx5550sf3x9263f8mypj4jmdskzabzhnz44ck8vy9"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules pkg-config qttools))
+ (inputs (list qtbase-5
+ qtdeclarative
+ kactivities
+ kauth
+ kbookmarks
+ kwin
+ kcodecs
+ kcompletion
+ kconfig
+ kconfigwidgets
+ kcoreaddons
+ kdbusaddons
+ kdeclarative
+ ki18n
+ kio
+ kitemviews
+ kjobwidgets
+ knotifications
+ kpackage
+ kpeople
+ kservice
+ kwayland
+ kwidgetsaddons
+ kwindowsystem
+ kxmlgui
+ libphonenumber
+ modemmanager-qt
+ plasma-framework
+ solid))
+ (home-page "https://plasma-mobile.org/";)
+ (synopsis "Modules providing phone functionality for Plasma")
+ (description "This package provides user-friendly, privacy-enabling
+ and customizable platform for mobile devices.")
+ (license (list license:gpl3+ license:lgpl2.1+))))
+
+ (define-public plasma-redshift-control
+ (let ((commit "d9f38a5f0bcf030be16db1776166581c16e802cb")
+ (revision "1"))
+ (package
+ (name "plasma-redshift-control")
+ (version (git-version "0.1-pre" revision commit))
+ (home-page "https://invent.kde.org/plasma/plasma-redshift-control";)
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference (url home-page) (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1wadxhy6iljhikfw2rbj9dhwb86f2sgwyf62r7sfq6cszcpgp0xi"))))
+ (build-system qt-build-system)
+ (native-inputs (list extra-cmake-modules pkg-config))
+ (inputs (list kwindowsystem plasma-framework redshift))
+ (synopsis "Adjust color temperature")
+ (description
+ "This package provides color temperature control applet for the Plasma
+ Desktop.")
+ (license (list license:lgpl2.1 license:lgpl3)))))
+
+ (define-public plasma-vault
+ (package
+ (name "plasma-vault")
+ (version "5.25.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/" version
+ "/" name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "15nf4myl6sry0930m8qiixpr1i8bh1g58cy2gf304h029vr2fn5j"))))
+ (build-system qt-build-system)
+ (native-inputs (list extra-cmake-modules pkg-config))
+ (inputs (list kio
+ ki18n
+ kconfigwidgets
+ kconfig
+ kactivities
+ kdbusaddons
+ kiconthemes
+ networkmanager-qt
+ libksysguard
+ plasma-framework
+ qtdeclarative-5))
+ (home-page "https://invent.kde.org/plasma/plasma-vault";)
+ (synopsis "Plasma applet and services for creating encrypted vaults")
+ (description "Provides Plasma applet and services for creating encrypted
+ vaults.")
+ (license (list license:gpl2 license:gpl3))))
+
+ (define-public plasma-systemmonitor
+ (package
+ (name "plasma-systemmonitor")
+ (version "5.25.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/" version "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0rs3avhpmfapzha8dkir9ny60ba2m92bbfv4avsd85vz5kggg29h"))))
+ (build-system qt-build-system)
+ (native-inputs (list extra-cmake-modules))
+ (inputs (list ki18n
+ kconfig
+ kdeclarative
+ kservice
+ kiconthemes
+ kglobalaccel
+ kio
+ kdbusaddons
+ kirigami
+ knewstuff
+ ksystemstats
+ kitemmodels
+ libksysguard
+ qtdeclarative-5
+ qtquickcontrols2-5))
+ (synopsis "System sensors, process information and other system resources
+ monitor")
+ (description "This package provides an interface for monitoring system
+ sensors, process information and other system resources.")
+ (home-page "https://invent.kde.org/plasma/plasma-systemmonitor";)
+ (license (list license:gpl2 license:gpl3))))
+
+ (define-public plasma-welcome
+ (let ((commit "dac7569078782a96f122782c15d34e51737d2b89") ; no tags
+ (revision "1"))
+ (package
+ (name "plasma-welcome")
+ (version (git-version "0.1-pre" revision commit))
+ (home-page "https://invent.kde.org/plasma/plasma-welcome";)
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference (url home-page) (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1x7ra699r5a9kpa3isdnx6af4j6778kw2pmprnx4s8f1rwk2idhh"))))
+ (build-system qt-build-system)
+ (native-inputs
+ (list extra-cmake-modules pkg-config))
+ (inputs
+ (list kcoreaddons
+ kdbusaddons
+ kdeclarative
+ ki18n
+ kio
+ kirigami
+ knotifications
+ kservice
+ kwindowsystem
+ networkmanager-qt
+ plasma-framework
+ qtdeclarative-5
+ qtgraphicaleffects
+ qtsvg-5
+ qtquickcontrols2-5
+ system-settings))
+ (synopsis "Plasma welcome screen")
+ (description
+ "This package provides a wizard for Plasma to configure settings.")
+ (license (list license:gpl2 license:gpl3)))))
+
+ (define-public plasma-workspace
+ (package
+ (name "plasma-workspace")
+ (version "5.25.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/" version
+ "/" name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0pxwg3i07sipfchn4qkmlr6kcgqbhj2s10xq69wi32x1fc13jx5x"))))
+ (build-system qt-build-system)
+ (native-inputs (list extra-cmake-modules kdoctools pkg-config qtsvg-5
+ qttools-5))
+ (inputs (list appmenu-gtk-module
+ appstream-qt
+ baloo
+ breeze
+ breeze-icons
+ dbus
+ fontconfig
+ iso-codes
+ kactivities
+ kactivities-stats
+ karchive
+ kcmutils
+ kcoreaddons
+ kcrash
+ kdbusaddons
+ kdeclarative
+ kded
+ kdesu
+ kglobalaccel
+ kguiaddons
+ kholidays
+ ki18n
+ kiconthemes
+ kidletime
+ kinit
+ kio
+ kio-extras
+ kio-fuse
+ kitemmodels
+ kirigami
+ knewstuff
+ knotifications
+ knotifyconfig
+ kquickcharts
+ kpackage
+ kpeople
+ krunner
+ kscreenlocker
+ ktexteditor
+ ktextwidgets
+ kunitconversion
+ kuserfeedback
+ kwallet
+ kwayland
+ kwin
+ layer-shell-qt
+ libkscreen
+ libksysguard
+ libqalculate
+ gmp
+ mpfr
+ libsm
+ libxft
+ libxkbcommon
+ libxrender
+ libxtst
+ networkmanager-qt
+ phonon
+ pipewire
+ plasma-framework
+ plasma-workspace-wallpapers
+ plasma-wayland-protocols
+ prison
+ qtbase-5
+ qtdeclarative-5
+ qtquickcontrols2-5
+ qtwayland-5
+ qtgraphicaleffects
+ qtx11extras
+ wayland
- wayland-protocols-next
++ wayland-protocols
+ xcb-util
+ xcb-util-image
+ xcb-util-keysyms
+ xrdb
+ xmessage
+ xsetroot
+ zlib))
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-wallpaper
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "sddm-theme/theme.conf.cmake"
+ (("background=..KDE_INSTALL_FULL_WALLPAPERDIR.")
+ (string-append "background="
+ #$(this-package-input "breeze")
+ "/share/wallpapers")))))
+ (add-after 'unpack 'patch-workspace-bins
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((xmessage (search-input-file inputs "/bin/xmessage"))
+ (xsetroot (search-input-file inputs "/bin/xsetroot"))
+ (xrdb (search-input-file inputs "/bin/xrdb"))
+ (kinit #$(this-package-input "kinit")))
+ (substitute* "startkde/startplasma.cpp"
+ (("xmessage") xmessage)
+ (("xsetroot") xsetroot))
+ (substitute* (list "kcms/fonts/fontinit.cpp"
+ "kcms/fonts/fonts.cpp"
+ "kcms/krdb/krdb.cpp")
+ (("xrdb") xrdb))
+ (substitute* "startkde/plasma-session/startup.cpp"
+ (("CMAKE_INSTALL_FULL_LIBEXECDIR_KF5..")
+ (string-append "\"" kinit
+ "/lib/libexec/kf5")))
+ (substitute* (list
+ "startkde/startplasma-wayland.cpp"
+ "startkde/startplasma-x11.cpp")
+ (("kdeinit5_shutdown")
+ (string-append kinit "/bin/kdeinit5_shutdown"))))))
+ (delete 'check)
+ (add-after 'install 'check-after-install
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (setenv "HOME" (getcwd))
+ (setenv "XDG_RUNTIME_DIR" (getcwd))
+ (setenv "XDG_CACHE_HOME" (getcwd))
+ (setenv "QT_QPA_PLATFORM" "offscreen")
+ (setenv "QT_PLUGIN_PATH"
+ (string-append #$output
+ "/lib/qt5/plugins:"
+ (getenv "QT_PLUGIN_PATH")))
+ (invoke "ctest" "-E"
+
"(appstreamtest|lookandfeel-kcmTest|tst_triangleFilter|systemtraymodeltest|testdesktop|
screenpooltest)")))))))
+ (home-page "https://invent.kde.org/plasma/plasma-workspace";)
+ (synopsis "Plasma workspace components")
+ (description
+ "Workspaces provide support for KDE Plasma Widgets, integrated search,
+ hardware management, and a high degree of customizability.")
+ (license (list license:gpl2 license:gpl3))))
+
+ (define-public plasma-workspace-wallpapers
+ (package
+ (name "plasma-workspace-wallpapers")
+ (version "5.25.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/" version
+ "/" name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0pdgg8h6zwyxf1pj241mg3hd94wh38bqxj68af5jfp10xrwkzcyr"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules))
+ (home-page "https://community.kde.org/Frameworks";)
+ (synopsis "Oxygen wallpapers for the KDE desktop")
+ (description
+ "This package provides wallpapers for the KDE desktop.")
+ (license license:lgpl3+)))
+
+ (define-public polkit-kde-agent
+ (package
+ (name "polkit-kde-agent")
+ (version "5.25.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/" version "/"
+ name "-1-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1qb9nxlkgcv0c30l2vqgf9xs9d220q5pg7ikpb6zjzvj4wsvlvwd"))))
+ (build-system qt-build-system)
+ (native-inputs (list extra-cmake-modules))
+ (inputs (list ki18n
+ kwindowsystem
+ kdbusaddons
+ kwidgetsaddons
+ kcoreaddons
+ kcrash
+ kiconthemes
+ polkit-qt))
+ (synopsis "Polkit authentication UI for Plasma")
+ (description
+ "This package contains a daemon providing a Polkit authentication
+ UI for Plasma")
+ (home-page "https://invent.kde.org/plasma/polkit-kde-agent-1";)
+ (license license:gpl2+)))
+
+ (define-public powerdevil
+ (package
+ (name "powerdevil")
+ (version "5.25.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/" version
+ "/" name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0anisirn7z8aw442npdnk1csb5ghpzj2hx49gpw4l6ijk70b76pr"))))
+ (build-system qt-build-system)
+ (native-inputs (list extra-cmake-modules qttools-5 pkg-config))
+ (inputs (list bluez-qt
+ glib
+ kauth
+ kactivities
+ kscreen
+ kidletime
+ kconfig
+ kdbusaddons
+ solid
+ ki18n
+ kcrash
+ knotifyconfig
+ networkmanager-qt
+ kio
+ kwayland
+ kglobalaccel
+ kcrash
+ knotifications
+ kirigami
+ libcap
+ libkscreen
+ network-manager
+ plasma-workspace
+ eudev
+ qtx11extras))
+ (synopsis "Manage power consumption")
+ (description "This package provides the power consumption settings
+ of a Plasma shell.")
+ (home-page "https://invent.kde.org/plasma/powerdevil";)
+ (license license:gpl2+)))
+
+ (define-public system-settings
+ (package
+ (name "system-settings")
+ (version "5.25.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/" version
+ "/systemsettings-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0n7mf6ygi8fgn1m6pk2fadnqj1h58mxqni3h19xbi373wfypq5fl"))))
+ (build-system qt-build-system)
+ (native-inputs (list extra-cmake-modules))
+ (inputs (list kauth
+ kcrash
+ kitemviews
+ kitemmodels
+ kcmutils
+ ki18n
+ kio
+ kservice
+ kiconthemes
+ kwidgetsaddons
+ kwindowsystem
+ kxmlgui
+ kdbusaddons
+ kconfig
+ kpackage
+ kactivities
+ kactivities-stats
+ kguiaddons
+ kirigami
+ knotifications
+ krunner
+ plasma-workspace
+ qtdeclarative-5))
+ (synopsis "Control center to configure Plasma Desktop")
+ (description "This package provides configuration UI for Plasma Desktop.")
+ (home-page "https://invent.kde.org/plasma/systemsettings";)
+ (license license:gpl2+)))
diff --cc gnu/packages/linux.scm
index 7679d9a4a7,c90fbf396f..a1fa8bcaab
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -635,18 -743,13 +743,13 @@@ corresponding UPSTREAM-SOURCE (an origi
linux-libre-4.14-gnu-revision
linux-libre-4.14-source))
- (define-public linux-libre-headers-4.9
- (make-linux-libre-headers* linux-libre-4.9-version
- linux-libre-4.9-gnu-revision
- linux-libre-4.9-source))
-
;; The following package is used in the early bootstrap, and thus must be kept
;; stable and with minimal build requirements.
-(define-public linux-libre-headers-5.10.35
- (make-linux-libre-headers "5.10.35" "gnu"
-
"0q2rnchad55d49f3rajrkazz0fcjv1irwrdb1hwjnl01fzm2gjk3"))
+(define-public linux-libre-headers-5.15.49
+ (make-linux-libre-headers "5.15.49" "gnu"
+
"13zqdcm4664vh7g57sxbfrlpsxm7zrma72mxdfdz7d9yndy2gfv8"))
-(define-public linux-libre-headers linux-libre-headers-5.10.35)
+(define-public linux-libre-headers linux-libre-headers-5.15.49)
;;;
@@@ -2636,10 -2868,58 +2853,60 @@@ This package also includes @command{ip6
IPv6 packet filter.
Both commands are targeted at system administrators.")
+ (properties
+ '((release-monitoring-url . "https://www.netfilter.org/pub/iptables/";)))
(license license:gpl2+)))
+ (define-public bolt
+ (package
+ (name "bolt")
+ (version "0.9.5")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.freedesktop.org/bolt/bolt";)
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1b9z0sfrz6bj0mddng9s0dx59g9239zmrl03hxx2x88mb7r0wmcg"))))
+ (build-system meson-build-system)
+ (arguments
+ (list #:configure-flags '(list "--localstatedir=/var")
+ #:glib-or-gtk? #t ;To wrap binaries and/or compile schemas
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'replace-directories
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "meson.build"
+ (("udev.get_pkgconfig_variable..udevdir..")
+ (string-append "'"
+ #$output "/lib/udev'")))
+ (substitute* "scripts/meson-install.sh"
+ (("mkdir.*")
+ ""))))
+ (add-before 'install 'no-polkit-magic
+ (lambda* (#:key outputs #:allow-other-keys)
+ (setenv "PKEXEC_UID" "something"))))))
+ (native-inputs (list pkg-config
+ `(,glib "bin") python asciidoc umockdev))
+ (inputs (list eudev dbus polkit))
+ (synopsis "Thunderbolt 3 device manager")
+ (description
+ "This package provides @command{boltd}, a userspace daemon
+ for Thunderbolt devices, and @command{boltctl}, a command-line utility for
+ managing those devices.
+
+ The daemon @command{boltd} exposes devices via D-Bus to clients. It also
+ stores a database of previously authorized devices and will, depending on the
+ policy set for the individual devices, automatically authorize newly connected
+ devices without user interaction.
+
+ The command-line utility @command{boltctl} manages Thunderbolt devices via
+ @command{boltd}. It can list devices, monitor changes, and initiate
+ authorization of devices.")
+ (home-page "https://gitlab.freedesktop.org/bolt/bolt";)
+ (license license:gpl2+)))
+
(define-public jitterentropy-rngd
(package
(name "jitterentropy-rngd")
diff --cc gnu/packages/llvm.scm
index b46cb06443,58bd91d7be..4b9e0930a9
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@@ -655,19 -723,42 +723,38 @@@ of programming tools as well as librari
#~(modify-phases #$phases
(add-after 'unpack 'change-directory
(lambda _
- (chdir "clang"))))))))))
- (chdir "compiler-rt")))))))
- (native-inputs
- `(;; FIXME: libfuzzer fails to build with GCC 10.
- ("gcc" ,gcc-11)
- ,@(package-native-inputs template))))))
++ (chdir "compiler-rt"))))))))))
- (define-public libomp-14
+ (define-public clang-15
+ (clang-from-llvm
+ llvm-15 clang-runtime-15
+ #:tools-extra
+ (origin
+ (method url-fetch)
+ (uri (llvm-uri "clang-tools-extra"
+ (package-version llvm-15)))
+ (sha256
+ (base32
+ "099v2yqg11h0h8qqddzkny6b77pafcr7vy5ksc33kqggji173ccj")))))
+
+ (define-public clang-14
+ (clang-from-llvm
+ llvm-14 clang-runtime-14
+ #:legacy-build-shared-libs? #t
+ #:tools-extra
+ (origin
+ (method url-fetch)
+ (uri (llvm-uri "clang-tools-extra"
+ (package-version llvm-14)))
+ (sha256
+ (base32
+ "0rhq4wkmvr369nkk059skzzw7jx6qhzqhmiwmqg4sp66avzviwvw")))))
+
+ (define-public libomp-15
(package
(name "libomp")
- (version (package-version llvm-14))
- (source (origin
- (method url-fetch)
- (uri (llvm-uri "openmp" version))
- (sha256
- (base32
- "07zby3gwy5c8jssabrhjk3nsxlwipnm6sk4dsvck1l5d0br1ywsg"))
- (file-name (string-append "libomp-" version ".tar.xz"))))
+ (version (package-version llvm-15))
+ (source (llvm-monorepo version))
(build-system cmake-build-system)
;; XXX: Note this gets built with GCC because building with Clang itself
;; fails (missing <atomic>, even when libcxx is added as an input.)
@@@ -896,7 -1015,8 +1012,8 @@@ Library."
(define-public clang-11
(clang-from-llvm llvm-11 clang-runtime-11
- "02ajkij85966vd150iy246mv16dsaph1kfi0y8wnncp8w6nar5hg"
+ "12sm91qx2m79cvj75a9aazf2x8xybjbd593dv6v7rxficpq8i0ha"
+ #:legacy-build-shared-libs? #t
#:patches '("clang-11.0-libc-search-path.patch")
#:tools-extra
(origin
diff --cc gnu/packages/moreutils.scm
index aaa787c1d9,4b0b617bde..d219c78d4f
--- a/gnu/packages/moreutils.scm
+++ b/gnu/packages/moreutils.scm
@@@ -64,6 -63,17 +63,17 @@@
#$(package-version
(this-package-native-input
"docbook-xsl")))
(string-append "CC=" #$(cc-for-target)))))
+ (inputs
+ (list perl
+ perl-ipc-run
+ perl-timedate
+ perl-time-duration))
+ ;; For building the manual pages.
+ (native-inputs
+ (list docbook-xml-4.4
- docbook-xsl-next ;without -next, man pages are corrupted
++ docbook-xsl ;without -next, man pages are corrupted
+ libxml2
+ libxslt))
(home-page "https://joeyh.name/code/moreutils/";)
(synopsis "Miscellaneous general-purpose command-line tools")
(description
diff --cc gnu/packages/onc-rpc.scm
index 3372dc5cd3,3928e80476..afeb26331c
--- a/gnu/packages/onc-rpc.scm
+++ b/gnu/packages/onc-rpc.scm
@@@ -82,10 -85,17 +85,10 @@@ IPv4 and IPv6. ONC RPC is notably use
(substitute-keyword-arguments (package-arguments libtirpc)
((#:configure-flags flags ''())
;; When cross-building the target system's krb5-config should be used.
- `(list (string-append "ac_cv_prog_KRB5_CONFIG="
- (assoc-ref %build-inputs "mit-krb5")
- "/bin/krb5-config")))))))
+ #~(list (string-append "ac_cv_prog_KRB5_CONFIG="
+ #$(this-package-input "mit-krb5")
+ "/bin/krb5-config")))))))
-(define libtirpc/fixed
- (package
- (inherit libtirpc)
- (source (origin
- (inherit (package-source libtirpc))
- (patches (search-patches "libtirpc-CVE-2021-46828.patch"))))))
-
(define-public rpcbind
(package
(name "rpcbind")
diff --cc gnu/packages/openldap.scm
index 1b9dc94341,3f3015bd80..b382043962
--- a/gnu/packages/openldap.scm
+++ b/gnu/packages/openldap.scm
@@@ -81,40 -145,26 +145,37 @@@
(sha256
(base32
"0ihddk8c6hg9lkjv0wk0w13g8kb75r8dfsn1n6b77mzk3pbs38nj"))))
- (build-system gnu-build-system)
- (inputs (list bdb-5.3 cyrus-sasl gnutls libgcrypt zlib))
- (native-inputs (list libtool groff bdb-5.3))
(arguments
- (substitute-keyword-arguments (package-arguments openldap)
- ((#:phases phases)
- #~(modify-phases #$phases
- (replace 'patch-sasl-path
- ;; Give -L arguments for cyrus-sasl to avoid propagation.
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((krb5 (search-input-file inputs "/lib/libkrb5.so")))
- (substitute* (string-append #$output "/lib/libldap.la")
- (("-lkrb5" lib)
- (string-append "-L" (dirname krb5) "/lib " lib))))))
- (add-after 'install 'provide-ldap_r
- (lambda _
- ;; The re-entrant libldap_r no longer exists since 2.6
- ;; as it has become the default: provide a linker alias
- ;; for now.
- (call-with-output-file (string-append #$output
- "/lib/libldap_r.so")
- (lambda (port)
- (format port "INPUT ( libldap.so )~%")))))))))))
+ (list
+ #:tests? #f
+ #:configure-flags
+ #~'("--disable-static"
+ #$@(if (%current-target-system)
+ '("--with-yielding_select=yes"
+ "ac_cv_func_memcmp_working=yes")
+ '()))
+ #:phases
+ #~(modify-phases %standard-phases
+ #$@(if (%current-target-system)
+ '((add-before 'configure 'fix-cross-gcc
+ (lambda* (#:key target #:allow-other-keys)
+ (setenv "CC" (string-append target "-gcc"))
+ (setenv "STRIP" (string-append target "-strip")))))
+ '())
+ (add-after 'install 'provide-libldap_r
+ (lambda _
+ ;; The re-entrant libldap_r no longer exists since 2.6
+ ;; as it has become the default: provide a linker alias
+ ;; for now.
+ (call-with-output-file (string-append #$output
+ "/lib/libldap_r.so")
+ (lambda (port)
+ (format port "INPUT ( libldap.so )~%"))))))))
+ (synopsis "Implementation of the Lightweight Directory Access Protocol")
+ (description
+ "OpenLDAP is a free implementation of the Lightweight Directory Access
Protocol.")
+ (license openldap2.8)
+ (home-page "https://www.openldap.org/";)))
(define-public nss-pam-ldapd
(package
diff --cc gnu/packages/plotutils.scm
index 6afbf57c77,d98f7fce2f..a791000149
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@@ -308,16 -314,18 +314,18 @@@ colors, styles, options and details."
texlive-hyperref
texlive-latex-base
texlive-latex-geometry
- texlive-latex-graphics
- texlive-latex-kvoptions
+ texlive-graphics
+ texlive-kvoptions
texlive-latex-media9
- texlive-latex-ocgx2
- texlive-latex-pdftexcmds
texlive-oberdiek ;for ifluatex
+ texlive-latex-ocgx2
texlive-latex-parskip
+ texlive-pdftexcmds
texlive-tex-texinfo))))
(inputs
- (list fftw
+ (list bash-minimal
+ eigen
+ fftw
freeglut
glew
glm
diff --cc gnu/packages/python-xyz.scm
index 6f092ab730,b14c4ff0f3..a2f1a9aed0
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@@ -15712,8 -16306,22 +16319,22 @@@ way."
(sha256
(base32
"00yvj8bxmhhhhd74v7j0x673is7vizmxwgb3dd5xmnkr74ybyi7w"))))
+ (arguments
+ (list
+ #:phases
+ '(modify-phases %standard-phases
+ (add-after 'unpack 'disable-test
+ (lambda _
+ ;; See https://github.com/bmc/munkres/issues/40
+ (substitute* "test/test_munkres.py"
+ (("^def test_profit_float" m)
+ (string-append "\
+ import platform
+ @pytest.mark.skipif(platform.architecture()[0] == \"32bit\",
+ reason=\"Fails on 32 bit architectures\")
+ " m))))))))
(build-system python-build-system)
- (native-inputs (list python-pytest-6))
+ (native-inputs (list python-pytest))
(home-page "https://software.clapper.org/munkres/";)
(synopsis "Implementation of the Munkres algorithm")
(description "The Munkres module provides an implementation of the Munkres
diff --cc gnu/packages/tls.scm
index f58bc9396e,bdac8a6e63..9b2669e095
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -318,8 -345,22 +319,15 @@@ required structures."
"gnutls-cross.patch"))
(sha256
(base32
- "01i1gl15k6qwvxmxx0by1mn9nlmcmym18wdpm7dn9awfsp8474dy"))))))
+ "01i1gl15k6qwvxmxx0by1mn9nlmcmym18wdpm7dn9awfsp8474dy"))))
+
+ ;; Disable Guile bindings: they are now provided by Guile-GnuTLS.
+ (inputs (modify-inputs (package-inputs gnutls)
+ (delete "guile")
+ (append libunistring))) ;GnuTLS depends on it
+ (native-inputs (modify-inputs (package-native-inputs gnutls)
+ (delete "guile")))))
-(define-public gnutls/guile-2.0
- ;; GnuTLS for Guile 2.0.
- (package/inherit gnutls
- (name "guile2.0-gnutls")
- (inputs `(("guile" ,guile-2.0)
- ,@(alist-delete "guile" (package-inputs gnutls))))))
-
(define-public gnutls/dane
;; GnuTLS with build libgnutls-dane, implementing DNS-based
;; Authentication of Named Entities. This is required for GNS functionality
@@@ -333,9 -374,73 +341,72 @@@
(define-public guile2.2-gnutls
(package/inherit gnutls
(name "guile2.2-gnutls")
- (inputs `(("guile" ,guile-2.2)
- ,@(alist-delete "guile"
- (package-inputs gnutls))))))
+ (inputs (modify-inputs (package-inputs gnutls)
+ (replace "guile" guile-2.2)))))
+ (define-public guile-gnutls
+ (package
+ ;; This package supersedes the Guile bindings that came with GnuTLS until
+ ;; version 3.7.8 included.
+ (name "guile-gnutls")
+ (version "3.7.11")
+ (home-page "https://gitlab.com/gnutls/guile/";)
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (sha256
+ (base32
+ "06d7v3i0d9ayp7zqk1rsy4z0wfpq69n0r54f1xrppb9gn7q9iva6"))
+ (file-name (git-file-name name version))
+ (patches (search-patches "gnutls-cross.patch"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:configure-flags
+ ;; Tell the build system that we want Guile bindings installed to the
+ ;; output instead of Guiles own module directory.
+ #~(list "--disable-static"
+ (string-append "--with-guile-site-dir="
+
"$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)")
+ (string-append "--with-guile-site-ccache-dir="
+
"$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache")
+ (string-append "--with-guile-extension-dir="
+
"$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-more-shebangs
+ (lambda _
+ (for-each patch-shebang
+ '("autopull.sh" "autogen.sh"))))
+ (replace 'bootstrap
+ (lambda _
+ (invoke "bash" "./bootstrap" "--no-git"))))))
+ (native-inputs
+ (list autoconf
+ automake
+ libtool
+ pkg-config
+ texinfo
+ gnutls-latest ;XXX: 'guile-snarf' invokes the native 'cpp'
+ guile-3.0
+ (gnulib-checkout
+ #:version "2022-12-06"
+ #:commit "440b528b1d81dd31b2a2e4dde20d5c837c147811"
+ #:hash (base32
"15mq43abbnkbamchc9lynrvrd5ql8qacgyx2ph4kkngxf1bz3pqy"))))
+ (inputs
+ (list gnutls-latest
+ guile-3.0))
+ (properties '((release-tag-prefix . "v")
+ (release-tag-version-delimiter . ".")))
+ (synopsis "Guile bindings to GnuTLS")
+ (description
+ "This package provides Guile bindings to GnuTLS, a library implementation
+ the @acronym{TLS, Transport-Layer Security} protocol. It supersedes the Guile
+ bindings that were formerly provided as part of GnuTLS.")
+ (license license:lgpl2.1+)))
+
(define (target->openssl-target target)
"Return the value to set CONFIGURE_TARGET_ARCH to when cross-compiling
OpenSSL for TARGET."
diff --cc gnu/packages/version-control.scm
index 6684580b4a,78a89cfd5b..98b80b6073
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@@ -220,141 -223,140 +223,138 @@@ Python 3.3 and later, rather than on Py
(define-public git
(package
- (name "git")
- (version "2.39.1")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://kernel.org/software/scm/git/git-"
- version ".tar.xz"))
- (sha256
- (base32
- "0qf1wly7zagg23svpv533va5v213y7y3lfw76ldkf35k8w48m8s0"))))
- (build-system gnu-build-system)
- (native-inputs
- `(("native-perl" ,perl)
- ;; Add bash-minimal explicitly to ensure it comes before bash-for-tests,
- ;; see <https://bugs.gnu.org/39513>.
- ("bash" ,bash-minimal)
- ("bash-for-tests" ,bash)
- ("gettext" ,gettext-minimal)
- ;; To build the man pages from the git sources, we would need a
dependency
- ;; on a full XML tool chain, and building it actually takes ages. So we
- ;; use this lazy approach and use released tarball.
- ("git-manpages"
- ,(origin
- (method url-fetch)
- (uri (string-append
- "mirror://kernel.org/software/scm/git/git-manpages-"
- version ".tar.xz"))
- (sha256
- (base32
- "0xf7ki90xw77nvmnkw50xaivyfi8jddfq0h8crzi7m9zjs7aa8mm"))))
- ;; For subtree documentation.
- ("asciidoc" ,asciidoc)
- ("docbook-xsl" ,docbook-xsl)
- ("xmlto" ,xmlto)
- ("pkg-config" ,pkg-config)))
- (inputs
- `(("curl" ,curl)
- ("expat" ,expat)
- ("openssl" ,openssl)
- ("perl" ,perl)
- ("python" ,python) ; for git-p4
- ("zlib" ,zlib)
-
- ;; For PCRE support in git grep (USE_LIBPCRE2).
- ("pcre" ,pcre2)
-
- ;; For 'gitweb.cgi'.
- ("perl-cgi" ,perl-cgi)
-
- ;; For 'git-svn'.
- ("subversion" ,subversion)
- ("perl-term-readkey" ,perl-term-readkey)
-
- ;; For 'git-send-email'.
- ("perl-authen-sasl" ,perl-authen-sasl)
- ("perl-net-smtp-ssl" ,perl-net-smtp-ssl)
- ("perl-io-socket-ssl" ,perl-io-socket-ssl)
-
- ;; For 'git gui', 'gitk', and 'git citool'.
- ("tcl" ,tcl)
- ("tk" ,tk)
-
- ;; For 'git-credential-libsecret'
- ("glib" ,glib)
- ("libsecret" ,libsecret)))
- (outputs '("out" ; the core
- "send-email" ; for git-send-email
- "svn" ; git-svn
- "credential-netrc" ; git-credential-netrc
- "credential-libsecret" ; git-credential-libsecret
- "subtree" ; git-subtree
- "gui")) ; gitk, git gui
- (arguments
- `(#:make-flags `("V=1" ;more verbose compilation
-
- ,(string-append "SHELL_PATH="
- (assoc-ref %build-inputs "bash")
- "/bin/sh")
-
- ;; Tests require a bash with completion support.
- ,(string-append "TEST_SHELL_PATH="
- (assoc-ref %build-inputs
"bash-for-tests")
- "/bin/bash")
-
- "USE_LIBPCRE2=yes"
-
- ;; By default 'make install' creates hard links for
- ;; things in 'libexec/git-core', which leads to huge
- ;; nars; see <https://bugs.gnu.org/21949>.
- "NO_INSTALL_HARDLINKS=indeed")
-
- ;; Make sure the full bash does not end up in the final closure.
- #:disallowed-references (,bash)
-
- #:test-target "test"
-
- ;; The explicit --with-tcltk forces the build system to hardcode the
- ;; absolute file name to 'wish'.
- #:configure-flags (list (string-append "--with-tcltk="
- (assoc-ref %build-inputs "tk")
- "/bin/wish8.6") ; XXX
- ,@(if (%current-target-system)
- git-cross-configure-flags
- '()))
-
- #:modules ((srfi srfi-1)
- (srfi srfi-26)
- ((guix build gnu-build-system) #:prefix gnu:)
- ,@%gnu-build-system-modules)
- #:phases
- (modify-phases %standard-phases
- ,@(if (%current-target-system)
- ;; The git build system assumes build == host
- `((add-after 'unpack 'use-host-uname_S
- (lambda _
- (substitute* "config.mak.uname"
- (("uname_S := .*" all)
- (if (equal? ,(%current-target-system) "i586-pc-gnu")
- "uname_S := GNU\n"
- all)))
- #t)))
- ;; We do not have bash-for-tests when cross-compiling.
- `((add-after 'unpack 'modify-PATH
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((path (string-split (getenv "PATH") #\:))
- (bash-full (assoc-ref inputs "bash-for-tests")))
- ;; Drop the test bash from PATH so that (which "sh") and
- ;; similar does the right thing.
- (setenv "PATH" (string-join
- (remove (cut string-prefix? bash-full
<>) path)
- ":"))
- #t)))))
- ;; Add cross curl-config script to PATH when cross-compiling.
- ,@(if (%current-target-system)
- '((add-before 'configure 'add-cross-curl-config
+ (name "git")
- (version "2.37.3")
++ (version "2.39.1")
+ (source (origin
- (method url-fetch)
- (uri (string-append "mirror://kernel.org/software/scm/git/git-"
- version ".tar.xz"))
- (sha256
- (base32
- "0yp8hdj0w18jhmmdflzz74z418cw95i08pc22yycyn8nyvbl2il1"))))
++ (method url-fetch)
++ (uri (string-append "mirror://kernel.org/software/scm/git/git-"
++ version ".tar.xz"))
++ (sha256
++ (base32
++ "0qf1wly7zagg23svpv533va5v213y7y3lfw76ldkf35k8w48m8s0"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("native-perl" ,perl)
+ ;; Add bash-minimal explicitly to ensure it comes before
bash-for-tests,
+ ;; see <https://bugs.gnu.org/39513>.
+ ("bash" ,bash-minimal)
+ ("bash-for-tests" ,bash)
+ ("gettext" ,gettext-minimal)
+ ;; To build the man pages from the git sources, we would need a
dependency
+ ;; on a full XML tool chain, and building it actually takes ages. So
we
+ ;; use this lazy approach and use released tarball.
+ ("git-manpages"
+ ,(origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kernel.org/software/scm/git/git-manpages-"
+ version ".tar.xz"))
+ (sha256
+ (base32
- "053lj9wy8y2yr5jzpb0af4w50gz3ckhgc15wqx7is4z6k9a76lww"))))
++ "0xf7ki90xw77nvmnkw50xaivyfi8jddfq0h8crzi7m9zjs7aa8mm"))))
+ ;; For subtree documentation.
+ ("asciidoc" ,asciidoc)
- ("docbook2x" ,docbook2x)
+ ("docbook-xsl" ,docbook-xsl)
- ("libxslt" ,libxslt)
- ("pkg-config" ,pkg-config)
- ("texinfo" ,texinfo)
- ("xmlto" ,xmlto)))
++ ("xmlto" ,xmlto)
++ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("curl" ,curl)
+ ("expat" ,expat)
+ ("openssl" ,openssl)
+ ("perl" ,perl)
+ ("python" ,python) ; for git-p4
+ ("zlib" ,zlib)
+
+ ;; For PCRE support in git grep (USE_LIBPCRE2).
+ ("pcre" ,pcre2)
+
+ ;; For 'gitweb.cgi'.
+ ("perl-cgi" ,perl-cgi)
+
+ ;; For 'git-svn'.
+ ("subversion" ,subversion)
+ ("perl-term-readkey" ,perl-term-readkey)
+
+ ;; For 'git-send-email'.
+ ("perl-authen-sasl" ,perl-authen-sasl)
+ ("perl-net-smtp-ssl" ,perl-net-smtp-ssl)
+ ("perl-io-socket-ssl" ,perl-io-socket-ssl)
+
+ ;; For 'git gui', 'gitk', and 'git citool'.
+ ("tcl" ,tcl)
+ ("tk" ,tk)
+
+ ;; For 'git-credential-libsecret'
+ ("glib" ,glib)
+ ("libsecret" ,libsecret)))
+ (outputs '("out" ; the core
+ "send-email" ; for git-send-email
+ "svn" ; git-svn
+ "credential-netrc" ; git-credential-netrc
+ "credential-libsecret" ; git-credential-libsecret
+ "subtree" ; git-subtree
+ "gui")) ; gitk, git gui
+ (arguments
+ `(#:make-flags `("V=1" ;more verbose compilation
+
+ ,(string-append "SHELL_PATH="
+ (assoc-ref %build-inputs "bash")
+ "/bin/sh")
+
+ ;; Tests require a bash with completion support.
+ ,(string-append "TEST_SHELL_PATH="
+ (assoc-ref %build-inputs
"bash-for-tests")
+ "/bin/bash")
+
+ "USE_LIBPCRE2=yes"
+
+ ;; By default 'make install' creates hard links for
+ ;; things in 'libexec/git-core', which leads to huge
+ ;; nars; see <https://bugs.gnu.org/21949>.
+ "NO_INSTALL_HARDLINKS=indeed")
+
+ ;; Make sure the full bash does not end up in the final closure.
+ #:disallowed-references (,bash)
+
+ #:test-target "test"
+
+ ;; The explicit --with-tcltk forces the build system to hardcode the
+ ;; absolute file name to 'wish'.
+ #:configure-flags (list (string-append "--with-tcltk="
+ (assoc-ref %build-inputs "tk")
+ "/bin/wish8.6") ; XXX
+ ,@(if (%current-target-system)
+ git-cross-configure-flags
+ '()))
+
+ #:modules ((srfi srfi-1)
+ (srfi srfi-26)
+ ((guix build gnu-build-system) #:prefix gnu:)
+ ,@%gnu-build-system-modules)
+ #:phases
+ (modify-phases %standard-phases
+ ,@(if (%current-target-system)
+ ;; The git build system assumes build == host
+ `((add-after 'unpack 'use-host-uname_S
+ (lambda _
+ (substitute* "config.mak.uname"
+ (("uname_S := .*" all)
+ (if (equal? ,(%current-target-system) "i586-pc-gnu")
+ "uname_S := GNU\n"
+ all))))))
+ ;; We do not have bash-for-tests when cross-compiling.
+ `((add-after 'unpack 'modify-PATH
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((path (string-split (getenv "PATH") #\:))
+ (bash-full (assoc-ref inputs "bash-for-tests")))
+ ;; Drop the test bash from PATH so that (which "sh")
and
+ ;; similar does the right thing.
+ (setenv "PATH" (string-join
+ (remove (cut string-prefix? bash-full
<>) path)
+ ":")))))))
+ ;; Add cross curl-config script to PATH when cross-compiling.
+ ,@(if (%current-target-system)
+ '((add-before 'configure 'add-cross-curl-config
(lambda* (#:key inputs #:allow-other-keys)
(setenv "PATH"
(string-append (assoc-ref inputs "curl") "/bin:"
diff --cc gnu/packages/wm.scm
index 201c5994d8,2fd70af07f..c9d3e228f1
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@@ -1727,6 -1693,57 +1693,57 @@@ display a clock or apply image manipula
(description "Swaybg is a wallpaper utility for Wayland compositors.")
(license license:expat))) ; MIT license
+
+ (define-public swaynotificationcenter
+ (package
+ (name "swaynotificationcenter")
+ (version "0.7.3")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url
"https://github.com/ErikReider/SwayNotificationCenter";)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
"1xvr5m5sqznr3dd512i5pk0d56v7n0ywdcy6rnz85vbf2k7b6kj5"))))
+ (build-system meson-build-system)
+ (arguments (list #:configure-flags #~(list "-Dsystemd-service=false")))
+ (native-inputs
+ (list `(,glib "bin")
+ gobject-introspection
+ pkg-config
+ python-minimal
+ scdoc
- vala-next))
++ vala))
+ (inputs
+ (list json-glib
+ glib
+ gtk+
+ gtk-layer-shell
+ libhandy
+ wayland-protocols))
+ (synopsis "Notification daemon with a graphical interface")
+ (description
+ "This package provides a notification daemon for the Sway Wayland
+ compository, supporting the following featuers:
+
+ @itemize
+ @item Keyboard shortcuts
+ @item Notification body markup with image support
+ @item A panel to view previous notifications
+ @item Show album art for notifications like Spotify
+ @item Do not disturb
+ @item Click notification to execute default action
+ @item Show alternative notification actions
+ @item Customization through a CSS file
+ @item Trackpad/mouse gesture to close notification
+ @item The same features as any other basic notification daemon
+ @item Basic configuration through a JSON config file
+ @item Hot-reload config through swaync-client
+ @end itemize")
+ (home-page "https://github.com/ErikReider/SwayNotificationCenter";)
+ (license license:expat)))
+
(define-public waybar
(package
(name "waybar")
diff --cc gnu/packages/xdisorg.scm
index 9b45d51637,f6f015732d..8364a72955
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@@ -503,15 -511,20 +511,20 @@@ avoiding password prompts when X11 forw
wayland-protocols
xkeyboard-config))
(native-inputs
- (list bison doxygen pkg-config python))
+ (append (list bison doxygen pkg-config python)
+ (if (%current-target-system)
+ ;; wayland-scanner is required at build time.
+ ;; TODO: Remove this conditional on core-updates.
+ (list pkg-config-for-build wayland)
+ '())))
(arguments
- `(#:configure-flags
- (list (string-append "-Dxkb-config-root="
- (assoc-ref %build-inputs "xkeyboard-config")
- "/share/X11/xkb")
- (string-append "-Dx-locale-root="
- (assoc-ref %build-inputs "libx11")
- "/share/X11/locale"))))
+ (list #:configure-flags
+ #~(list (string-append "-Dxkb-config-root="
+ (search-input-directory %build-inputs
+ "share/X11/xkb"))
+ (string-append "-Dx-locale-root="
+ (search-input-directory %build-inputs
+ "share/X11/locale")))))
(home-page "https://xkbcommon.org/";)
(synopsis "Library to handle keyboard descriptions")
(description "Xkbcommon is a library to handle keyboard descriptions,
diff --cc gnu/system.scm
index 9c2e50bec5,d67f9a615b..0109e9a712
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@@ -846,8 -854,10 +854,10 @@@ of PROVENANCE-SERVICE-TYPE to its servi
(define %base-packages-utils
;; Default set of utilities packages.
(cons* procps psmisc which
- (@ (gnu packages admin) shadow-with-man-pages) ;for 'passwd'
+ shadow ;for 'passwd'
+ e2fsprogs ;for lsattr, chattr, etc.
+
guile-3.0-latest
;; The packages below are also in %FINAL-INPUTS, so take them from
diff --cc guix/build-system/copy.scm
index bf7fcaedba,c98b266561..e15dc9f616
--- a/guix/build-system/copy.scm
+++ b/guix/build-system/copy.scm
@@@ -1,7 -1,8 +1,8 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
-;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2021, 2022 Ludovic Courtès <ludo@gnu.org>
+ ;;; Copyright © 2023 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc guix/scripts/home.scm
index ae830d0b48,1d8aae727e..a37f059711
--- a/guix/scripts/home.scm
+++ b/guix/scripts/home.scm
@@@ -3,8 -3,7 +3,8 @@@
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2021 Oleg Pykhalov <go.wigust@gmail.com>
- ;;; Copyright © 2022 Ludovic Courtès <ludo@gnu.org>
+ ;;; Copyright © 2022-2023 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
;;;
;;; This file is part of GNU Guix.
- branch core-updates updated (edb8c09add -> a59936e10a), guix-commits, 2023/01/30
- 01/10: Merge remote-tracking branch 'origin/master' into core-updates,
guix-commits <=
- 02/10: Revert "gnu: Remove rust-test-generator-0.3.", guix-commits, 2023/01/30
- 03/10: Revert "gnu: Remove rust-yeslogic-fontconfig-sys-2.", guix-commits, 2023/01/30
- 04/10: gnu: guile-3.0: Update to 3.0.9., guix-commits, 2023/01/30
- 07/10: gnu: texlive-fancyvrb: Use over deprecated texlive-latex-fancyvrb., guix-commits, 2023/01/30
- 06/10: gnu: texlive-fancyhdr: Use over deprecated texlive-latex-fancyhdr., guix-commits, 2023/01/30
- 08/10: gnu: r-with-tests: Don't use deprecated texlive-latex-tools., guix-commits, 2023/01/30
- 05/10: gnu: texlive-graphics: Use over deprecated texlive-latex-graphics., guix-commits, 2023/01/30
- 09/10: gnu: Add llvm-for-mesa., guix-commits, 2023/01/30
- 10/10: gnu: mesa: Use llvm-for-mesa., guix-commits, 2023/01/30