Merge branch 'master' into core-updates-frozen

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

View file

@ -2291,12 +2291,21 @@ reading from and writing to ZIP archives. ")
(base32
"0nlzwnv6wh2yjyyv27f81jnvmk7psgpbnw7dsdp7frfkya569hgv"))))
(build-system meson-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/zck_gen_zdict.c"
(("/usr/bin/zstd")
(string-append (assoc-ref inputs "zstd")
"/bin/zstd"))))))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("curl" ,curl)))
`(("curl" ,curl)
("zstd" ,zstd)))
(propagated-inputs
`(("zstd" ,zstd "lib"))) ;in Requires.private of zck.pc
`(("zstd:lib" ,zstd "lib"))) ;in Requires.private of zck.pc
(home-page "https://github.com/zchunk/zchunk")
(synopsis "Compressed file format for efficient deltas")
(description "The zchunk compressed file format allows splitting a file