amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into staging

Browse source 
With resolved conflicts in:
	gnu/local.mk
	gnu/packages/freedesktop.scm
	gnu/packages/gnuzilla.scm
This commit is contained in:
Maxim Cournoyer 2022-09-15 10:20:32 -04:00
commit 3d297a0017
No known key found for this signature in database
GPG key ID: 1260E46482E63562
118 changed files with 6730 additions and 4851 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gnu/packages/crates-graphics.scm
View file

@ -3582,3 +3582,9 @@ the platform-specific getters provided by winit, or another library.")
(arguments
`(#:cargo-development-inputs
(("rust-resize" ,rust-resize-0.3))))))
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar
;;; functionality or similar names.
;;;