HCoop Git - jackhill/guix/guix.git/commit

HCoop / jackhill / guix / guix.git / commit

author	Marius Bakke <marius@gnu.org>
	Thu, 29 Jul 2021 20:34:57 +0000 (22:34 +0200)
committer	Marius Bakke <marius@gnu.org>
	Thu, 29 Jul 2021 20:34:57 +0000 (22:34 +0200)
commit	b029be2ee0f81cdcbc14240ff426408085ab0a40
tree	ed6d0e1bfdadfd28e1eb804e43763b793baa0b42	tree \| snapshot (tar.gz zip)
parent	bc55f3091bac4677df0cf020381c554921fea179	commit \| diff
parent	ffb381856d0c6cc1a557b789f6b377cfa17002a0	commit \| diff

Merge branch 'master' into core-updates-frozen

Conflicts:
gnu/packages/bioinformatics.scm
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/emacs-xyz.scm
gnu/packages/gpodder.scm
gnu/packages/music.scm
gnu/packages/patches/glibc-bootstrap-system.patch
gnu/packages/python-xyz.scm
gnu/packages/shells.scm
gnu/packages/statistics.scm

59 files changed:

Makefile.am	diff1 \|	diff2 \|	blob \| history
doc/guix.texi	diff1 \|	diff2 \|	blob \| history
gnu/local.mk	diff1 \|	diff2 \|	blob \| history
gnu/packages/admin.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/algebra.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/audio.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/bioinformatics.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/cmake.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/cran.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/crates-io.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/curl.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/databases.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/ebook.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/education.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/emacs-xyz.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/emulators.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/freedesktop.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/geo.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gl.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gnome.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gnuzilla.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gpodder.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/graphviz.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/guile.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/haskell.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/java.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/julia.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/linux.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/lisp-xyz.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/lisp.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/machine-learning.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/mail.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/maths.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/messaging.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/music.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/networking.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/package-management.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/patches/glibc-bootstrap-system.patch	diff1 \|	diff2 \|	blob \| history
gnu/packages/pcre.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/pdf.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/python-web.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/python-xyz.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/ruby.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/shells.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/simulation.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/statistics.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/text-editors.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/tls.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/tmux.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/video.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/vim.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/web.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/xfce.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/xml.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/xorg.scm	diff1 \|	diff2 \|	blob \| history
guix/build-system/minify.scm	diff1 \|	diff2 \|	blob \| history
guix/build/minify-build-system.scm	diff1 \|	diff2 \|	blob \| history
guix/import/print.scm	diff1 \|	diff2 \|	blob \| history
guix/utils.scm	diff1 \|	diff2 \|	blob \| history

jackhill's copy of GNU Guix: https://guix.gnu.org/

RSS Atom

Makefile.am	diff1 \|	diff2 \|	blob \| history
doc/guix.texi	diff1 \|	diff2 \|	blob \| history
gnu/local.mk	diff1 \|	diff2 \|	blob \| history
gnu/packages/admin.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/algebra.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/audio.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/bioinformatics.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/cmake.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/cran.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/crates-io.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/curl.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/databases.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/ebook.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/education.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/emacs-xyz.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/emulators.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/freedesktop.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/geo.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gl.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gnome.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gnuzilla.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gpodder.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/graphviz.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/guile.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/haskell.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/java.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/julia.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/linux.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/lisp-xyz.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/lisp.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/machine-learning.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/mail.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/maths.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/messaging.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/music.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/networking.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/package-management.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/patches/glibc-bootstrap-system.patch	diff1 \|	diff2 \|	blob \| history
gnu/packages/pcre.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/pdf.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/python-web.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/python-xyz.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/ruby.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/shells.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/simulation.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/statistics.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/text-editors.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/tls.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/tmux.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/video.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/vim.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/web.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/xfce.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/xml.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/xorg.scm	diff1 \|	diff2 \|	blob \| history
guix/build-system/minify.scm	diff1 \|	diff2 \|	blob \| history
guix/build/minify-build-system.scm	diff1 \|	diff2 \|	blob \| history
guix/import/print.scm	diff1 \|	diff2 \|	blob \| history
guix/utils.scm	diff1 \|	diff2 \|	blob \| history