~ruther/guix-local

6f9a80b331ae41d142a49fbeb94b90ee587b6155 — Marius Bakke 5 years ago 6500c9a + dece03e
Merge branch 'master' into core-updates

Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a2770ef4d05a6e18f40d602e51da749ddc and
12964df69a99de6190422c752fef65ef813f3b6b respectively.

4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it
cannot currently be tested.

 Conflicts:
	gnu/local.mk
	gnu/packages/aidc.scm
	gnu/packages/boost.scm
	gnu/packages/curl.scm
	gnu/packages/nettle.scm
	gnu/packages/networking.scm
	gnu/packages/python-xyz.scm
	gnu/packages/tls.scm
216 files changed, 13297 insertions(+), 4153 deletions(-)

M Makefile.am
M bootstrap
M build-aux/compile-all.scm
M config-daemon.ac
M doc/contributing.texi
M doc/guix.texi
M etc/completion/bash/guix
M etc/indent-code.el
M etc/news.scm
A etc/substitutes/bordeaux.guix.gnu.org.pub
M gnu/build/linux-boot.scm
M gnu/installer/newt/partition.scm
M gnu/installer/parted.scm
M gnu/local.mk
M gnu/packages/admin.scm
M gnu/packages/aidc.scm
M gnu/packages/algebra.scm
M gnu/packages/animation.scm
M gnu/packages/astronomy.scm
M gnu/packages/audio.scm
M gnu/packages/bioconductor.scm
M gnu/packages/bioinformatics.scm
M gnu/packages/bittorrent.scm
M gnu/packages/boost.scm
M gnu/packages/bootloaders.scm
M gnu/packages/calendar.scm
M gnu/packages/chemistry.scm
M gnu/packages/chromium.scm
M gnu/packages/ci.scm
M gnu/packages/compression.scm
M gnu/packages/connman.scm
M gnu/packages/coq.scm
M gnu/packages/cpp.scm
M gnu/packages/cran.scm
M gnu/packages/crates-io.scm
M gnu/packages/cryptsetup.scm
M gnu/packages/cups.scm
M gnu/packages/curl.scm
M gnu/packages/cvassistant.scm
M gnu/packages/cybersecurity.scm
M gnu/packages/databases.scm
M gnu/packages/datastructures.scm
M gnu/packages/dictionaries.scm
M gnu/packages/disk.scm
M gnu/packages/display-managers.scm
M gnu/packages/djvu.scm
M gnu/packages/dns.scm
M gnu/packages/docker.scm
M gnu/packages/documentation.scm
M gnu/packages/ebook.scm
M gnu/packages/education.scm
M gnu/packages/electronics.scm
M gnu/packages/emacs-xyz.scm
M gnu/packages/emulators.scm
M gnu/packages/engineering.scm
M gnu/packages/fcitx.scm
M gnu/packages/fcitx5.scm
M gnu/packages/file-systems.scm
M gnu/packages/finance.scm
M gnu/packages/firmware.scm
M gnu/packages/flashing-tools.scm
M gnu/packages/fonts.scm
M gnu/packages/fpga.scm
M gnu/packages/freedesktop.scm
M gnu/packages/game-development.scm
M gnu/packages/games.scm
M gnu/packages/gcc.scm
M gnu/packages/geo.scm
M gnu/packages/gnome.scm
M gnu/packages/gnupg.scm
M gnu/packages/gnuzilla.scm
M gnu/packages/gpodder.scm
M gnu/packages/gps.scm
M gnu/packages/graphics.scm
M gnu/packages/gstreamer.scm
M gnu/packages/guile-xyz.scm
M gnu/packages/image-processing.scm
M gnu/packages/image-viewers.scm
M gnu/packages/image.scm
M gnu/packages/inkscape.scm
M gnu/packages/irc.scm
A gnu/packages/irods.scm
M gnu/packages/jami.scm
M gnu/packages/java.scm
M gnu/packages/julia-jll.scm
M gnu/packages/julia-xyz.scm
M gnu/packages/kde-frameworks.scm
M gnu/packages/kde-internet.scm
M gnu/packages/kde-multimedia.scm
M gnu/packages/kde-pim.scm
M gnu/packages/kde-plasma.scm
M gnu/packages/kde-systemtools.scm
M gnu/packages/kde-utils.scm
M gnu/packages/kde.scm
M gnu/packages/language.scm
M gnu/packages/lego.scm
M gnu/packages/linphone.scm
M gnu/packages/linux.scm
M gnu/packages/lisp-xyz.scm
M gnu/packages/logo.scm
M gnu/packages/lxqt.scm
M gnu/packages/mail.scm
M gnu/packages/maths.scm
M gnu/packages/messaging.scm
M gnu/packages/mpd.scm
M gnu/packages/mpi.scm
M gnu/packages/music.scm
M gnu/packages/nano.scm
M gnu/packages/ncurses.scm
M gnu/packages/nettle.scm
M gnu/packages/networking.scm
M gnu/packages/node.scm
M gnu/packages/ntp.scm
M gnu/packages/ocaml.scm
M gnu/packages/ocr.scm
M gnu/packages/orange.scm
M gnu/packages/package-management.scm
M gnu/packages/pantheon.scm
M gnu/packages/password-utils.scm
A gnu/packages/patches/ath9k-htc-firmware-gcc-compat.patch
M gnu/packages/patches/bash-completion-directories.patch
A gnu/packages/patches/brightnessctl-elogind-support.patch
D gnu/packages/patches/bsdiff-CVE-2014-9862.patch
A gnu/packages/patches/connman-CVE-2021-33833.patch
A gnu/packages/patches/curl-7.77-tls-priority-string.patch
A gnu/packages/patches/efivar-gcc-compat.patch
A gnu/packages/patches/gcc-8-sort-libtool-find-output.patch
D gnu/packages/patches/grub-cross-system-i686.patch
M gnu/packages/patches/grub-setup-root.patch
D gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch
A gnu/packages/patches/hexchat-add-libera-chat.patch
A gnu/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch
A gnu/packages/patches/isc-dhcp-gcc-compat.patch
A gnu/packages/patches/jfsutils-gcc-compat.patch
A gnu/packages/patches/libcacard-unknown-variable.patch
A gnu/packages/patches/nettle-3.5-CVE-2021-3580-pt1.patch
A gnu/packages/patches/nettle-3.5-CVE-2021-3580-pt2.patch
A gnu/packages/patches/nettle-3.5-check-_pkcs1_sec_decrypt-msg-len.patch
A gnu/packages/patches/polkit-CVE-2021-3560.patch
M gnu/packages/patches/qemu-build-info-manual.patch
A gnu/packages/patches/qemu-meson-compat.patch
A gnu/packages/patches/qemu-sphinx-compat.patch
A gnu/packages/patches/rust-ndarray-0.13-remove-blas-src.patch
A gnu/packages/patches/tor-fix-build-with-gcc-7.patch
R gnu/packages/patches/{xpra-4.0.1-systemd-run => xpra-4.2-systemd-run}.patch
M gnu/packages/pdf.scm
M gnu/packages/photo.scm
M gnu/packages/polkit.scm
M gnu/packages/pretty-print.scm
M gnu/packages/printers.scm
M gnu/packages/profiling.scm
M gnu/packages/pumpio.scm
M gnu/packages/python-science.scm
M gnu/packages/python-web.scm
M gnu/packages/python-xyz.scm
M gnu/packages/qt.scm
M gnu/packages/radio.scm
M gnu/packages/rails.scm
M gnu/packages/rednotebook.scm
M gnu/packages/robotics.scm
M gnu/packages/rust-apps.scm
M gnu/packages/scribus.scm
M gnu/packages/serialization.scm
M gnu/packages/shells.scm
M gnu/packages/speech.scm
M gnu/packages/spice.scm
M gnu/packages/suckless.scm
M gnu/packages/sync.scm
M gnu/packages/syndication.scm
M gnu/packages/synergy.scm
M gnu/packages/telegram.scm
M gnu/packages/telephony.scm
M gnu/packages/terminals.scm
M gnu/packages/tex.scm
M gnu/packages/text-editors.scm
M gnu/packages/time.scm
M gnu/packages/tls.scm
M gnu/packages/tor.scm
M gnu/packages/version-control.scm
M gnu/packages/video.scm
M gnu/packages/virtualization.scm
M gnu/packages/vpn.scm
M gnu/packages/web-browsers.scm
M gnu/packages/web.scm
M gnu/packages/xdisorg.scm
M gnu/packages/xfce.scm
M gnu/packages/xml.scm
M gnu/packages/xorg.scm
M gnu/services/avahi.scm
M gnu/services/base.scm
M gnu/services/ci.scm
M gnu/services/desktop.scm
M gnu/services/mcron.scm
M gnu/services/messaging.scm
M gnu/services/networking.scm
M gnu/services/xorg.scm
M guix/build/asdf-build-system.scm
M guix/build/profiles.scm
M guix/describe.scm
M guix/git.scm
M guix/grafts.scm
M guix/hg-download.scm
M guix/import/launchpad.scm
M guix/lint.scm
M guix/profiles.scm
M guix/scripts/environment.scm
M guix/scripts/pack.scm
M guix/scripts/package.scm
M guix/scripts/substitute.scm
M guix/self.scm
M guix/store.scm
M guix/swh.scm
M guix/transformations.scm
M tests/lint.scm
M tests/profiles.scm
M tests/store.scm
This diff is too large to display. Try viewing the raw diff instead.