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/fonts.scm | |
| parent | d778fa5ff6f4a860919eaf13db3f84cfc68cbee8 (diff) | |
| parent | 26ad4adb5568c6ff370f446431b079520fb09615 (diff) | |
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/fonts.scm')
| -rw-r--r-- | gnu/packages/fonts.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 3faeb2ebd8..9b2281ad20 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -129,7 +129,7 @@ TrueType (TTF) files.") (version "2.35") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/dejavu/" + (uri (string-append "mirror://sourceforge/dejavu/dejavu/" version "/dejavu-fonts-ttf-" version ".tar.bz2")) (sha256 @@ -386,7 +386,7 @@ The Liberation Fonts are sponsored by Red Hat.") (origin (method url-fetch) (uri (string-append - "mirror://sourceforge/project/terminus-font/terminus-font-" + "mirror://sourceforge/terminus-font/terminus-font-" version "/terminus-font-" version @@ -476,7 +476,8 @@ text in Simplified Chinese, Traditional Chinese, Japanese, and Korean.") (source (origin (method url-fetch) (uri (string-append - "mirror://sourceforge/wqy/wqy-zenhei-" + "mirror://sourceforge/wqy/wqy-zenhei/" version + "%20%28Fighting-state%20RC1%29/wqy-zenhei-" version ".tar.gz")) (file-name (string-append "wqy-zenhei-" version ".tar.gz")) (sha256 |