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 core-updates

Browse source 
Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a277 and
12964df69a respectively.

4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it
cannot currently be tested.

 Conflicts:
	gnu/local.mk
	gnu/packages/aidc.scm
	gnu/packages/boost.scm
	gnu/packages/curl.scm
	gnu/packages/nettle.scm
	gnu/packages/networking.scm
	gnu/packages/python-xyz.scm
	gnu/packages/tls.scm
This commit is contained in:
Marius Bakke 2021-06-19 17:38:47 +02:00
commit 6f9a80b331
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
217 changed files with 13322 additions and 4178 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/aidc.scm
View file

@ -211,7 +211,7 @@ C/C++ programs to use its capabilities without restrictions or overhead.")
;; These are in 'requires' field of .pc files.
`(("glib" ,glib)
("gtk+" ,gtk+)
("qtbase" ,qtbase)))
("qtbase" ,qtbase-5)))
(synopsis "Bar code reader")
(description
"ZBar can read barcodes from various sources, such as video streams,