mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Merge branch 'master' into staging
With resolved conflicts in: gnu/local.mk gnu/packages/freedesktop.scm gnu/packages/gnuzilla.scm
This commit is contained in:
commit
3d297a0017
118 changed files with 6730 additions and 4851 deletions
|
@ -2232,3 +2232,9 @@ library.")
|
|||
(synopsis "Rust binding for webkit-gtk library")
|
||||
(description "This crate provides Rust binding for webkit-gtk library.")
|
||||
(license license:expat)))
|
||||
|
||||
;;;
|
||||
;;; 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.
|
||||
;;;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue