@@ -1235,11 +1235,55 @@ later hand-tweaked with the gbdfed(1) editor:
typeface, by mimicking Comic Sans while fixing its most obvious shortcomings.")
(license license:silofl1.1)))
+;; When updating the version (and hash) of font-iosevka, also update the hash
+;; of the Iosevka variants further below.
+;; The following script downloads all Iosevka variants to the store and prints
+;; their hash at the end.
+#|
+guix repl <<EOF
+(use-modules (guix base32)
+ (guix download)
+ (guix packages)
+ (guix store)
+ (gcrypt hash)
+ (ice-9 string-fun)
+ (gnu packages fonts))
+
+(let ((new-version "7.0.1")
+ (iosevka-hashes #nil)
+ (iosevka-fails #nil))
+ (for-each (lambda (font)
+ (let ((file (download-to-store (open-connection)
+ (string-replace-substring
+ (origin-uri (package-source font))
+ (package-version font)
+ new-version))))
+ (if file
+ (set! iosevka-hashes
+ (acons file (bytevector->nix-base32-string
+ (file-sha256 file))
+ iosevka-hashes))
+ (set! iosevka-fails (cons font iosevka-fails)))))
+ (list font-iosevka
+ font-iosevka-slab
+ font-iosevka-term
+ font-iosevka-term-slab
+ font-iosevka-aile
+ font-iosevka-curly
+ font-iosevka-curly-slab
+ font-iosevka-etoile))
+ (for-each (lambda (hash)
+ (format #t "~a: ~a~%" (car hash) (cdr hash)))
+ iosevka-hashes)
+ (for-each (lambda (fail)
+ (format #t "~a: failed to download latest version~%" fail))
+ iosevka-fails))
+EOF
+|#
(define-public font-iosevka
(package
(name "font-iosevka")
- ;; When updating, also update the hash of the Iosevka variant(s) below.
- (version "4.0.3")
+ (version "7.0.1")
(source
(origin
(method url-fetch/zipbomb)
@@ -1247,7 +1291,7 @@ typeface, by mimicking Comic Sans while fixing its most obvious shortcomings.")
"/releases/download/v" version
"/ttc-iosevka-" version ".zip"))
(sha256
- (base32 "1xc45rs09aj899wz9ghyizq6ddbgxpkqq5bl1jc89hls5laf7qjb"))))
+ (base32 "1ld1faclj102axihdk2z211fjgsg38c7q8zrq7ams4hqb1sxvasx"))))
(build-system font-build-system)
(home-page "https://be5invis.github.io/Iosevka/")
(synopsis "Coders' typeface, built from code")
@@ -1255,7 +1299,7 @@ typeface, by mimicking Comic Sans while fixing its most obvious shortcomings.")
"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 (list license:silofl1.1 ; build artifacts (i.e., the fonts)
license:bsd-3)))) ; supporting code
(define-public font-iosevka-slab
@@ -1270,7 +1314,7 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version
"/ttc-iosevka-slab-" version ".zip"))
(sha256
- (base32 "0qpfzyi050zca0bwhb460nvcaarij4srhify0rb8sf9ygpzyvnjh"))))))
+ (base32 "01iypjx2x33nfg1k9j4b31izmakjzj1vd2pqw1qnglii92v93aqb"))))))
(define-public font-iosevka-term
(package
@@ -1284,7 +1328,7 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version
"/ttf-iosevka-term-" version ".zip"))
(sha256
- (base32 "092ygzv24wbi8cjjsmq0jkxdf4cm7wqlfj7jkn0cip7nlbyskl3h"))))
+ (base32 "0d1x6larrdlqank2jmcbrq2m945syb10234x3daql4cxzrdplbww"))))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -1305,7 +1349,7 @@ programming. Iosevka is completely generated from its source code.")
"releases/download/v" version "/"
"ttf-iosevka-term-slab-" version ".zip"))
(sha256
- (base32 "157kdxrxz981ympd2iww66v50vm2cxd7z98vvb36rii94hf30k7x"))))
+ (base32 "0wrn320q9vy3and9i2qipaz4724z59c374pcjima5i9xgxgj39j6"))))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -1326,7 +1370,7 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version
"/ttc-iosevka-aile-" version ".zip"))
(sha256
- (base32 "0n52lfn7awc28a4f5yh4my8q4ikzza705kp69chfw9jm2xx79npc"))))))
+ (base32 "07zn9x48l9dzgsfqanigmj5k3j28ff1q8a4k5ds9jx3krss998kw"))))))
(define-public font-iosevka-curly
(package
@@ -1340,7 +1384,7 @@ programming. Iosevka is completely generated from its source code.")
"releases/download/v" version "/"
"ttc-iosevka-curly-" version ".zip"))
(sha256
- (base32 "0m51r0bc25khllq8nsfgsldhwfs7kzl8kqasivjlm14mpv5080fn"))))))
+ (base32 "1dmjzcm1q3ssijsv6k2mz0xbjscyj5xpzjib9a6ldvgb5ahpzgnd"))))))
(define-public font-iosevka-curly-slab
(package
@@ -1354,7 +1398,7 @@ programming. Iosevka is completely generated from its source code.")
"releases/download/v" version "/"
"ttc-iosevka-curly-slab-" version ".zip"))
(sha256
- (base32 "0ffiz2kg43kc2dxv48sjji33ra3kc6sy8vlard93c601fqjmrjws"))))))
+ (base32 "0r9mmampqkp5mpsn3i35b01ijqaaw2fzcf36bxprky2sxdnj71vg"))))))
(define-public font-iosevka-etoile
(package
@@ -1368,21 +1412,7 @@ programming. Iosevka is completely generated from its source code.")
"/releases/download/v" version
"/ttc-iosevka-etoile-" version ".zip"))
(sha256
- (base32 "1fj8g7sjp9idjh14iqk4wsz3rdarlmq7amcdsr0dznwyivx8a9wx"))))))
-
-(define-public font-iosevka-sparkle
- (package
- (inherit font-iosevka)
- (name "font-iosevka-sparkle")
- (version (package-version font-iosevka))
- (source
- (origin
- (method url-fetch/zipbomb)
- (uri (string-append "https://github.com/be5invis/Iosevka"
- "/releases/download/v" version
- "/ttc-iosevka-sparkle-" version ".zip"))
- (sha256
- (base32 "00dw894930xdikai8bcaimp0a3720diwi0r7ii52jwl4d70w53dx"))))))
+ (base32 "0vx15zf4687vs1jvrysi3yd0ypxlfjisj7yc099nrgw28xxndjf9"))))))
(define-public font-sarasa-gothic
(package