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-frozen

Browse source 
Conflicts:
	gnu/packages/algebra.scm
	gnu/packages/games.scm
	gnu/packages/golang.scm
	gnu/packages/kerberos.scm
	gnu/packages/mail.scm
	gnu/packages/python.scm
	gnu/packages/ruby.scm
	gnu/packages/scheme.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/version-control.scm
This commit is contained in:
Marius Bakke 2021-08-12 00:30:27 +02:00
commit c4133c43c7
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
181 changed files with 256111 additions and 218870 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/engineering.scm
View file

@ -1947,11 +1947,12 @@ parallel computing platforms. It also supports serial execution.")
(patches
(list (origin
;; Fix build with GCC 7. Patch taken from Arch Linux:
;; https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/freehdl
;; https://github.com/archlinux/svntogit-community/tree/packages/freehdl/trunk
(method url-fetch)
(uri "https://git.archlinux.org/svntogit/community.git\
/plain/trunk/build-fix.patch?h=packages/freehdl\
&id=3bb90d64dfe6883e26083cd1fa96226d0d59175a")
(uri (string-append "https://raw.githubusercontent.com"
"/archlinux/svntogit-community"
"/3bb90d64dfe6883e26083cd1fa96226d0d59175a"
"/trunk/build-fix.patch"))
(file-name "freehdl-c++-namespace.patch")
(sha256
(base32