Merge branch 'master' into core-updates-frozen

Browse Source

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

...

This commit is contained in:

Marius Bakke

2021-07-29 22:34:57 +02:00

parent bc55f3091b ffb381856d

commit b029be2ee0

100 changed files with 5664 additions and 43929 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

gnu/packages/cran.scm

+311 -130

File diff suppressed because it is too large Load Diff