From b2f89c19fc709bc104da6b74e94248ea31decfd6 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 15 May 2017 20:16:04 +0530 Subject: gnu: font-inconsolata: Use 'font-build-system'. * gnu/packages/fonts.scm (font-inconsolata): Switch to 'font-build-system'. --- gnu/packages/fonts.scm | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'gnu/packages/fonts.scm') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 03a1f6f796..8e938819e8 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -42,6 +42,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system font) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages base) @@ -64,18 +65,7 @@ (sha256 (base32 "06js6znbcf7swn8y3b8ki416bz96ay7d3yvddqnvi88lqhbfcq8m")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils)) - (let ((font-dir (string-append %output - "/share/fonts/opentype")) - (source (assoc-ref %build-inputs "source"))) - (mkdir-p font-dir) - (copy-file source - (string-append font-dir "/" "inconsolata.otf")))))) - (native-inputs `(("source" ,source))) + (build-system font-build-system) (home-page "http://levien.com/type/myfonts/inconsolata.html") (synopsis "Monospace font") (description "A monospace font, designed for code listings and the like, -- cgit 1.4.1 From 5978658841c51b1573f81754b94da3f4a43b386c Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 15 May 2017 20:18:08 +0530 Subject: gnu: font-ubuntu: Use 'font-build-system'. * gnu/packages/fonts.scm (font-ubuntu): Switch to 'font-build-system'. --- gnu/packages/fonts.scm | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) (limited to 'gnu/packages/fonts.scm') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 8e938819e8..cf9855496c 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -84,34 +84,7 @@ in print. With attention to detail for high resolution rendering.") (sha256 (base32 "0hjvq2x758dx0sfwqhzflns0ns035qm7h6ygskbx1svzg517sva5")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils) - (srfi srfi-26)) - - (let ((PATH (string-append (assoc-ref %build-inputs - "unzip") - "/bin")) - (font-dir (string-append %output - "/share/fonts/truetype")) - (doc-dir (string-append %output "/share/doc/" - ,name "-" ,version))) - (setenv "PATH" PATH) - (system* "unzip" (assoc-ref %build-inputs "source")) - - (mkdir-p font-dir) - (mkdir-p doc-dir) - (chdir (string-append "ubuntu-font-family-" ,version)) - (for-each (lambda (ttf) - (install-file ttf font-dir)) - (find-files "." "\\.ttf$")) - (for-each (lambda (doc) - (install-file doc doc-dir)) - (find-files "." "\\.txt$")))))) - (native-inputs `(("source" ,source) - ("unzip" ,unzip))) + (build-system font-build-system) (home-page "http://font.ubuntu.com/") (synopsis "The Ubuntu Font Family") (description "The Ubuntu Font Family is a unique, custom designed font -- cgit 1.4.1 From 2e8840194121be6042502f363f143a4faeceb00e Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 15 May 2017 20:19:33 +0530 Subject: gnu: font-dejavu: Use 'font-build-system'. * gnu/packages/fonts.scm (font-dejavu): Switch to 'font-build-system'. --- gnu/packages/fonts.scm | 43 ++++++++----------------------------------- 1 file changed, 8 insertions(+), 35 deletions(-) (limited to 'gnu/packages/fonts.scm') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index cf9855496c..fcc31deebb 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -108,42 +108,15 @@ TrueType (TTF) files.") (base32 "1mqpds24wfs5cmfhj57fsfs07mji2z8812i5c4pi5pbi738s977s")))) (build-system trivial-build-system) + (build-system font-build-system) (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils)) - - (let ((tar (string-append (assoc-ref %build-inputs - "tar") - "/bin/tar")) - (PATH (string-append (assoc-ref %build-inputs - "bzip2") - "/bin")) - (font-dir (string-append - %output "/share/fonts/truetype")) - (conf-dir (string-append - %output "/share/fontconfig/conf.avail")) - (doc-dir (string-append - %output "/share/doc/" ,name "-" ,version))) - (setenv "PATH" PATH) - (system* tar "xvf" (assoc-ref %build-inputs "source")) - - (mkdir-p font-dir) - (mkdir-p conf-dir) - (mkdir-p doc-dir) - (chdir (string-append "dejavu-fonts-ttf-" ,version)) - (for-each (lambda (ttf) - (install-file ttf font-dir)) - (find-files "ttf" "\\.ttf$")) - (for-each (lambda (conf) - (install-file conf conf-dir)) - (find-files "fontconfig" "\\.conf$")) - (for-each (lambda (doc) - (install-file doc doc-dir)) - (find-files "." "\\.txt$|^[A-Z][A-Z]*$")))))) - (native-inputs `(("source" ,source) - ("tar" ,tar) - ("bzip2" ,bzip2))) + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-conf + (lambda* (#:key outputs #:allow-other-keys) + (let ((conf-dir (string-append (assoc-ref outputs "out") + "/share/fontconfig/conf.avail"))) + (copy-recursively "fontconfig" conf-dir))))))) (home-page "http://dejavu-fonts.org/") (synopsis "Vera font family derivate with additional characters") (description "DejaVu provides an expanded version of the Vera font family -- cgit 1.4.1 From e46e0de1b5b8d3cadcbdb833735670d5698c5873 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 15 May 2017 20:20:26 +0530 Subject: gnu: font-bitstream-vera: Use 'font-build-system'. * gnu/packages/fonts.scm (font-bitstream-vera): Switch to 'font-build-system'. --- gnu/packages/fonts.scm | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) (limited to 'gnu/packages/fonts.scm') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index fcc31deebb..954c588189 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -140,38 +140,7 @@ provide serif, sans and monospaced variants.") (sha256 (base32 "1p3qs51x5327gnk71yq8cvmxc6wgx79sqxfvxcv80cdvgggjfnyv")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils) - (srfi srfi-26)) - - (let ((tar (string-append (assoc-ref %build-inputs - "tar") - "/bin/tar")) - (PATH (string-append (assoc-ref %build-inputs - "bzip2") - "/bin")) - (font-dir (string-append %output - "/share/fonts/truetype")) - (doc-dir (string-append %output "/share/doc/" - ,name "-" ,version))) - (setenv "PATH" PATH) - (system* tar "xvf" (assoc-ref %build-inputs "source")) - - (mkdir-p font-dir) - (mkdir-p doc-dir) - (chdir (string-append "ttf-bitstream-vera-" ,version)) - (for-each (lambda (ttf) - (install-file ttf font-dir)) - (find-files "." "\\.ttf$")) - (for-each (lambda (doc) - (install-file doc doc-dir)) - (find-files "." "\\.TXT$")))))) - (native-inputs `(("source" ,source) - ("tar" ,tar) - ("bzip2" ,bzip2))) + (build-system font-build-system) (home-page "http://www.gnome.org/fonts/") (synopsis "Bitstream Vera sans-serif typeface") (description "Vera is a sans-serif typeface from Bitstream, Inc. This -- cgit 1.4.1 From 406c46e20ad0a84cf0cfcd104fd2c7a82e9c53b0 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sat, 27 May 2017 01:15:21 -0500 Subject: gnu: font-go: Update to 20170330-1.f03a046. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fonts.scm (font-go): Update to 20170330-1.f03a046. Signed-off-by: Ludovic Courtès --- gnu/packages/fonts.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/fonts.scm') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 954c588189..8564b9c28c 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1235,11 +1235,11 @@ programming. Iosevka is completely generated from its source code.") license:bsd-3)))) ; supporting code (define-public font-go - (let ((commit "b7f8df6bc082334698d4505fb85fa05e99156b72") + (let ((commit "f03a046406d4d7fbfd4ed29f554da8f6114049fc") (revision "1")) (package (name "font-go") - (version (string-append "20161115-" revision "." (string-take commit 7))) + (version (string-append "20170330-" revision "." (string-take commit 7))) (source (origin (file-name (string-append "go-image-" version "-checkout")) (method git-fetch) @@ -1248,7 +1248,7 @@ programming. Iosevka is completely generated from its source code.") (commit commit))) (sha256 (base32 - "1ywxs6dmcyzwwsmnan3qqza7znprnbvmdi260x6sjmydz6dyq2zs")))) + "1aq6mnjayks55gd9ahavk6jfydlq5lm4xm0xk4pd5sqa74p5p74d")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit 1.4.1 From 208abecabff7727cb7398ffdaa4b62c1f3f4270f Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sat, 27 May 2017 09:39:38 -0500 Subject: gnu: font-iosevka: Update to 1.12.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fonts.scm (font-iosevka): Update to 1.12.5. Re-indent. Signed-off-by: Ludovic Courtès --- gnu/packages/fonts.scm | 58 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'gnu/packages/fonts.scm') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 8564b9c28c..ef0642f798 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1202,37 +1202,37 @@ typeface, by mimicking Comic Sans while fixing its most obvious shortcomings.") (define-public font-iosevka (package - (name "font-iosevka") - (version "1.11.0") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/be5invis/Iosevka/releases/download/v" - version "/iosevka-pack-" version ".zip")) - (sha256 - (base32 - "0d8prdk7s5z94sdfd0y92cvqq531yqrlg7hnadbnhd7fs9jqr5hj")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils)) - (let ((font-dir (string-append %output - "/share/fonts/truetype")) - (source (assoc-ref %build-inputs "source")) - (unzip (string-append (assoc-ref %build-inputs "unzip") - "/bin/unzip"))) - (mkdir-p font-dir) - (system* unzip "-d" font-dir source))))) - (native-inputs `(("unzip" ,unzip))) - (home-page "https://be5invis.github.io/Iosevka/") - (synopsis "Coders' typeface, built from code") - (description - "Iosevka is a slender monospace sans-serif or slab-serif typeface inspired + (name "font-iosevka") + (version "1.12.5") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/be5invis/Iosevka/releases/download/v" + version "/iosevka-pack-" version ".zip")) + (sha256 + (base32 + "0s3g6mk0ngwsrw9h9dqinb50cd9i8zhqdcmmh93fhyf4d87yfwyi")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder (begin + (use-modules (guix build utils)) + (let ((font-dir (string-append %output + "/share/fonts/truetype")) + (source (assoc-ref %build-inputs "source")) + (unzip (string-append (assoc-ref %build-inputs "unzip") + "/bin/unzip"))) + (mkdir-p font-dir) + (system* unzip "-d" font-dir source))))) + (native-inputs `(("unzip" ,unzip))) + (home-page "https://be5invis.github.io/Iosevka/") + (synopsis "Coders' typeface, built from code") + (description + "Iosevka is a slender monospace sans-serif or slab-serif typeface inspired by Pragmata Pro, M+, and PF DIN Mono, designed to be the ideal font for programming. Iosevka is completely generated from its source code.") - (license (list license:silofl1.1 ; build artifacts (i.e. the fonts) - license:bsd-3)))) ; supporting code + (license (list license:silofl1.1 ; build artifacts (i.e. the fonts) + license:bsd-3)))) ; supporting code (define-public font-go (let ((commit "f03a046406d4d7fbfd4ed29f554da8f6114049fc") -- cgit 1.4.1 From 4a9140b1ee452c95682bb9e4e1b030f24f0c631d Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Wed, 31 May 2017 12:39:53 -0500 Subject: gnu: font-iosevka: Use 'font-build-system'. Fixes . * gnu/packages/fonts.scm (font-iosevka): Switch to font-build-system. [source]: Use url-fetch/zipbomb. [native-inputs]: Remove dependency on unzip. Signed-off-by: Danny Milosavljevic --- gnu/packages/fonts.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'gnu/packages/fonts.scm') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index ef0642f798..6dc098a5e3 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1205,26 +1205,14 @@ typeface, by mimicking Comic Sans while fixing its most obvious shortcomings.") (name "font-iosevka") (version "1.12.5") (source (origin - (method url-fetch) + (method url-fetch/zipbomb) (uri (string-append "https://github.com/be5invis/Iosevka/releases/download/v" version "/iosevka-pack-" version ".zip")) (sha256 (base32 "0s3g6mk0ngwsrw9h9dqinb50cd9i8zhqdcmmh93fhyf4d87yfwyi")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils)) - (let ((font-dir (string-append %output - "/share/fonts/truetype")) - (source (assoc-ref %build-inputs "source")) - (unzip (string-append (assoc-ref %build-inputs "unzip") - "/bin/unzip"))) - (mkdir-p font-dir) - (system* unzip "-d" font-dir source))))) - (native-inputs `(("unzip" ,unzip))) + (build-system font-build-system) (home-page "https://be5invis.github.io/Iosevka/") (synopsis "Coders' typeface, built from code") (description -- cgit 1.4.1 From b6726480e2bee87b9ebc1d696f8b36465cd4321e Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Wed, 31 May 2017 14:54:20 -0500 Subject: gnu: font-go: Use 'font-build-system'. * gnu/packages/fonts.scm (font-go): Switch to font-build-system. Re-indent. Signed-off-by: Danny Milosavljevic --- gnu/packages/fonts.scm | 54 ++++++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 30 deletions(-) (limited to 'gnu/packages/fonts.scm') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 6dc098a5e3..7a5e63629f 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1226,39 +1226,33 @@ programming. Iosevka is completely generated from its source code.") (let ((commit "f03a046406d4d7fbfd4ed29f554da8f6114049fc") (revision "1")) (package - (name "font-go") - (version (string-append "20170330-" revision "." (string-take commit 7))) - (source (origin - (file-name (string-append "go-image-" version "-checkout")) - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/image") - (commit commit))) - (sha256 - (base32 - "1aq6mnjayks55gd9ahavk6jfydlq5lm4xm0xk4pd5sqa74p5p74d")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils)) - (let ((font-dir (string-append %output - "/share/fonts/truetype")) - (source (assoc-ref %build-inputs "source"))) - (mkdir-p font-dir) - (with-directory-excursion - (string-append source "/font/gofont/ttfs") - (for-each (lambda (ttf) - (install-file ttf font-dir)) - (find-files "." "\\.ttf$"))))))) - (home-page "https://blog.golang.org/go-fonts") - (synopsis "The Go font family") - (description - "The Go font family is a set of WGL4 TrueType fonts from the Bigelow & + (name "font-go") + (version (string-append "20170330-" revision "." (string-take commit 7))) + (source (origin + (file-name (string-append "go-image-" version "-checkout")) + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/image") + (commit commit))) + (sha256 + (base32 + "1aq6mnjayks55gd9ahavk6jfydlq5lm4xm0xk4pd5sqa74p5p74d")))) + (build-system font-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'install 'chdir + (lambda _ + (chdir "font/gofont/ttfs") + #t))))) + (home-page "https://blog.golang.org/go-fonts") + (synopsis "The Go font family") + (description + "The Go font family is a set of WGL4 TrueType fonts from the Bigelow & Holmes type foundry, released under the same license as the Go programming language. It includes a set of proportional, sans-serif fonts, and a set of monospace, slab-serif fonts.") - (license (package-license go-1.4))))) + (license (package-license go-1.4))))) (define-public font-google-material-design-icons (package -- cgit 1.4.1 From 278c608a251db6948ae47c500af8f075722417c0 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sun, 28 May 2017 19:33:09 +0000 Subject: gnu: font-awesome: Use 'font-build-system'. * gnu/packages/fonts.scm (font-awesome): Switch to 'font-build-system'. [source]: The package was updated in place, so hash has changed. Signed-off-by: Arun Isaac --- gnu/packages/fonts.scm | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'gnu/packages/fonts.scm') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 7a5e63629f..df0997f57a 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2015, 2017 Ricardo Wurmus ;;; Copyright © 2015, 2016 Leo Famulari -;;; Copyright © 2016, 2017 ng0 +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Jookia <166291@gmail.com> ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016 Dmitry Nikolaev @@ -1073,26 +1073,8 @@ designed to work well in user interface environments.") name "-" version ".zip")) (sha256 (base32 - "1frhmw41lnnm9rda2zs202pvfi5vzlrsw4xfp4mswl0qgws61mcd")))) - (build-system trivial-build-system) - (native-inputs - `(("unzip" ,unzip))) - (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils)) - (let* ((font-dir (string-append %output - "/share/fonts/opentype")) - (source (assoc-ref %build-inputs "source")) - (src-otf-file (string-append "font-awesome-" - ,version - "/fonts/FontAwesome.otf")) - (dest-otf-file (string-append font-dir "/FontAwesome.otf")) - (unzip (assoc-ref %build-inputs "unzip"))) - (setenv "PATH" (string-append unzip "/bin")) - (mkdir-p font-dir) - (system* "unzip" source "-d" ".") - (copy-file src-otf-file dest-otf-file))))) + "1m1rfwm4sjkv10j3xd2dhwk286a5912b2zgvc692cmxi5gxs68jf")))) + (build-system font-build-system) (home-page "http://fontawesome.io") (synopsis "Font that contains a rich iconset") (description -- cgit 1.4.1 From 7f8e8ff811ea5bb4030ccd816d538d88909a664b Mon Sep 17 00:00:00 2001 From: ng0 Date: Sun, 28 May 2017 19:33:12 +0000 Subject: gnu: font-dejavu: Fix the switch to 'font-build-system'. This is a follow-up to commit 2e8840194121be6042502f363f143a4faeceb00e. * gnu/packages/fonts.scm (font-dejavu): Remove 'trivial-build-system' line. Signed-off-by: Arun Isaac --- gnu/packages/fonts.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/fonts.scm') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index df0997f57a..4ca707a1c0 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -107,7 +107,6 @@ TrueType (TTF) files.") (sha256 (base32 "1mqpds24wfs5cmfhj57fsfs07mji2z8812i5c4pi5pbi738s977s")))) - (build-system trivial-build-system) (build-system font-build-system) (arguments `(#:phases -- cgit 1.4.1 From 45d32e243a4122f244a8e82630121db042ffdb14 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sun, 28 May 2017 19:33:13 +0000 Subject: gnu: font-liberation: Use 'font-build-system'. * gnu/packages/fonts.scm (font-liberation): Switch to 'font-build-system'. Signed-off-by: Arun Isaac --- gnu/packages/fonts.scm | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) (limited to 'gnu/packages/fonts.scm') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 4ca707a1c0..620c5dec74 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -231,34 +231,7 @@ sans-serif designed for on-screen reading. It is used by GNOME@tie{}3.") (sha256 (base32 "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - - (let ((tar (string-append (assoc-ref %build-inputs "tar") - "/bin/tar")) - (PATH (string-append (assoc-ref %build-inputs "gzip") - "/bin")) - (font-dir (string-append %output "/share/fonts/truetype")) - (doc-dir (string-append %output "/share/doc/" ,name))) - (setenv "PATH" PATH) - (system* tar "xvf" (assoc-ref %build-inputs "source")) - (mkdir-p font-dir) - (mkdir-p doc-dir) - (chdir (string-append "liberation-fonts-ttf-" ,version)) - (for-each (lambda (ttf) - (install-file ttf font-dir)) - (find-files "." "\\.ttf$")) - (for-each (lambda (doc) - (install-file doc doc-dir)) - '("AUTHORS" "ChangeLog" "LICENSE" "README" "TODO")))))) - (native-inputs - `(("source" ,source) - ("tar" ,tar) - ("gzip" ,gzip))) + (build-system font-build-system) (home-page "https://pagure.io/liberation-fonts/") (synopsis "Fonts compatible with Arial, Times New Roman, and Courier New") -- cgit 1.4.1 From a5ce48c8f5e8b46438b25f670e8ba3ebb6fafa43 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Thu, 1 Jun 2017 22:00:25 +1000 Subject: gnu: font-cns11643-swjz: Use 'font-build-system'. * gnu/packages/fonts.scm (font-cns11643-swjz): Switch to 'font-build-system'. Signed-off-by: Arun Isaac --- gnu/packages/fonts.scm | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'gnu/packages/fonts.scm') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 620c5dec74..1145b3114f 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -471,19 +471,7 @@ encoded in the user defined area of the Big-5 code. (sha256 (base32 "1qkljldbmb53zp1rcmpsb8rzy67rnsqcjxi549m9743ifk4isl78")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((font-dir (string-append %output - "/share/fonts/truetype/cns11643")) - (source (assoc-ref %build-inputs "source"))) - (mkdir-p font-dir) - (copy-file source - (string-append font-dir "/" "ebas927.ttf")) - #t)))) + (build-system font-build-system) (home-page (string-append "http://www.cns11643.gov.tw/AIDB/download.do" "?name=%E5%AD%97%E5%9E%8B%E4%B8%8B%E8%BC%89")) -- cgit 1.4.1 From b963d8c2e549eeca2654e9e139f5835722a4ef9d Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Wed, 31 May 2017 11:41:52 -0500 Subject: gnu: font-comic-neue: Use 'font-build-system'. * gnu/packages/fonts.scm (font-comic-neue): Switch to 'font-build-system'. Re-indent. [source]: Use url-fetch/zipbomb. [native-inputs]: Remove dependency on unzip. Signed-off-by: Arun Isaac --- gnu/packages/fonts.scm | 54 ++++++++++++++++++++------------------------------ 1 file changed, 22 insertions(+), 32 deletions(-) (limited to 'gnu/packages/fonts.scm') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 1145b3114f..6fe44d90d1 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1108,39 +1108,29 @@ later hand-tweaked with the gbdfed(1) editor: (define-public font-comic-neue (package - (name "font-comic-neue") - (version "2.3") - (source (origin - (method url-fetch) - (uri (string-append - "http://www.comicneue.com/comic-neue-" version ".zip")) - (sha256 - (base32 - "1695hkpd8kqnr2a88p8xs496slgzxjjkzpa9aa33ml3pnh7519zk")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils)) - (let ((font-dir (string-append %output - "/share/fonts/truetype")) - (source (assoc-ref %build-inputs "source")) - (unzip (string-append (assoc-ref %build-inputs "unzip") - "/bin/unzip"))) - (mkdir-p font-dir) - (system* unzip source) - (with-directory-excursion - (string-append "Web") - (for-each (lambda (ttf) - (install-file ttf font-dir)) - (find-files "." "\\.ttf$"))))))) - (native-inputs `(("unzip" ,unzip))) - (home-page "http://www.comicneue.com/") - (synopsis "Font that fixes the shortcomings of Comic Sans") - (description - "Comic Neue is a font that attempts to create a respectable casual + (name "font-comic-neue") + (version "2.3") + (source (origin + (method url-fetch/zipbomb) + (uri (string-append + "http://www.comicneue.com/comic-neue-" version ".zip")) + (sha256 + (base32 + "1695hkpd8kqnr2a88p8xs496slgzxjjkzpa9aa33ml3pnh7519zk")))) + (build-system font-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'install 'chdir + (lambda _ + (chdir "Web") + #t))))) + (home-page "http://www.comicneue.com/") + (synopsis "Font that fixes the shortcomings of Comic Sans") + (description + "Comic Neue is a font that attempts to create a respectable casual typeface, by mimicking Comic Sans while fixing its most obvious shortcomings.") - (license license:silofl1.1))) + (license license:silofl1.1))) (define-public font-iosevka (package -- cgit 1.4.1 From 532f09dff312089dfcfea0178edebbb435da3ff2 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Wed, 31 May 2017 11:51:41 -0500 Subject: gnu: font-comic-neue: Add fontconfig alias. * gnu/packages/fonts.scm (font-comic-neue): Add fontconfig alias for "Comic Sans MS". [arguments]: Add new 'install-conf' phase. Signed-off-by: Arun Isaac --- gnu/packages/fonts.scm | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'gnu/packages/fonts.scm') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 6fe44d90d1..cedf3573b6 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1121,9 +1121,25 @@ later hand-tweaked with the gbdfed(1) editor: (arguments `(#:phases (modify-phases %standard-phases - (add-before 'install 'chdir - (lambda _ - (chdir "Web") + (add-after 'install 'install-conf + (lambda* (#:key outputs #:allow-other-keys) + (let ((conf-dir (string-append (assoc-ref outputs "out") + "/share/fontconfig/conf.avail"))) + (mkdir-p conf-dir) + (call-with-output-file + (string-append conf-dir "/30-comic-neue.conf") + (lambda (port) + (format port " + + + + + Comic Sans MS + + Comic Neue + + +\n")))) #t))))) (home-page "http://www.comicneue.com/") (synopsis "Font that fixes the shortcomings of Comic Sans") -- cgit 1.4.1 From ad37bed336961090bd5b3861996dd942f77c8aa9 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Thu, 1 Jun 2017 22:55:00 +1000 Subject: gnu: font-cns11643: Update to 98.1.20170524. * gnu/packages/fonts.scm (font-cns11643): Update to 98.1.20170524. Signed-off-by: Arun Isaac --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/fonts.scm') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index cedf3573b6..c84cc9234f 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -403,13 +403,13 @@ text in Simplified Chinese, Traditional Chinese, Japanese, and Korean.") (define-public font-cns11643 (package (name "font-cns11643") - (version "98.1.20170405") + (version "98.1.20170524") (source (origin (method url-fetch) (uri "http://www.cns11643.gov.tw/AIDB/Open_Data.zip") (sha256 (base32 - "02kb3bwjrra0k2hlr2p8xswd2y0xs6j8d9vm6yrby734h02a40qf")))) + "1iad6rklxkx03ji1fav9faq7cmqkci3i6pcyg2ilvh984j5qzhq3")))) (outputs '("out" "tw-kai" "tw-sung")) (build-system trivial-build-system) (native-inputs -- cgit 1.4.1 From 8c5ad448436077e5e0a3aaa3789fade43b72ec6d Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Thu, 1 Jun 2017 22:59:45 +1000 Subject: gnu: font-cns11643: Use 'font-build-system'. * gnu/packages/fonts.scm (font-cns16643): Switch to 'font-build-system'. [outputs]: Combine all outputs into one. Signed-off-by: Arun Isaac --- gnu/packages/fonts.scm | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) (limited to 'gnu/packages/fonts.scm') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index c84cc9234f..24107273ef 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -410,35 +410,7 @@ text in Simplified Chinese, Traditional Chinese, Japanese, and Korean.") (sha256 (base32 "1iad6rklxkx03ji1fav9faq7cmqkci3i6pcyg2ilvh984j5qzhq3")))) - (outputs '("out" "tw-kai" "tw-sung")) - (build-system trivial-build-system) - (native-inputs - `(("unzip" ,unzip))) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let* ((font-dir "/share/fonts/truetype/cns11643") - (out (string-append - (assoc-ref %outputs "out") font-dir)) - (tw-kai (string-append - (assoc-ref %outputs "tw-kai") font-dir)) - (tw-sung (string-append - (assoc-ref %outputs "tw-sung") font-dir)) - (unzip (string-append - (assoc-ref %build-inputs "unzip") "/bin/unzip"))) - (system* unzip (assoc-ref %build-inputs "source")) - (chdir "Open_Data/Fonts/") - (install-file "TW-Kai-98_1.ttf" tw-kai) - (install-file "TW-Sung-98_1.ttf" tw-sung) - (install-file "TW-Kai-98_1.ttf" out) - (install-file "TW-Kai-Ext-B-98_1.ttf" out) - (install-file "TW-Kai-Plus-98_1.ttf" out) - (install-file "TW-Sung-98_1.ttf" out) - (install-file "TW-Sung-Ext-B-98_1.ttf" out) - (install-file "TW-Sung-Plus-98_1.ttf" out) - #t)))) + (build-system font-build-system) (home-page "http://www.cns11643.gov.tw/AIDB/welcome.do") (synopsis "CJK TrueType fonts, TW-Kai and TW-Sung") (description -- cgit 1.4.1 From 44636f57bcee12bb0cae79430fab6876fa4cab20 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 1 Jun 2017 21:55:11 +0530 Subject: gnu: font-comic-neue: Prevent hidden files from being installed. * gnu/packages/fonts.scm (font-comic-neue)[arguments]: Add 'delete-macosx-files' phase. --- gnu/packages/fonts.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/fonts.scm') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 24107273ef..73d76a461f 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1093,6 +1093,12 @@ later hand-tweaked with the gbdfed(1) editor: (arguments `(#:phases (modify-phases %standard-phases + ;; Delete Mac OS X specific files. If not deleted, these cause + ;; several hidden files to be installed. + (add-before 'install 'delete-macosx-files + (lambda _ + (delete-file-recursively "__MACOSX") + #t)) (add-after 'install 'install-conf (lambda* (#:key outputs #:allow-other-keys) (let ((conf-dir (string-append (assoc-ref outputs "out") -- cgit 1.4.1