From patchwork Sun May 30 15:43:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 29680 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4A2F627BC78; Sun, 30 May 2021 16:44:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED,URIBL_SBL,URIBL_SBL_A autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 96A8427BC81 for ; Sun, 30 May 2021 16:44:08 +0100 (BST) Received: from localhost ([::1]:50424 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnNbj-00046U-N9 for patchwork@mira.cbaines.net; Sun, 30 May 2021 11:44:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43518) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnNbe-00046L-8Q for guix-patches@gnu.org; Sun, 30 May 2021 11:44:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48652) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lnNbd-00027E-Vk for guix-patches@gnu.org; Sun, 30 May 2021 11:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lnNbd-0001np-Sd for guix-patches@gnu.org; Sun, 30 May 2021 11:44:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48745] [PATCH] gnu: Iosevka fonts: Update to 7.0.1. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 30 May 2021 15:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48745@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.16223894196888 (code B ref -1); Sun, 30 May 2021 15:44:01 +0000 Received: (at submit) by debbugs.gnu.org; 30 May 2021 15:43:39 +0000 Received: from localhost ([127.0.0.1]:60198 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lnNbH-0001n2-5c for submit@debbugs.gnu.org; Sun, 30 May 2021 11:43:39 -0400 Received: from lists.gnu.org ([209.51.188.17]:37926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lnNbB-0001mp-U7 for submit@debbugs.gnu.org; Sun, 30 May 2021 11:43:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnNbB-000462-KR for guix-patches@gnu.org; Sun, 30 May 2021 11:43:33 -0400 Received: from mail1.protonmail.ch ([185.70.40.18]:47846) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnNb6-0001lq-PU for guix-patches@gnu.org; Sun, 30 May 2021 11:43:32 -0400 Date: Sun, 30 May 2021 15:43:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail3; t=1622389397; bh=jxNixVY5fHYeVZ2bGLuWxyy1yN2fg/6R5IXD7kIdPWo=; h=Date:To:From:Reply-To:Subject:From; b=aCkxadu9ZYN9rrqT7odmIEFfoKB6IIEKVLGvbFlHr4dmCsAwp2VSaqwukYvA23E2t jTlE19xk5/+uiZUNmu/bUD3Wm3b/eypPTIlErSSob9Fa1xbY38bKUA/TpUzA+4EXtH 8/i6Y3jXdgql0bHDn4xcaeAK6rQ4d2mGGrQ3HjgJyUGVytF5kMqv+xwvqPS0VZJDYG fh4IyxDf5P9P1PWN2TbN+gHUpKPsq5Dwx6EYlqk6PhGZXi7Yv5uz9amul39vojS3I1 /dLntNJFMY623VBl6CTthwHByG2Xyosm3nS37GpBIVdVhqLEMjIzGXO3cjXuFv+9rQ b6LZtlqLUa+6w== From: "Paul A. Patience" Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.18; envelope-from=paul@apatience.com; helo=mail1.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/fonts.scm (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): Update to 7.0.1. (font-iosevka-sparkle): Delete variable. --- gnu/packages/fonts.scm | 80 +++++++++++++++++++++++++++++------------- 1 file changed, 55 insertions(+), 25 deletions(-) -- 2.31.1 diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index c2280565ab..7a859d17bc 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -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 <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