summaryrefslogtreecommitdiff
path: root/gnu/packages/compression.scm
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2016-07-22 18:57:40 -0400
committerLeo Famulari <leo@famulari.name>2016-07-22 18:58:31 -0400
commitd227260d2f7833b6bdc55b8e3792378626ef3b69 (patch)
tree26d47d5d8ee8efb102323bca215429a8f8fe1095 /gnu/packages/compression.scm
parentd778fa5ff6f4a860919eaf13db3f84cfc68cbee8 (diff)
parent26ad4adb5568c6ff370f446431b079520fb09615 (diff)
downloadpatches-d227260d2f7833b6bdc55b8e3792378626ef3b69.tar
patches-d227260d2f7833b6bdc55b8e3792378626ef3b69.tar.gz
Merge branch 'master' into core-updates
Resolved conflicts: * gnu/packages/scheme.scm: Conflict in import of (guix licenses). On master, "#:hide (openssl)" was used. On core-updates, "#:select (some licenses)" was used. The latter won the conflict. * gnu/packages/version-control.scm (git)[arguments]: Whitespace conflict in 'install-shell-completion.
Diffstat (limited to 'gnu/packages/compression.scm')
-rw-r--r--gnu/packages/compression.scm3
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index af3bba1f61..01b32a2ac3 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -634,7 +634,8 @@ time for compression ratio.")
(version "4.3")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://sourceforge/squashfs/"
+ (uri (string-append "mirror://sourceforge/squashfs/squashfs/"
+ "squashfs" version "/"
"squashfs" version ".tar.gz"))
(sha256
(base32