Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2020-03-06 00:17:50 +01:00
commit b6f946f039
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
68 changed files with 2127 additions and 1154 deletions

View file

@ -25,6 +25,7 @@
;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -410,7 +411,8 @@ compatible with bzip2 both at file format and command line level.")
#:phases (modify-phases %standard-phases
(delete 'configure)) ; no configure script
#:make-flags (list (string-append "PREFIX=" %output))))
(home-page "http://compression.ca/pbzip2/")
(home-page (string-append "https://web.archive.org/web/20180412020219/"
"http://compression.ca/pbzip2/"))
(synopsis "Parallel bzip2 implementation")
(description
"Pbzip2 is a parallel implementation of the bzip2 block-sorting file
@ -813,7 +815,7 @@ time for compression ratio.")
("lzo" ,lzo)
("xz" ,xz)
("zlib" ,zlib)))
(home-page "http://squashfs.sourceforge.net/")
(home-page "https://github.com/plougher/squashfs-tools")
(synopsis "Tools to create and extract squashfs file systems")
(description
"Squashfs is a highly compressed read-only file system for Linux. It uses