1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-28 12:01:49 +02:00

Merge branch 'master' into core-updates

Conflicts:
	gnu/packages/cups.scm
	gnu/packages/python-web.scm
	gnu/packages/web.scm
	guix/build/maven/pom.scm
This commit is contained in:
Tobias Geerinckx-Rice
2021-06-23 18:45:21 +02:00
72 changed files with 2096 additions and 751 deletions
+1 -1
View File
@@ -298,7 +298,7 @@ structured data.")
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'add-source-to-load-path 'change-working-directory
(add-before 'expand-load-path 'change-working-directory
(lambda _ (chdir "editors") #t)))))
(home-page "https://github.com/protocolbuffers/protobuf")
(synopsis "Protocol buffers major mode for Emacs")