--- Begin Message ---
|
Subject: |
More font-build-system migration |
|
Date: |
Sat, 17 Jun 2017 14:47:38 +0530 |
I've migrated some more font packages from trivial-build-system to the
new font-build-system. Please find attached a patchset.
>From f9b6eeadc1ebcbae647a3dbf95c6caad0d302565 Mon Sep 17 00:00:00 2001
From: Arun Isaac <address@hidden>
Date: Fri, 16 Jun 2017 11:17:13 +0530
Subject: [PATCH 1/7] gnu: font-tex-gyre: Use 'font-build-system'.
* gnu/packages/fonts.scm (font-tex-gyre): Switch to font-build-system.
[source]: Use url-fetch/zipbomb.
---
gnu/packages/fonts.scm | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 59e60dc29..50021aad1 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -555,28 +555,13 @@ fonts.")
(version "2.005")
(source
(origin
- (method url-fetch)
+ (method url-fetch/zipbomb)
(uri (string-append "http://www.gust.org.pl/projects/e-foundry/";
"tex-gyre/whole/tg-" version "otf.zip"))
(sha256
(base32
"0kph9l3g7jb2bpmxdbdg5zl56wacmnvdvsdn7is1gc750sqvsn31"))))
- (build-system trivial-build-system)
- (arguments
- `(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules (guix build utils))
-
- (let ((unzip (string-append (assoc-ref %build-inputs "unzip")
- "/bin/unzip"))
- (font-dir (string-append %output "/share/fonts/opentype")))
- (mkdir-p font-dir)
- (system* unzip
- (assoc-ref %build-inputs "source")
- "-d" font-dir)))))
- (native-inputs
- `(("unzip" ,unzip)))
+ (build-system font-build-system)
(home-page "http://www.gust.org.pl/projects/e-foundry/tex-gyre/";)
(synopsis "Remake of Ghostscript fonts")
(description "The TeX Gyre collection of fonts is the result of an
--
2.12.2
>From a2efcccafbdd75bf93297048d66bda1a8797fe7b Mon Sep 17 00:00:00 2001
From: Arun Isaac <address@hidden>
Date: Fri, 16 Jun 2017 11:22:05 +0530
Subject: [PATCH 2/7] gnu: font-anonymous-pro: Use 'font-build-system'.
* gnu/packages/fonts.scm (font-anonymous-pro): Switch to font-build-system.
---
gnu/packages/fonts.scm | 23 +----------------------
1 file changed, 1 insertion(+), 22 deletions(-)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 50021aad1..199f6e45a 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -583,28 +583,7 @@ Heros, Pagella, Schola, Termes.")
(sha256
(base32
"1asj6lykvxh46czbal7ymy2k861zlcdqpz8x3s5bbpqwlm3mhrl6"))))
- (build-system trivial-build-system)
- (arguments
- `(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules (guix build utils))
- (let ((unzip (string-append (assoc-ref %build-inputs "unzip")
- "/bin/unzip"))
- (font-dir (string-append %output "/share/fonts/truetype"))
- (doc-dir (string-append %output "/share/doc/" ,name)))
- (system* unzip (assoc-ref %build-inputs "source"))
- (mkdir-p font-dir)
- (mkdir-p doc-dir)
- (chdir (string-append "AnonymousPro-" ,version ".001"))
- (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
- `(("unzip" ,unzip)))
+ (build-system font-build-system)
(home-page "http://www.marksimonson.com/fonts/view/anonymous-pro";)
(synopsis "Fixed-width fonts designed with coding in mind")
(description "Anonymous Pro is a family of four fixed-width fonts designed
--
2.12.2
>From 9d03701fcfbe2d88e91b1f99f5991d70bf6ae045 Mon Sep 17 00:00:00 2001
From: Arun Isaac <address@hidden>
Date: Fri, 16 Jun 2017 11:27:11 +0530
Subject: [PATCH 3/7] gnu: font-google-roboto: Use 'font-build-system'.
* gnu/packages/fonts.scm (font-google-roboto): Switch to font-build-system.
---
gnu/packages/fonts.scm | 22 +---------------------
1 file changed, 1 insertion(+), 21 deletions(-)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 199f6e45a..966939767 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -704,27 +704,7 @@ display all Unicode symbols.")
(sha256
(base32
"0spscx08fad7i8qs7icns96iwcapniq8lwwqqvbf7bamvs8qfln4"))))
- (native-inputs `(("unzip" ,unzip)))
- (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")))
- (setenv "PATH" PATH)
- (system* "unzip" (assoc-ref %build-inputs "source"))
-
- (mkdir-p font-dir)
- (chdir "roboto-hinted")
- (for-each (lambda (ttf)
- (install-file ttf font-dir))
- (find-files "." "\\.ttf$"))))))
+ (build-system font-build-system)
(home-page "https://github.com/google/roboto";)
(synopsis "The Roboto family of fonts")
(description
--
2.12.2
>From 75b5f4de4dab6f1c6f33df1ebd5e40e4b1dee948 Mon Sep 17 00:00:00 2001
From: Arun Isaac <address@hidden>
Date: Fri, 16 Jun 2017 11:48:02 +0530
Subject: [PATCH 4/7] gnu: font-un: Use 'font-build-system'.
* gnu/packages/fonts.scm (font-un): Switch to font-build-system.
---
gnu/packages/fonts.scm | 28 +---------------------------
1 file changed, 1 insertion(+), 27 deletions(-)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 966939767..3a7924483 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -726,33 +726,7 @@ visual language \"Material Design\".")
(sha256
(base32
"13liaz2pmww3aqabm55la5npd08m1skh334ky7qfidxaz5s742iv"))))
- (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 "un-fonts"))
- (for-each (lambda (ttf)
- (install-file ttf font-dir))
- (find-files "." "\\.ttf$"))
- (for-each (lambda (doc)
- (install-file doc doc-dir))
- '("COPYING" "README"))))))
- (native-inputs
- `(("tar" ,tar)
- ("gzip" ,gzip)))
+ (build-system font-build-system)
(home-page "https://kldp.net/projects/unfonts/";)
(synopsis "Collection of Korean fonts")
(description
--
2.12.2
>From 3cd7a5e43786336a6a7f6ae89554288f10c20d07 Mon Sep 17 00:00:00 2001
From: Arun Isaac <address@hidden>
Date: Fri, 16 Jun 2017 11:49:21 +0530
Subject: [PATCH 5/7] gnu: font-hack: Use 'font-build-system'.
* gnu/packages/fonts.scm (font-hack): Switch to font-build-system.
[source]: Use url-fetch/zipbomb.
---
gnu/packages/fonts.scm | 25 ++-----------------------
1 file changed, 2 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 3a7924483..01b6ef00d 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -794,7 +794,7 @@ glyph designs, not just an added slant.")
(name "font-hack")
(version "2.020")
(source (origin
- (method url-fetch)
+ (method url-fetch/zipbomb)
(uri (string-append
"https://github.com/chrissimpkins/Hack/releases/download/v";
version "/Hack-v"
@@ -803,28 +803,7 @@ glyph designs, not just an added slant.")
(sha256
(base32
"16kkmc3psckw1b7k07ccn1gi5ymhlg9djh43nqjzg065g6p6d184"))))
- (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")))
- (setenv "PATH" PATH)
- (system* "unzip" (assoc-ref %build-inputs "source"))
-
- (mkdir-p font-dir)
- (for-each (lambda (ttf)
- (install-file ttf font-dir))
- (find-files "." "\\.ttf$"))))))
- (native-inputs
- `(("source" ,source)
- ("unzip" ,unzip)))
+ (build-system font-build-system)
(home-page "https://sourcefoundry.org/hack/";)
(synopsis "Typeface designed for source code")
(description
--
2.12.2
>From 0d4d7241c9102f4eeaad4137b39ace1b57aa7d03 Mon Sep 17 00:00:00 2001
From: Arun Isaac <address@hidden>
Date: Fri, 16 Jun 2017 11:50:11 +0530
Subject: [PATCH 6/7] gnu: font-fira-mono: Use 'font-build-system'.
* gnu/packages/fonts.scm (font-awesome): Switch to font-build-system.
---
gnu/packages/fonts.scm | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 01b6ef00d..d7c65e159 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -871,23 +871,7 @@ designed to work well in user interface environments.")
(sha256
(base32
"1z65x0dw5dq6rs6p9wyfrir50rlh95vgzsxr8jcd40nqazw4jhpi"))))
- (build-system trivial-build-system)
- (arguments
- `(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules (guix build utils))
- (let ((unzip (string-append (assoc-ref %build-inputs "unzip")
- "/bin/unzip"))
- (font-dir (string-append %output "/share/fonts/opentype")))
- (mkdir-p font-dir)
- (system* unzip
- "-j"
- (assoc-ref %build-inputs "source")
- "*.otf"
- "-d" font-dir)))))
- (native-inputs
- `(("unzip" ,unzip)))
+ (build-system font-build-system)
(home-page "http://mozilla.github.io/Fira/";)
(synopsis "Mozilla's monospace font")
(description "This is the typeface used by Mozilla in Firefox OS.")
--
2.12.2
>From e89144f219b6772653fa936f512e11ebfc03fcd8 Mon Sep 17 00:00:00 2001
From: Arun Isaac <address@hidden>
Date: Fri, 16 Jun 2017 11:50:47 +0530
Subject: [PATCH 7/7] gnu: font-adobe-source-code-pro: Use 'font-build-system'.
* gnu/packages/fonts.scm (font-adobe-source-code-pro): Switch to
font-build-system.
---
gnu/packages/fonts.scm | 21 +--------------------
1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index d7c65e159..4d61f0fcc 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -830,26 +830,7 @@ Powerline support.")
(sha256
(base32
"0arhhsf3i7ss39ykn73d1j8k4n8vx7115xph6jwkd970p1cxvr54"))))
- (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/opentype")))
- (setenv "PATH" PATH)
- (mkdir-p font-dir)
- (zero? (system* tar "-C" font-dir "--strip-components=2"
- "-xvf" (assoc-ref %build-inputs "source")
- (string-append "source-code-pro-"
- ,version "/OTF")))))))
- (native-inputs
- `(("gzip" ,gzip)
- ("tar" ,tar)))
+ (build-system font-build-system)
(home-page "https://github.com/adobe-fonts/source-code-pro";)
(synopsis
"Monospaced font family for user interface and coding environments")
--
2.12.2
--- End Message ---