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

HCoop / jackhill / guix / guix.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 533a893 b5607d8)

author	Tobias Geerinckx-Rice <me@tobias.gr>
	Tue, 13 Apr 2021 14:36:03 +0000 (16:36 +0200)
committer	Tobias Geerinckx-Rice <me@tobias.gr>
	Tue, 13 Apr 2021 14:36:03 +0000 (16:36 +0200)
commit	b13ef6ee7489b78be7f700489792ea672de13d36
tree	36ccb42dc688901c6419130479ef851d46addb79	tree \| snapshot (tar.gz zip)
parent	533a893cc6b03f100566760d6e0c8e0500ed7082	commit \| diff
parent	b5607d830c917c49ca9a7993962bd2b7c7be953c	commit \| diff

Merge remote-tracking branch 'upstream/master' into staging

13 files changed:

gnu/local.mk	diff1 \|	diff2 \|	blob \| history
gnu/packages/admin.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/databases.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/finance.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/geo.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gtk.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/linux.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/pdf.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/python-xyz.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/sphinx.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/web-browsers.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/web.scm	diff1 \|	diff2 \|	blob \| history
guix/build/qt-build-system.scm	diff1 \|	diff2 \|	blob \| history

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