Merge branch 'staging' into core-updates

This commit is contained in:
Marius Bakke 2019-03-10 18:47:02 +01:00
commit 96ab233df7
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
99 changed files with 9225 additions and 2662 deletions

View file

@ -703,13 +703,13 @@ sfArk file format to the uncompressed sf2 format.")
(package
(name "libmspack")
(home-page "https://cabextract.org.uk/libmspack/")
(version "0.9.1")
(version "0.10.1")
(source
(origin
(method url-fetch)
(uri (string-append home-page name "-" version "alpha.tar.gz"))
(sha256
(base32 "0h1f5w8rjnq7dcqpqm1mpx5m8q80691kid6f7npqlqwqqzckd8v2"))))
(base32 "13janaqsvm7aqc4agjgd4819pbgqv50j88bh5kci1z70wvg65j5s"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--disable-static")))
@ -966,13 +966,13 @@ smaller than those produced by @code{Xdelta}.")
(package
(name "cabextract")
(home-page "https://cabextract.org.uk/")
(version "1.9")
(version "1.9.1")
(source (origin
(method url-fetch)
(uri (string-append home-page name "-" version ".tar.gz"))
(uri (string-append home-page "cabextract-" version ".tar.gz"))
(sha256
(base32
"1hf4zhjxfdgq9x172r5zfdnafma9q0zf7372syn8hcn7hcypkg0v"))
"19qwhl2r8ip95q4vxzxg2kp4p125hjmc9762sns1dwwf7ikm7hmg"))
(modules '((guix build utils)))
(snippet
'(begin