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 
Conflicts:
	gnu/local.mk
	gnu/packages/algebra.scm
	gnu/packages/bioinformatics.scm
	gnu/packages/curl.scm
	gnu/packages/docbook.scm
	gnu/packages/emacs-xyz.scm
	gnu/packages/maths.scm
	gnu/packages/plotutils.scm
	gnu/packages/python-web.scm
	gnu/packages/python-xyz.scm
	gnu/packages/radio.scm
	gnu/packages/readline.scm
	gnu/packages/tls.scm
	gnu/packages/xml.scm
	gnu/packages/xorg.scm
This commit is contained in:
Marius Bakke 2021-06-06 21:16:32 +02:00
commit 8d59c262ad
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
176 changed files with 16041 additions and 6439 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/compression.scm
View file

@ -864,7 +864,15 @@ time for compression ratio.")
"squashfs" version ".tar.gz"))
(sha256
(base32
"0zmhvczscqz0mzh4b9m8m42asq14db0a6lc8clp5ljq5ybrv70d9"))))
"0zmhvczscqz0mzh4b9m8m42asq14db0a6lc8clp5ljq5ybrv70d9"))
(modules '((guix build utils)))
(snippet
'(begin
;; Fix build with -fno-common (default in GCC 10).
;; Remove for squashfs-tools > 4.4.
(substitute* "squashfs-tools/mksquashfs.h"
(("struct cache \\*bwriter_buffer" all)
(string-append "extern " all)))))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no check target
@ -1008,7 +1016,7 @@ tarballs.")
(define-public libjcat
(package
(name "libjcat")
(version "0.1.7")
(version "0.1.8")
(source
(origin
(method git-fetch)
@ -1018,7 +1026,7 @@ tarballs.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "110c8h3p7m4ibrfvgja592z7j5h88qqanllxsvmxkjz3b129i02r"))))
(base32 "18qkyg19r7fxzv93kar5n808n3582ygjmqwa7rnyg5y4b6hnwihl"))))
(build-system meson-build-system)
(native-inputs
`(("gobject-introspection" ,gobject-introspection)