diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/data/fonts')
21 files changed, 317 insertions, 106 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/agave/default.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/agave/default.nix index 0c2cd1609f61..39ef6e34aaae 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/agave/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/agave/default.nix @@ -2,7 +2,7 @@ let pname = "agave"; - version = "22"; + version = "35"; in fetchurl { name = "${pname}-${version}"; url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf"; @@ -13,7 +13,7 @@ in fetchurl { install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf ''; - sha256 = "1jb8f0xcv5z0l5nyx733b6zclswi82vrh2nwyyhbqzgqrl4y1h6s"; + sha256 = "10shwsl1illdafnc352j439lklrxksip1vlh4jc934cr9qf4c1fz"; meta = with lib; { description = "truetype monospaced typeface designed for X environments"; diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/fraunces/default.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/fraunces/default.nix new file mode 100644 index 000000000000..d5879d6c2bc4 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/fraunces/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchzip }: +let + version = "1.000"; +in +fetchzip { + name = "fraunces-${version}"; + + url = "https://github.com/undercasetype/Fraunces/releases/download/${version}/UnderCaseType_Fraunces_${version}.zip"; + + sha256 = "0qgl140qkn9p87x7pk60fd3lj206y5h0fq2xkcj2qiv3sxbqxwqb"; + + postFetch = '' + mkdir -p $out/share/fonts/ + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + ''; + + meta = with lib; { + description = "A display, “Old Style” soft-serif typeface inspired by early 20th century typefaces"; + homepage = "https://github.com/undercasetype/Fraunces"; + license = licenses.ofl; + maintainers = [ maintainers.marsam ]; + platforms = platforms.all; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/google-fonts/default.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/google-fonts/default.nix index 7a3b488212df..153f37c88e0a 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/google-fonts/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/google-fonts/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation { pname = "google-fonts"; version = "2019-07-14"; + outputs = [ "out" "adobeBlank" ]; + src = fetchFromGitHub { owner = "google"; repo = "fonts"; @@ -39,6 +41,9 @@ stdenv.mkDerivation { ''; installPhase = '' + adobeBlankDest=$adobeBlank/share/fonts/truetype + install -m 444 -Dt $adobeBlankDest ofl/adobeblank/AdobeBlank-Regular.ttf + rm -r ofl/adobeblank dest=$out/share/fonts/truetype find . -name '*.ttf' -exec install -m 444 -Dt $dest '{}' + ''; diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/inter/default.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/inter/default.nix index 9c7ef62c7690..ed8e9eb13a63 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/inter/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/inter/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "3.11"; + version = "3.15"; in fetchzip { name = "inter-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256 = "1bk4q478jy84ylgm1mmh23n8cw1cd3k7gvfih77sd7ya1zv26vl1"; + sha256 = "0dnxczy2avc47wq5fc3psd1zbxbsjz5w24rkh5ynrfgw6n0753n0"; meta = with lib; { homepage = "https://rsms.me/inter/"; diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index 0f88aa05e4cf..90b64c5f159e 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -1,28 +1,39 @@ -{ stdenv, fetchzip }: +{ stdenv, lib, fetchurl, iosevka, unzip +, variant ? "" +}: let - version = "3.4.6"; -in fetchzip { - name = "iosevka-bin-${version}"; + name = "iosevka" + lib.optionalString (variant != "") "-" + variant; - url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-iosevka-${version}.zip"; + variantHashes = import ./variants.nix; + validVariants = map (lib.removePrefix "iosevka-") + (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); +in stdenv.mkDerivation rec { + pname = "${name}-bin"; + version = "4.0.0"; - postFetch = '' + src = fetchurl { + url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; + sha256 = variantHashes.${name} or (throw '' + No such variant "${variant}" for package iosevka-bin. + Valid variants are: ${lib.concatStringsSep ", " validVariants}. + ''); + }; + + nativeBuildInputs = [ unzip ]; + + phases = [ "unpackPhase" ]; + + unpackPhase = '' mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttc -d $out/share/fonts/truetype + unzip -d $out/share/fonts/truetype $src ''; - sha256 = "1nab49gkpxahwvvw39xcc32q425qkccr7ffmz87jbcdv71qy7pp9"; - - meta = with stdenv.lib; { - homepage = "https://be5invis.github.io/Iosevka/"; - downloadPage = "https://github.com/be5invis/Iosevka/releases"; - description = '' - Slender monospace sans-serif and slab-serif typeface inspired by Pragmata - Pro, M+ and PF DIN Mono, designed to be the ideal font for programming. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.cstrahan ]; + meta = iosevka.meta // { + maintainers = with lib.maintainers; [ + cstrahan + ]; }; + + passthru.updateScript = ./update-bin.sh; } diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/default.nix index 5167c494fa07..989c2d39c19e 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, pkgs, fetchFromGitHub, nodejs, nodePackages, remarshal -, ttfautohint-nox, otfcc +, ttfautohint-nox # Custom font set options. # See https://github.com/be5invis/Iosevka#build-your-own-style @@ -27,23 +27,30 @@ assert (privateBuildPlan != null) -> set != null; +let + # We don't know the attribute name for the Iosevka package as it + # changes not when our update script is run (which in turn updates + # node-packages.json, but when node-packages/generate.sh is run + # (which updates node-packages.nix). + # + # Doing it this way ensures that the package can always be built, + # although possibly an older version than ioseva-bin. + nodeIosevka = ( + lib.findSingle + (drv: drv ? packageName && drv.packageName == "iosevka") + (throw "no 'iosevka' package found in nodePackages") + (throw "multiple 'iosevka' packages found in nodePackages") + (lib.attrValues nodePackages) + ).override (drv: { dontNpmInstall = true; }); +in stdenv.mkDerivation rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - - version = "3.2.2"; - - src = fetchFromGitHub { - owner = "be5invis"; - repo = "Iosevka"; - rev = "v${version}"; - sha256 = "1wbnp6gr3ywvspwk6i0jn68zwjmsd38arn4n2dkh7mdkrmvah81k"; - }; + inherit (nodeIosevka) version src; nativeBuildInputs = [ nodejs - nodePackages."iosevka-build-deps-../../data/fonts/iosevka" + nodeIosevka remarshal - otfcc ttfautohint-nox ]; @@ -58,12 +65,10 @@ stdenv.mkDerivation rec { remarshal -i "$privateBuildPlanJSONPath" -o private-build-plans.toml -if json -of toml ''} ${lib.optionalString (extraParameters != null) '' - echo -e "\n" >> parameters.toml - cat "$extraParametersPath" >> parameters.toml + echo -e "\n" >> params/parameters.toml + cat "$extraParametersPath" >> params/parameters.toml ''} - ln -s ${ - nodePackages."iosevka-build-deps-../../data/fonts/iosevka" - }/lib/node_modules/iosevka-build-deps/node_modules . + ln -s ${nodeIosevka}/lib/node_modules/iosevka/node_modules . runHook postConfigure ''; @@ -74,13 +79,19 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall fontdir="$out/share/fonts/truetype" install -d "$fontdir" install "dist/$pname/ttf"/* "$fontdir" + runHook postInstall ''; enableParallelBuilding = true; + passthru = { + updateScript = ./update-default.sh; + }; + meta = with stdenv.lib; { homepage = "https://be5invis.github.io/Iosevka"; downloadPage = "https://github.com/be5invis/Iosevka/releases"; @@ -96,6 +107,7 @@ stdenv.mkDerivation rec { ttuegel babariviere rileyinman + AluisioASG ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/package.json b/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/package.json deleted file mode 100644 index bc772960882d..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "iosevka-build-deps", - "version": "3.2.2", - "scripts": { - "build": "verda -f verdafile.js" - }, - "dependencies": { - "@iarna/toml": "^2.2.5", - "cldr": "^5.5.4", - "ejs": "^3.1.3", - "fs-extra": "^9.0.0", - "object-assign": "^4.1.1", - "otfcc-ttcize": "^0.10.2", - "patel": "^0.33.1", - "prettier": "^2.0.5", - "semver": "^7.1.3", - "spiro": "^2.0.0", - "stylus": "^0.54.7", - "topsort": "^0.0.2", - "ttf2woff": "^2.0.1", - "ttf2woff2": "^3.0.0", - "typo-geom": "^0.8.0", - "unicode-13.0.0": "^0.8.0", - "unorm": "^1.6.0", - "verda": "^1.0.1", - "which": "^2.0.2" - } -} diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/update-bin.sh b/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/update-bin.sh new file mode 100755 index 000000000000..a402f152d8a1 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/update-bin.sh @@ -0,0 +1,28 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p curl jq + +set -euo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +release=$(curl -s https://api.github.com/repos/be5invis/Iosevka/releases/latest) + +oldVersion=$(nix-instantiate --eval -E 'with import ../../../.. {}; lib.getVersion iosevka-bin' | tr -d '"') +version=$(echo "$release" | jq -r .tag_name | tr -d v) + +if test "$oldVersion" = "$version"; then + echo "New version same as old version, nothing to do." >&2 + exit 0 +fi + +sed -i "s/$oldVersion/$version/" bin.nix + +{ + echo '# This file was autogenerated. DO NOT EDIT!' + echo '{' + for asset in $(echo "$release" | jq -r '.assets[].name | select(startswith("ttc"))'); do + printf ' %s = "%s";\n' \ + $(echo "$asset" | sed -r "s/^ttc-(.*)-$version.zip$/\1/") \ + $(nix-prefetch-url "https://github.com/be5invis/Iosevka/releases/download/v$version/$asset") + done + echo '}' +} >variants.nix diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/update-default.sh b/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/update-default.sh new file mode 100755 index 000000000000..208ea6101ac2 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/update-default.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts coreutils gawk replace +set -euo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +nixpkgs=../../../.. +repo=https://github.com/be5invis/Iosevka + +# Discover the latest version. +current_version=$(nix-instantiate "$nixpkgs" --eval --strict -A iosevka.version | tr -d '"') +new_version=$(list-git-tags "$repo" | sort --reverse --version-sort | awk 'match($0, /^v([0-9.]+)$/, m) { print m[1]; exit; }') +if [[ "$new_version" == "$current_version" ]]; then + echo "iosevka: no update found" + exit +fi + +# Update the source package in nodePackages. +current_source="$repo/archive/v$current_version.tar.gz" +new_source="$repo/archive/v$new_version.tar.gz" +replace-literal -ef "$current_source" "$new_source" ../../../development/node-packages/node-packages.json +echo "iosevka: $current_version -> $new_version (after nodePackages update)" diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/variants.nix new file mode 100644 index 000000000000..e3157db6c918 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -0,0 +1,24 @@ +# This file was autogenerated. DO NOT EDIT! +{ + iosevka = "05wlap8r7kfg5zyj8gf7i1cypgs6lwpkh51g4cyj01zjkkv9g7k8"; + iosevka-aile = "18qa6q1djjr34aj340ab47ajkkcq4wfv7m36f303kabgwfif247r"; + iosevka-curly = "138hl95n3c2cfblzgh8adi1aljwn1xljjbffd0nrb12hipmgddql"; + iosevka-curly-slab = "0x18zzphri1fx4lql51n8bam0pq2xb61p1gx50km3wlvkrbmbj23"; + iosevka-etoile = "0byv8x3nqjka4ivpa8h6hq2k18cjnf69qmcc06dy4ym45a34qqsw"; + iosevka-slab = "0a2h1g69r9nmp5cskgciywsiq07rxn0cskhvwbwaq64rsqbr1l58"; + iosevka-sparkle = "13kwdgziylicwkl9s9v9bx9zbbrsrys6n7gx2jzgkdlsj8wkd73i"; + iosevka-ss01 = "0achcgfcya6sl15wknlyyghpz3d7q62wa0fikl74wr5xyl7h7f1f"; + iosevka-ss02 = "09gsawl61acykpd2429g1mz0l7i4gl0j1fl0lzc1giy6kbvrkggb"; + iosevka-ss03 = "07fdxmlpqv6z5hbly8l344x96m80jbz8rq5h9qkfz63xlq0376sj"; + iosevka-ss04 = "0q3v6spylhaxsf6spv6q5kh87mxbkh9x04s3h1g3rjv6gdlxi9n4"; + iosevka-ss05 = "1zzdx4d6zrc1qbhsp0bfg91v63h1y943pylfxns09bzk9wjppvba"; + iosevka-ss06 = "1a3ar8xhn9rf5isxvwqvifczl20ddgs4dw9ypjflmdbyhr3n0yw5"; + iosevka-ss07 = "01x33sx5d54mdph7csnk6mhkhyc879rwp9spxwyrajghzd0ql8w6"; + iosevka-ss08 = "0a1kmyr5q2w7qky0ya0gaqmg0lhdafyag8c8idacl7gnra944hi0"; + iosevka-ss09 = "0m7cm8c3795a8kfy19d9wjmii6ycimcclg5pn9g91kg49q8y9gi2"; + iosevka-ss10 = "1gfdjz6yifbyb9gl19q3q69as3fnmih17ghhrzzhc7qll68r6k6z"; + iosevka-ss11 = "119ivw6kcqvzbj46xv8avpg56w3nqdkhhl176gj3bpk1jbjip1wh"; + iosevka-ss12 = "1vx8rc328whsjjj87fa29kpp9ibk6x52r1brjp37cywjd5ix6l78"; + iosevka-ss13 = "1gmmm2jlvrl6pzcsc2bhy3qvmzmsns8hlc52ddrwdbw0wi28zhs3"; + iosevka-ss14 = "0mwg2bvkpxzpsdhky9k6fn81061pk0f23whj1hj4mn191xpw41fy"; +} diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix index b198486327d7..fc4d76f6ad6b 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,20 +1,18 @@ { lib, fetchzip }: let - version = "2.002"; + version = "2.210"; in fetchzip { name = "JetBrainsMono-${version}"; url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; - sha256 = "018lhxi9m8aprls6cnpndzdg5snijwzm22m2pxxi6zcqxrcxh8vb"; + sha256 = "05csy42qji8xbaq5iap2nmki0d0cbiwiq9kbzjd1cah9qn6gfill"; postFetch = '' mkdir -p $out/share/fonts unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.eot -d $out/share/fonts/eot - unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/joypixels/default.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/joypixels/default.nix index 1b107f9cb82f..c19a55400fcb 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/joypixels/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/joypixels/default.nix @@ -1,24 +1,103 @@ -{ stdenv, fetchurl }: +{ stdenv +, fetchurl +, config +, acceptLicense ? config.joypixels.acceptLicense or false +}: + +let + inherit (stdenv.hostPlatform.parsed) kernel; + + systemSpecific = { + darwin = rec { + systemTag = "nix-darwin"; + capitalized = systemTag; + fontFile = "JoyPixels-SBIX.ttf"; + }; + }.${kernel.name} or rec { + systemTag = "nixos"; + capitalized = "NixOS"; + fontFile = "joypixels-android.ttf"; + }; + + joypixels-free-license = with systemSpecific; { + spdxId = "LicenseRef-JoyPixels-Free-6.0"; + fullName = "JoyPixels Free License Agreement 6.0"; + url = "https://cdn.joypixels.com/distributions/${systemTag}/license/free-license.pdf"; + free = false; + }; + + joypixels-license-appendix = with systemSpecific; { + spdxId = "LicenseRef-JoyPixels-NixOS-Appendix"; + fullName = "JoyPixels ${capitalized} License Appendix"; + url = "https://cdn.joypixels.com/distributions/${systemTag}/appendix/joypixels-license-appendix.pdf"; + free = false; + }; + + throwLicense = throw '' + Use of the JoyPixels font requires acceptance of the license. + - ${joypixels-free-license.fullName} [1] + - ${joypixels-license-appendix.fullName} [2] + + You can express acceptance by setting acceptLicense to true in your + configuration. Note that this is not a free license so it requires allowing + unfree licenses. + + configuration.nix: + nixpkgs.config.allowUnfree = true; + nixpkgs.config.joypixels.acceptLicense = true; + + config.nix: + allowUnfree = true; + joypixels.acceptLicense = true; + + [1]: ${joypixels-free-license.url} + [2]: ${joypixels-license-appendix.url} + ''; + +in stdenv.mkDerivation rec { pname = "joypixels"; version = "6.0.0"; - src = fetchurl { - url = "https://cdn.joypixels.com/arch-linux/font/${version}/joypixels-android.ttf"; - sha256 = "1vxqsqs93g4jyp01r47lrpcm0fmib2n1vysx32ksmfxmprimb75s"; - }; + src = assert !acceptLicense -> throwLicense; + with systemSpecific; fetchurl { + name = fontFile; + url = "https://cdn.joypixels.com/distributions/${systemTag}/font/${version}/${fontFile}"; + sha256 = { + darwin = "1s1dibgpv4lc9cwbgykgwjxxhg2rbn5g9fyd10r6apj9xhfn8cyn"; + }.${kernel.name} or "1vxqsqs93g4jyp01r47lrpcm0fmib2n1vysx32ksmfxmprimb75s"; + }; dontUnpack = true; - installPhase = '' - install -Dm644 $src $out/share/fonts/truetype/joypixels.ttf + installPhase = with systemSpecific; '' + runHook preInstall + + install -Dm644 $src $out/share/fonts/truetype/${fontFile} + + runHook postInstall ''; meta = with stdenv.lib; { - description = "Emoji as a Service (formerly EmojiOne)"; - homepage = "https://www.joypixels.com/"; - license = licenses.unfree; - maintainers = with maintainers; [ jtojnar ]; + description = "The finest emoji you can use legally (formerly EmojiOne)"; + longDescription = '' + New for 2020! JoyPixels 6.0 includes 3,342 originally crafted icon + designs and is 100% Unicode 13 compatible. We offer the largest selection + of files ranging from png, svg, iconjar, sprites, and fonts. + ''; + homepage = "https://www.joypixels.com/fonts"; + license = + let + free-license = joypixels-free-license; + appendix = joypixels-license-appendix; + in with systemSpecific; { + spdxId = "LicenseRef-JoyPixels-Free-6.0-with-${capitalized}-Appendix"; + fullName = "${free-license.fullName} with ${appendix.fullName}"; + url = free-license.url; + appendixUrl = appendix.url; + free = false; + }; + maintainers = with maintainers; [ toonn jtojnar ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/julia-mono/default.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/julia-mono/default.nix index c6bcdfd3b2ae..8774913c83cc 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/julia-mono/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/julia-mono/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "0.018"; + version = "0.022"; in fetchzip { name = "JuliaMono-${version}"; url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono.zip"; - sha256 = "0ss79a9gymbhih5pgjkg1mipmk0qsvqqwlkqcdm9fz87d7kfhby3"; + sha256 = "sha256-/MVT6n842sSiuPZNYxN3q1vn6yvMvmcTEDyvAd2GikA="; postFetch = '' - mkdir -p $out/share/fonts + mkdir -p $out/share/fonts/truetype unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/merriweather/default.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/merriweather/default.nix index 1768c44bc03c..d1b3359df26e 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/merriweather/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/merriweather/default.nix @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { homepage = "https://github.com/SorkinType/Merriweather"; - description = "Merriweather was designed to be a text face that is pleasant to read on screens"; + description = "A text face designed to be pleasant to read on screens"; license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ emily ]; diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/open-sans/default.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/open-sans/default.nix index e92f75802521..ecca50537f1d 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/open-sans/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/open-sans/default.nix @@ -9,7 +9,7 @@ in fetchFromGitLab { domain = "salsa.debian.org"; owner = "fonts-team"; repo = "fonts-open-sans"; - rev = "debian%2F1.11-1"; # URL-encoded form of "debian/1.11-1" tag + rev = "debian/1.11-1"; postFetch = '' tar xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/truetype diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/scheherazade/default.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/scheherazade/default.nix index e7651f22d6a0..8639d29066c3 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/scheherazade/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/scheherazade/default.nix @@ -1,11 +1,16 @@ -{ lib, fetchzip }: +{ lib, fetchzip, version ? "3.000" }: let - version = "2.100"; + new = lib.versionAtLeast version "3.000"; + sha256 = { + "2.100" = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z"; + "3.000" = "12sd2mjqb80ijc73y7p0iw6j3wy9i60a3aar3ywrxz4khpya48jw"; + }."${version}"; + in fetchzip rec { - name = "scheherazade-${version}"; + name = "scheherazade${lib.optionalString new "-new"}-${version}"; - url = "http://software.sil.org/downloads/r/scheherazade/Scheherazade-${version}.zip"; + url = "http://software.sil.org/downloads/r/scheherazade/Scheherazade${lib.optionalString new "New"}-${version}.zip"; postFetch = '' mkdir -p $out/share/{doc,fonts} @@ -15,16 +20,17 @@ in fetchzip rec { unzip -j $downloadedFile \*/documentation/\* -d $out/share/doc/${name}/documentation ''; - sha256 = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z"; + inherit sha256; meta = with lib; { homepage = "https://software.sil.org/scheherazade/"; description = "A font designed in a similar style to traditional Naskh typefaces"; longDescription = '' - Scheherazade, named after the heroine of the classic Arabian Nights tale, - is designed in a similar style to traditional typefaces such as Monotype - Naskh, extended to cover the Unicode Arabic repertoire through Unicode - 8.0. + + Scheherazade${lib.optionalString new " New"}, named after the heroine of + the classic Arabian Nights tale, is designed in a similar style to + traditional typefaces such as Monotype Naskh, extended to cover the + Unicode Arabic repertoire through Unicode ${if new then "13.0" else "8.0"}. Scheherazade provides a “simplified” rendering of Arabic script, using basic connecting glyphs but not including a wide variety of additional diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/sudo/default.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/sudo/default.nix index fab252af458b..f21fdb184161 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/sudo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/sudo/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip }: let - version = "0.51"; + version = "0.52"; in fetchzip { name = "sudo-font-${version}"; url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - sha256 = "19m132183w5hrc5qvlb6cj38hir2302cqiljlfc72qdlb8al6fwi"; + sha256 = "1j5p7apclyy5gfj2kklmgcncdsp5iik4gd6mdl29anzijknd0kja"; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix new file mode 100644 index 000000000000..1115b48b7095 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchzip }: +let + version = "2020-11-14"; +in +fetchzip { + name = "ttf-tw-moe"; + + url = "https://github.com/Jiehong/TW-fonts/archive/${version}.zip"; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile TW-fonts-${version}/\*.ttf -d $out/share/fonts/truetype + ''; + + sha256 = "1jd3gjjfa4vadp6d499n0irz5b22z611kd7q5qgqf6s2fwbxfhiz"; + + meta = with stdenv.lib; { + homepage = "http://www.moe.gov.tw/"; + description = "Set of KAI and SONG fonts from the Ministry of Education of Taiwan"; + version = version; + longDescription = '' + Installs 2 TTF fonts: MOESongUN and TW-MOE-Std-Kai. + Both are provided by the Ministry of Education of Taiwan; each character's shape + closely follows the official recommendation, and can be used as for teaching purposes. + ''; + license = licenses.cc-by-nd-30; + maintainers = [ maintainers.jiehong ]; + platforms = platforms.all; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/unifont/default.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/unifont/default.nix index 685b5c452f2d..ce2a92ce48ae 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/unifont/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/unifont/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "unifont"; - version = "13.0.01"; + version = "13.0.04"; ttf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; - sha256 = "0y5bd7i5hp9ks6d3qq0bshywba7g90i3074wckpn9m8shh98ngcg"; + sha256 = "sha256-p0wSTyXCXuWIw+hDZ4HZPxgdBJ6oOOqOuX6FzZJmwrE="; }; pcf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; - sha256 = "05zgz00n514cijqh9qcvr4iz0bla4hd028cvi1jlh0ic6fkafix8"; + sha256 = "sha256-sKY2qshNV3zXfD2BSbfs0qom1gPt7vD5QmVEkACmx18="; }; nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix index 153c6272ca20..2daf66e75109 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "12.1.03"; + version = "13.0.04"; in fetchzip rec { name = "unifont_upper-${version}"; @@ -9,7 +9,7 @@ in fetchzip rec { postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; - sha256 = "1w0bg276cyv6xs6clld8gv4w88rj9fw9rc8zs9ahc6y9hv677knj"; + sha256 = "0bji0crx84nbjf1m1lzql7icrb02zbs3l66dn21pvr9czsry870f"; meta = with lib; { description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix index df7a6e5383bf..3a5ee616a0ef 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchzip, cabextract}: +{ stdenv, fetchzip, cabextract }: fetchzip { name = "vista-fonts-1"; @@ -21,7 +21,7 @@ fetchzip { done ''; - sha256 = "1l27zg5jraa16zm11d3qz1w7m6f1ih3xy5avww454ylm50fw6z11"; + sha256 = "sha256-x7JSXS9Q1fzlJTVR+MAS3f2+cmo/H0s1qkY9FPjx2zI="; meta = { description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)"; |