Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2022-09-10 17:27:06 +02:00
commit 07140e8b10
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
21 changed files with 604 additions and 285 deletions

View file

@ -11901,3 +11901,9 @@ It also allows manipulating ancillary data or so-called control
information (cmsghdr). This ancillary data may be used for file descriptor
passing, IPv6 operations, and a host of implemenation-specific extensions.")
(license license:perl-license)))
;;;
;;; 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.
;;;