diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
| commit | 8d59c262ada2e2167196a8fb8cbebd9c329a79dd (patch) | |
| tree | 85a74de8cc23a2f0179c0b9f0adfa4c274449a0c /gnu/packages/compression.scm | |
| parent | e7f0835b07d868fd447aa64c873174fa385e1699 (diff) | |
| parent | a068ed6a5f5b3535fce49ac4eca1fec82edd6fdc (diff) | |
| download | guix-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar.gz | |
Merge branch 'master' into core-updates
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
Diffstat (limited to 'gnu/packages/compression.scm')
| -rw-r--r-- | gnu/packages/compression.scm | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 64816a30c0..cc91bcfaa4 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -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) |