~ruther/guix-local

8d59c262ada2e2167196a8fb8cbebd9c329a79dd — Marius Bakke 5 years ago e7f0835 + a068ed6
Merge branch 'master' into core-updates

 Conflicts:
	gnu/local.mk
	gnu/packages/algebra.scm
	gnu/packages/bioinformatics.scm
	gnu/packages/curl.scm
	gnu/packages/docbook.scm
	gnu/packages/emacs-xyz.scm
	gnu/packages/maths.scm
	gnu/packages/plotutils.scm
	gnu/packages/python-web.scm
	gnu/packages/python-xyz.scm
	gnu/packages/radio.scm
	gnu/packages/readline.scm
	gnu/packages/tls.scm
	gnu/packages/xml.scm
	gnu/packages/xorg.scm
176 files changed, 16696 insertions(+), 7094 deletions(-)

M Makefile.am
M configure.ac
M doc/contributing.texi
M doc/guix.texi
M etc/guix-daemon.cil.in
M etc/news.scm
M gnu/bootloader/u-boot.scm
M gnu/build/linux-boot.scm
M gnu/local.mk
M gnu/machine/ssh.scm
M gnu/packages/admin.scm
M gnu/packages/algebra.scm
M gnu/packages/animation.scm
M gnu/packages/aspell.scm
M gnu/packages/astronomy.scm
M gnu/packages/audio.scm
M gnu/packages/axoloti.scm
M gnu/packages/benchmark.scm
M gnu/packages/bioconductor.scm
M gnu/packages/bioinformatics.scm
M gnu/packages/check.scm
M gnu/packages/chromium.scm
M gnu/packages/ci.scm
M gnu/packages/cluster.scm
M gnu/packages/compression.scm
M gnu/packages/cran.scm
M gnu/packages/crates-graphics.scm
M gnu/packages/crates-io.scm
M gnu/packages/crypto.scm
M gnu/packages/cryptsetup.scm
M gnu/packages/curl.scm
M gnu/packages/databases.scm
M gnu/packages/dictionaries.scm
M gnu/packages/diffoscope.scm
M gnu/packages/disk.scm
M gnu/packages/django.scm
M gnu/packages/dns.scm
M gnu/packages/education.scm
M gnu/packages/emacs-xyz.scm
M gnu/packages/emacs.scm
M gnu/packages/emulators.scm
M gnu/packages/engineering.scm
M gnu/packages/entr.scm
M gnu/packages/file-systems.scm
M gnu/packages/fltk.scm
M gnu/packages/fonts.scm
M gnu/packages/fpga.scm
M gnu/packages/freeipmi.scm
M gnu/packages/ftp.scm
M gnu/packages/game-development.scm
M gnu/packages/games.scm
M gnu/packages/gcc.scm
M gnu/packages/gnome.scm
M gnu/packages/gnucash.scm
M gnu/packages/gnuzilla.scm
M gnu/packages/guile-xyz.scm
M gnu/packages/guile.scm
M gnu/packages/hardware.scm
M gnu/packages/i2p.scm
M gnu/packages/icu4c.scm
M gnu/packages/image-processing.scm
M gnu/packages/image.scm
M gnu/packages/installers.scm
M gnu/packages/jami.scm
A gnu/packages/julia-jll.scm
M gnu/packages/julia-xyz.scm
M gnu/packages/kde.scm
M gnu/packages/libreoffice.scm
M gnu/packages/linux.scm
M gnu/packages/lisp-xyz.scm
M gnu/packages/lisp.scm
M gnu/packages/llvm.scm
M gnu/packages/lxqt.scm
M gnu/packages/mail.scm
M gnu/packages/markup.scm
M gnu/packages/maths.scm
M gnu/packages/mc.scm
M gnu/packages/mes.scm
M gnu/packages/messaging.scm
M gnu/packages/monitoring.scm
M gnu/packages/mpd.scm
M gnu/packages/mtools.scm
M gnu/packages/music.scm
M gnu/packages/networking.scm
M gnu/packages/ocaml.scm
M gnu/packages/package-management.scm
M gnu/packages/parallel.scm
D gnu/packages/patches/amule-crypto-6.patch
D gnu/packages/patches/emacs-geiser-autoload-activate-implementation.patch
D gnu/packages/patches/emacs-geiser-guile-auto-activate.patch
D gnu/packages/patches/freebayes-devendor-deps.patch
D gnu/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch
D gnu/packages/patches/minimap2-aarch64-support.patch
A gnu/packages/patches/mosaicatcher-unbundle-htslib.patch
A gnu/packages/patches/nsis-source-date-epoch.patch
M gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch
D gnu/packages/patches/wgetpaste-update-bpaste.patch
M gnu/packages/pep.scm
M gnu/packages/perl.scm
M gnu/packages/php.scm
M gnu/packages/protobuf.scm
M gnu/packages/python-check.scm
M gnu/packages/python-science.scm
M gnu/packages/python-web.scm
M gnu/packages/python-xyz.scm
M gnu/packages/python.scm
M gnu/packages/racket.scm
M gnu/packages/radio.scm
M gnu/packages/readline.scm
M gnu/packages/rsync.scm
M gnu/packages/rust-apps.scm
M gnu/packages/security-token.scm
M gnu/packages/sequoia.scm
M gnu/packages/serialization.scm
M gnu/packages/shells.scm
M gnu/packages/smalltalk.scm
M gnu/packages/sphinx.scm
M gnu/packages/statistics.scm
M gnu/packages/suckless.scm
M gnu/packages/telephony.scm
M gnu/packages/text-editors.scm
M gnu/packages/tls.scm
M gnu/packages/tryton.scm
M gnu/packages/version-control.scm
M gnu/packages/video.scm
M gnu/packages/vim.scm
M gnu/packages/virtualization.scm
M gnu/packages/vnc.scm
M gnu/packages/web-browsers.scm
M gnu/packages/web.scm
M gnu/packages/wget.scm
M gnu/packages/xdisorg.scm
M gnu/packages/xiph.scm
M gnu/packages/xml.scm
M gnu/packages/xorg.scm
M gnu/services/cuirass.scm
M gnu/services/dns.scm
M gnu/services/networking.scm
M gnu/services/vpn.scm
M gnu/tests/linux-modules.scm
M gnu/tests/web.scm
M guix/build-system/r.scm
M guix/ci.scm
M guix/download.scm
M guix/git-download.scm
M guix/gnu-maintenance.scm
M guix/hg-download.scm
M guix/import/cran.scm
A guix/import/egg.scm
M guix/import/hackage.scm
M guix/import/opam.scm
M guix/licenses.scm
M guix/lint.scm
M guix/profiles.scm
M guix/progress.scm
M guix/scripts/archive.scm
M guix/scripts/build.scm
M guix/scripts/copy.scm
M guix/scripts/deploy.scm
M guix/scripts/edit.scm
M guix/scripts/environment.scm
M guix/scripts/graph.scm
M guix/scripts/import.scm
A guix/scripts/import/egg.scm
M guix/scripts/package.scm
M guix/scripts/publish.scm
M guix/scripts/substitute.scm
M guix/store.scm
M guix/swh.scm
M guix/ui.scm
M po/guix/POTFILES.in
A tests/egg.scm
M tests/gnu-maintenance.scm
M tests/hackage.scm
M tests/lint.scm
M tests/opam.scm
This diff is too large to display. Try viewing the raw diff instead.