diff options
| author | Leo Famulari <leo@famulari.name> | 2016-07-22 18:57:40 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-07-22 18:58:31 -0400 |
| commit | d227260d2f7833b6bdc55b8e3792378626ef3b69 (patch) | |
| tree | 26d47d5d8ee8efb102323bca215429a8f8fe1095 /gnu/packages/documentation.scm | |
| parent | d778fa5ff6f4a860919eaf13db3f84cfc68cbee8 (diff) | |
| parent | 26ad4adb5568c6ff370f446431b079520fb09615 (diff) | |
| download | guix-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/documentation.scm')
| -rw-r--r-- | gnu/packages/documentation.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 8302cc49cc..72af708dbd 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -43,8 +43,8 @@ (version "8.6.9") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/asciidoc/asciidoc-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/asciidoc/asciidoc/" + version "/asciidoc-" version ".tar.gz")) (sha256 (base32 "1w71nk527lq504njmaf0vzr93pgahkgzzxzglrq6bay8cw2rvnvq")))) @@ -126,8 +126,8 @@ or Java class files.") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/scrollkeeper/scrollkeeper-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/scrollkeeper/scrollkeeper/" + version "/scrollkeeper-" version ".tar.gz")) (sha256 (base32 "1bfxwxc1ngh11v36z899sz9qam366r050fhkyb5adv65lb1x62sa")))) (build-system gnu-build-system) |