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
This commit is contained in:
Marius Bakke 2021-07-29 22:34:57 +02:00
commit b029be2ee0
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
100 changed files with 5664 additions and 43929 deletions

View file

@ -899,16 +899,16 @@ through its msgpack-rpc API.")
(define-public vim-guix-vim
(package
(name "vim-guix-vim")
(version "0.2.1")
(version "0.3.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/Efraim/guix.vim")
(url "https://gitlab.com/Efraim/guix.vim.git/")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1fyfwsvv787al88lqjgqcgykav8pcf4xgj5d4i0j7wjcfb3mh1vw"))))
"0bk2mnvbv1rfr0zzx4m8jjdw98wbbmdffx1h9svrjpg25lcvqv1b"))))
(build-system copy-build-system)
(arguments
'(#:install-plan