From 3731fb1645d0ea0a04cef696e37af6413487c952 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 24 Jan 2023 21:17:01 +0100 Subject: [PATCH] treewide: convert 14 fonts --- pkgs/data/fonts/alkalami/default.nix | 22 ++++++++------- pkgs/data/fonts/amiri/default.nix | 25 +++++++++-------- pkgs/data/fonts/ankacoder/condensed.nix | 24 ++++++++++------- pkgs/data/fonts/anonymous-pro/default.nix | 25 ++++++++++------- pkgs/data/fonts/camingo-code/default.nix | 27 ++++++++++--------- pkgs/data/fonts/cardo/default.nix | 24 +++++++++-------- pkgs/data/fonts/cooper-hewitt/default.nix | 20 ++++++++------ pkgs/data/fonts/dm-sans/default.nix | 27 ++++++++++++------- .../fonts/fantasque-sans-mono/default.nix | 26 +++++++++--------- pkgs/data/fonts/fira-go/default.nix | 26 +++++++++--------- pkgs/data/fonts/garamond-libre/default.nix | 24 +++++++++-------- pkgs/data/fonts/hackgen/default.nix | 24 +++++++++-------- pkgs/data/fonts/hackgen/nerdfont.nix | 24 +++++++++-------- .../fonts/helvetica-neue-lt-std/default.nix | 27 +++++++++---------- 14 files changed, 192 insertions(+), 153 deletions(-) diff --git a/pkgs/data/fonts/alkalami/default.nix b/pkgs/data/fonts/alkalami/default.nix index b0b2876f5a6..60e31e88c2d 100644 --- a/pkgs/data/fonts/alkalami/default.nix +++ b/pkgs/data/fonts/alkalami/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "alkalami"; version = "2.000"; - url = "https://software.sil.org/downloads/r/alkalami/Alkalami-${version}.zip"; + src = fetchzip { + url = "https://software.sil.org/downloads/r/alkalami/Alkalami-${version}.zip"; + hash = "sha256-rT0HzTFbooHr+l5BQ9GVYKxxNk7TESdkOQfWBeVpwYI="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - rm -rf $out/web $out/manifest.json mkdir -p $out/share/{doc/${pname},fonts/truetype} - mv $out/*.ttf $out/share/fonts/truetype/ - mv $out/*.txt $out/documentation $out/share/doc/${pname}/ - ''; + mv *.ttf $out/share/fonts/truetype/ + mv *.txt documentation $out/share/doc/${pname}/ - sha256 = "sha256-GjX3YOItLKSMlRjUbBgGp2D7QS/pOJQYuQJzW+iqBNo="; + runHook postInstall + ''; meta = with lib; { homepage = "https://software.sil.org/alkalami/"; diff --git a/pkgs/data/fonts/amiri/default.nix b/pkgs/data/fonts/amiri/default.nix index 87185e8469f..bfd7c60bf53 100644 --- a/pkgs/data/fonts/amiri/default.nix +++ b/pkgs/data/fonts/amiri/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "amiri"; version = "1.000"; -in fetchzip rec { - name = "Amiri-${version}"; + src = fetchzip { + url = "https://github.com/alif-type/amiri/releases/download/${version}/Amiri-${version}.zip"; + hash = "sha256-WXxKLYIIKe01WWZrI1aLOv65wRgn7aqHl6Codf4foVw="; + }; - url = "https://github.com/alif-type/amiri/releases/download/${version}/${name}.zip"; + installPhase = '' + runHook preInstall - sha256 = "sha256-hG6m/zsGoGF5/xhHz9EHVL9Sg9dlQqfXpQ/lqNyI1vU="; - - postFetch = '' mkdir -p $out/share/fonts/truetype - mv $out/*.ttf $out/share/fonts/truetype/ - mkdir -p $out/share/doc/${name} - mv $out/{*.html,*.txt,*.md} $out/share/doc/${name}/ + mv *.ttf $out/share/fonts/truetype/ + mkdir -p $out/share/doc/${pname}-${version} + mv {*.html,*.txt,*.md} $out/share/doc/${pname}-${version}/ + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/ankacoder/condensed.nix b/pkgs/data/fonts/ankacoder/condensed.nix index 655c780129d..676c3cf8560 100644 --- a/pkgs/data/fonts/ankacoder/condensed.nix +++ b/pkgs/data/fonts/ankacoder/condensed.nix @@ -1,17 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let version = "1.100"; in -fetchzip { - name = "ankacoder-condensed-${version}"; - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoderCondensed.${version}.zip"; +stdenvNoCC.mkDerivation rec { + pname = "ankacoder-condensed"; + version = "1.100"; + + src = fetchzip { + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoderCondensed.${version}.zip"; + stripRoot = false; + hash = "sha256-NHrkV4Sb7i+DC4e4lToEYzah3pI+sKyYf2rGbhWj7iY="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - unzip $downloadedFile mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype - ''; - sha256 = "0i80zpr2y9368rg2i6x8jv0g7d03kdyr5h7w9yz7pjd7i9xd8439"; + runHook postInstall + ''; meta = with lib; { description = "Anka/Coder Condensed font"; diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix index cb6ec6d8944..f498e2780b3 100644 --- a/pkgs/data/fonts/anonymous-pro/default.nix +++ b/pkgs/data/fonts/anonymous-pro/default.nix @@ -1,17 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "anonymouspro"; version = "1.002"; -in fetchzip rec { - name = "anonymousPro-${version}"; - url = "http://www.marksimonson.com/assets/content/fonts/AnonymousPro-${version}.zip"; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.txt -d "$out/share/doc/${name}" + src = fetchzip { + url = "https://www.marksimonson.com/assets/content/fonts/AnonymousPro-${lib.replaceStrings ["."] ["_"] version}.zip"; + hash = "sha256-FhyzV4By8XKN9EyukAknzml/7lUuV6Evnt6Ht3H6TUU="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall ''; - sha256 = "05rgzag38qc77b31sm5i2vwwrxbrvwzfsqh3slv11skx36pz337f"; meta = with lib; { homepage = "https://www.marksimonson.com/fonts/view/anonymous-pro"; diff --git a/pkgs/data/fonts/camingo-code/default.nix b/pkgs/data/fonts/camingo-code/default.nix index 626ff9f1c0a..c852303021d 100644 --- a/pkgs/data/fonts/camingo-code/default.nix +++ b/pkgs/data/fonts/camingo-code/default.nix @@ -1,19 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "camingo-code"; version = "1.0"; -in fetchzip rec { - name = "camingo-code-${version}"; - url = "https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip"; - postFetch = '' - install -Dm644 $out/camingo-code/*.ttf -t $out/share/fonts/truetype - install -Dm644 $out/camingo-code/*.txt -t $out/share/doc/${name} - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + src = fetchzip { + url = "https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip"; + hash = "sha256-oo5pWDq6h0bmyGvfF9Bkh7WyjKX4dG8uclfIsWLhDw8="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 camingo-code/*.ttf -t $out/share/fonts/truetype + install -Dm644 camingo-code/*.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall ''; - sha256 = "sha256-/vDNuR034stmiCZ9jUH5DlTQJn0WccLY5treoziXOJo="; meta = with lib; { homepage = "https://www.myfonts.com/fonts/jan-fromm/camingo-code/"; diff --git a/pkgs/data/fonts/cardo/default.nix b/pkgs/data/fonts/cardo/default.nix index 21763365de3..c862ea7ce88 100644 --- a/pkgs/data/fonts/cardo/default.nix +++ b/pkgs/data/fonts/cardo/default.nix @@ -1,20 +1,22 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation { + pname = "cardo"; version = "1.04"; -in -fetchzip { - name = "cardo-${version}"; - url = "http://scholarsfonts.net/cardo104.zip"; + src = fetchzip { + url = "https://scholarsfonts.net/cardo104.zip"; + stripRoot = false; + hash = "sha256-NU6/H5f0JBlVo3L3uUcl7IvNxPMXD8UQY9k5o2YA5Vo="; + }; - hash = "sha256-eBK6+VQpreWA7jIneNXOcKFcT+cJzhoQ9XXyq93SZ8M="; - stripRoot = false; + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype - mv $out/*.ttf $out/share/fonts/truetype - rm $out/*.pdf + mv *.ttf $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/cooper-hewitt/default.nix b/pkgs/data/fonts/cooper-hewitt/default.nix index 48c7bc87342..5a3bb59c251 100644 --- a/pkgs/data/fonts/cooper-hewitt/default.nix +++ b/pkgs/data/fonts/cooper-hewitt/default.nix @@ -1,18 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "cooper-hewitt"; version = "unstable-2014-06-09"; - url = "https://web.archive.org/web/20221004145117/https://www.cooperhewitt.org/wp-content/uploads/fonts/CooperHewitt-OTF-public.zip"; + src = fetchzip { + url = "https://web.archive.org/web/20221004145117/https://www.cooperhewitt.org/wp-content/uploads/fonts/CooperHewitt-OTF-public.zip"; + hash = "sha256-bTlEXQeYNNspvnNdvQhJn6CNBrcSKYWuNWF/N6+3Vb0="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/opentype - mv $out/*.otf $out/share/fonts/opentype - find $out -maxdepth 1 ! -type d -exec rm {} + - ''; + mv *.otf $out/share/fonts/opentype - sha256 = "01iwqmjvqkc6fmc2r0486vk06s6f51n9wxzl1pf9z48n0igj4gqd"; + runHook postInstall + ''; meta = with lib; { homepage = "https://www.cooperhewitt.org/open-source-at-cooper-hewitt/cooper-hewitt-the-typeface-by-chester-jenkins/"; diff --git a/pkgs/data/fonts/dm-sans/default.nix b/pkgs/data/fonts/dm-sans/default.nix index f7b556fe538..c2d8f33eff6 100644 --- a/pkgs/data/fonts/dm-sans/default.nix +++ b/pkgs/data/fonts/dm-sans/default.nix @@ -1,15 +1,22 @@ -{ lib, fetchzip }: -let version = "1.002"; in -fetchzip { - inherit version; - pname = "dm-sans"; - url = "https://github.com/googlefonts/dm-fonts/releases/download/v${version}/DeepMindSans_v${version}.zip"; - stripRoot = false; - hash = "sha256-zyS0gz7CGn39HCiyeN5cAP63v9nG6jffGSsI1vr84EQ="; +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "dm-sans"; + version = "1.002"; + + src = fetchzip { + url = "https://github.com/googlefonts/dm-fonts/releases/download/v${version}/DeepMindSans_v${version}.zip"; + stripRoot = false; + hash = "sha256-RSHHxiCac18qqF+hW5M3BbBcra4AQpNLLlUmhiWj9f8="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype - mv $out/*.ttf $out/share/fonts/truetype + mv *.ttf $out/share/fonts/truetype + + runHook postInstall ''; meta = { diff --git a/pkgs/data/fonts/fantasque-sans-mono/default.nix b/pkgs/data/fonts/fantasque-sans-mono/default.nix index e8068d7faea..d4d60d95bc9 100644 --- a/pkgs/data/fonts/fantasque-sans-mono/default.nix +++ b/pkgs/data/fonts/fantasque-sans-mono/default.nix @@ -1,22 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "fantasque-sans-mono"; version = "1.8.0"; -in -fetchzip rec { - name = "fantasque-sans-mono-${version}"; + src = fetchzip { + url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono-Normal.zip"; + stripRoot = false; + hash = "sha256-MNXZoDPi24xXHXGVADH16a3vZmFhwX0Htz02+46hWFc="; + }; - url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono-Normal.zip"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile README.md -d $out/share/doc/${name} + install -Dm644 OTF/*.otf -t $out/share/fonts/opentype + install -Dm644 README.md -t $out/share/doc/${pname}-${version} + + runHook postInstall ''; - sha256 = "07y2w6xzkbaj6vr95fvvnmwq1pw9jib4z02xf8937dx812yic9ni"; - meta = with lib; { homepage = "https://github.com/belluzj/fantasque-sans"; description = "A font family with a great monospaced variant for programmers"; diff --git a/pkgs/data/fonts/fira-go/default.nix b/pkgs/data/fonts/fira-go/default.nix index 2d5952523a6..a850d7d2e97 100644 --- a/pkgs/data/fonts/fira-go/default.nix +++ b/pkgs/data/fonts/fira-go/default.nix @@ -1,25 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation { pname = "fira-go"; version = "1.001"; - user = "bBoxType"; - repo = "FiraGo"; - rev = "9882ba0851f88ab904dc237f250db1d45641f45d"; -in -fetchzip { - name = "${pname}-${version}"; - url = "https://github.com/${user}/${repo}/archive/${rev}.zip"; + src = fetchzip { + url = "https://github.com/bBoxType/FiraGo/archive/9882ba0851f88ab904dc237f250db1d45641f45d.zip"; + hash = "sha256-WwgPg7OLrXBjR6oHG5061RO3HeNkj2Izs6ktwIxVw9o="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/opentype - mv $out/Fonts/FiraGO_OTF_1001/{Roman,Italic}/*.otf \ + mv Fonts/FiraGO_OTF_1001/{Roman,Italic}/*.otf \ $out/share/fonts/opentype - rm -r $out/{Fonts,'Technical Report PDF',OFL.txt,README.md,*.pdf} - ''; - sha256 = "sha256-MDGRba1eao/yVzSuncJ/nvCG8cpdrI4roVPI1G9qCbU="; + runHook postInstall + ''; meta = with lib; { homepage = "https://bboxtype.com/typefaces/FiraGO"; diff --git a/pkgs/data/fonts/garamond-libre/default.nix b/pkgs/data/fonts/garamond-libre/default.nix index 202ae2ce41f..bd16afaf189 100644 --- a/pkgs/data/fonts/garamond-libre/default.nix +++ b/pkgs/data/fonts/garamond-libre/default.nix @@ -1,21 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "garamond-libre"; version = "1.4"; - url = "https://github.com/dbenjaminmiller/garamond-libre/releases/download/${version}/garamond-libre_${version}.zip"; - stripRoot = false; + src = fetchzip { + url = "https://github.com/dbenjaminmiller/garamond-libre/releases/download/${version}/garamond-libre_${version}.zip"; + stripRoot = false; + hash = "sha256-cD/JMICtb6MPIUcWs2VOTHnb/05ma0/KKtPyR4oJlIc="; + }; - postFetch = '' - install -Dm644 $out/*.otf -t $out/share/fonts/opentype - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + installPhase = '' + runHook preInstall + + install -Dm644 *.otf -t $out/share/fonts/opentype + + runHook postInstall ''; - sha256 = "6WiuUe3CHXXL/0G7wURvSIgWPQ4isl50e3OBQ+ui0U4="; - meta = with lib; { homepage = "https://github.com/dbenjaminmiller/garamond-libre"; description = "Garamond Libre font family"; diff --git a/pkgs/data/fonts/hackgen/default.nix b/pkgs/data/fonts/hackgen/default.nix index b60ccb87fbb..24c3b7af374 100644 --- a/pkgs/data/fonts/hackgen/default.nix +++ b/pkgs/data/fonts/hackgen/default.nix @@ -1,18 +1,20 @@ -{ lib -, fetchzip -}: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "hackgen-font"; version = "2.8.0"; - url = "https://github.com/yuru7/HackGen/releases/download/v${version}/HackGen_v${version}.zip"; - sha256 = "sha256-TLqns6ulovHRKoLHxxwKpj6SqfCq5UDVBf7gUASCGK4="; - postFetch = '' - install -Dm644 $out/*.ttf -t $out/share/fonts/hackgen - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + src = fetchzip { + url = "https://github.com/yuru7/HackGen/releases/download/v${version}/HackGen_v${version}.zip"; + hash = "sha256-vKbiM3QUryey0m6oilO0lT6+efkCTLCwdtPF7PinkmU="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/hackgen + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/hackgen/nerdfont.nix b/pkgs/data/fonts/hackgen/nerdfont.nix index f563a2eb479..54bec95c59c 100644 --- a/pkgs/data/fonts/hackgen/nerdfont.nix +++ b/pkgs/data/fonts/hackgen/nerdfont.nix @@ -1,18 +1,20 @@ -{ lib -, fetchzip -}: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "hackgen-nf-font"; version = "2.8.0"; - url = "https://github.com/yuru7/HackGen/releases/download/v${version}/HackGen_NF_v${version}.zip"; - sha256 = "sha256-xRFedeavEJY9OZg+gePF5ImpLTYdbSba5Wr9k0ivpkE="; - postFetch = '' - install -Dm644 $out/*.ttf -t $out/share/fonts/hackgen-nf - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + src = fetchzip { + url = "https://github.com/yuru7/HackGen/releases/download/v${version}/HackGen_NF_v${version}.zip"; + hash = "sha256-RLEq5IoA3gk/IzabV8wdJYj8yMpbWQVz+Qunef6oNOs="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/hackgen-nf + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix index 7e69ff70d62..61dc6ba14e2 100644 --- a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix +++ b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix @@ -1,24 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation { + name = "helvetica-neue-lt-std"; version = "2014.08.16"; # date of most recent file in distribution -in fetchzip { - name = "helvetica-neue-lt-std-${version}"; - url = "https://web.archive.org/web/20190823153624/http://ephifonts.com/downloads/helvetica-neue-lt-std.zip"; + src = fetchzip { + url = "https://web.archive.org/web/20190823153624/http://ephifonts.com/downloads/helvetica-neue-lt-std.zip"; + stripRoot = false; + hash = "sha256-ytoTTrnwN1lMw/gTxS4DRAq+tV5WzB2xHP4vVxLZ1ZI="; + }; - stripRoot = false; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts - install -Dm644 $out/'Helvetica Neue LT Std'/*.otf -t $out/share/fonts/opentype - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + install -Dm644 'Helvetica Neue LT Std'/*.otf -t $out/share/fonts/opentype + + runHook postInstall ''; - sha256 = "sha256-gM/QXrKI2xrrCBYt4R+Fk5Tj0AIkrnCP/pwgh0A/MyI="; - meta = with lib; { homepage = "https://web.archive.org/web/20190926040940/http://www.ephifonts.com/free-helvetica-font-helvetica-neue-lt-std.html"; description = "Helvetica Neue LT Std font";