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

HCoop / jackhill / guix / guix.git / commit

author	Marius Bakke <marius@gnu.org>
	Thu, 16 Sep 2021 23:25:52 +0000 (01:25 +0200)
committer	Marius Bakke <marius@gnu.org>
	Thu, 16 Sep 2021 23:25:52 +0000 (01:25 +0200)
commit	5c3cb22c9b2810669999e044b2de5e9331011a83
tree	3276e19cc1a0af3cece6ce4f2bfa930901888bb4	tree \| snapshot (tar.gz zip)
parent	c896287ce5eff968a0b323f3a069653a64b96b4c	commit \| diff
parent	2a054d29dcfd4b68ed3914886b637f93ac7a0a72	commit \| diff

Merge branch 'master' into core-updates-frozen

Conflicts:
gnu/packages/bioinformatics.scm
gnu/packages/chez.scm
gnu/packages/docbook.scm
gnu/packages/ebook.scm
gnu/packages/gnome.scm
gnu/packages/linux.scm
gnu/packages/networking.scm
gnu/packages/python-web.scm
gnu/packages/python-xyz.scm
gnu/packages/tex.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/dune.scm
guix/build-system/go.scm
guix/build-system/linux-module.scm
guix/packages.scm

59 files changed:

Makefile.am	diff1 \|	diff2 \|	blob \| history
doc/guix-cookbook.texi	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/autotools.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/ci.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/cran.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/crates-io.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/crypto.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/databases.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/django.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/docbook.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/engineering.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/games.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/geo.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gnome.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gnuzilla.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/golang.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/haskell-xyz.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/haskell.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/kde-pim.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/linux.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/llvm.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/mail.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/man.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/maths.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/music.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/networking.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/patchutils.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/perl.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/rust-apps.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/ssh.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/task-management.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/tex.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/version-control.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/video.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/vim.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/virtualization.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/web.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/wm.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/xdisorg.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/xfce.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/xml.scm	diff1 \|	diff2 \|	blob \| history
guix/build-system/dune.scm	diff1 \|	diff2 \|	blob \| history
guix/build-system/go.scm	diff1 \|	diff2 \|	blob \| history
guix/build-system/linux-module.scm	diff1 \|	diff2 \|	blob \| history
guix/import/elpa.scm	diff1 \|	diff2 \|	blob \| history
guix/lint.scm	diff1 \|	diff2 \|	blob \| history
guix/packages.scm	diff1 \|	diff2 \|	blob \| history
tests/hackage.scm	diff1 \|	diff2 \|	blob \| history
tests/packages.scm	diff1 \|	diff2 \|	blob \| history
tests/store.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-cookbook.texi	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/autotools.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/ci.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/cran.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/crates-io.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/crypto.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/databases.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/django.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/docbook.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/engineering.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/games.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/geo.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gnome.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gnuzilla.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/golang.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/haskell-xyz.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/haskell.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/kde-pim.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/linux.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/llvm.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/mail.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/man.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/maths.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/music.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/networking.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/patchutils.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/perl.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/rust-apps.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/ssh.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/task-management.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/tex.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/version-control.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/video.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/vim.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/virtualization.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/web.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/wm.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/xdisorg.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/xfce.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/xml.scm	diff1 \|	diff2 \|	blob \| history
guix/build-system/dune.scm	diff1 \|	diff2 \|	blob \| history
guix/build-system/go.scm	diff1 \|	diff2 \|	blob \| history
guix/build-system/linux-module.scm	diff1 \|	diff2 \|	blob \| history
guix/import/elpa.scm	diff1 \|	diff2 \|	blob \| history
guix/lint.scm	diff1 \|	diff2 \|	blob \| history
guix/packages.scm	diff1 \|	diff2 \|	blob \| history
tests/hackage.scm	diff1 \|	diff2 \|	blob \| history
tests/packages.scm	diff1 \|	diff2 \|	blob \| history
tests/store.scm	diff1 \|	diff2 \|	blob \| history