tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

Merge remote-tracking branch 'origin/version-1.2.0' into master

Browse Source 
Conflicts:
	gnu/packages/bioinformatics.scm

The python-pysam package fixed in master was kept instead of the update done
in the version-1.2.0 branch.
This commit is contained in:
Maxim Cournoyer
2020-11-17 18:00:28 -05:00
parent 5f9c92dd62 9113de2ca2
commit 129b9b16d9
18 changed files with 431 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.dir-locals.el
View File

@@ -134,7 +134,6 @@
(eval . (put 'call-with-progress-reporter 'scheme-indent-function 1))
(eval . (put 'with-repository 'scheme-indent-function 2))
(eval . (put 'with-temporary-git-repository 'scheme-indent-function 2))
(eval . (put 'with-temporary-git-worktree 'scheme-indent-function 2))
(eval . (put 'with-environment-variables 'scheme-indent-function 1))
(eval . (put 'with-fresh-gnupg-setup 'scheme-indent-function 1))