From 44174de622d458623d5042c756c8d7cb351d9a78 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 28 Feb 2022 10:09:21 -0600 Subject: [PATCH] agave: 35 -> 37 (#157536) bold variant (basics covered) slashed variant available but uses same name --- pkgs/data/fonts/agave/default.nix | 33 ++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/data/fonts/agave/default.nix index 39ef6e34aaa..d2ecda3a111 100644 --- a/pkgs/data/fonts/agave/default.nix +++ b/pkgs/data/fonts/agave/default.nix @@ -1,20 +1,31 @@ -{ lib, fetchurl }: +{ lib, fetchurl, stdenv }: let pname = "agave"; - version = "35"; -in fetchurl { - name = "${pname}-${version}"; - url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf"; + version = "37"; - downloadToTemp = true; - recursiveHash = true; - postFetch = '' - install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf + mkAg = name: hash: fetchurl { + url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-${name}.ttf"; + sha256 = hash; + name = "Agave-${name}.ttf"; + }; + # There are slashed variants, but with same name so only bundle the default versions for now: + fonts = [ + (mkAg "Regular" "sha256-vX1VhEgqy9rQ7hPmAgBGxKyIs2QSAYqZC/mL/2BIOrA=") + (mkAg "Bold" "sha256-Ax/l/RKyc03law0ThiLac/7HHV4+YxibKzcZnjZs6VI=") + ]; + +in stdenv.mkDerivation { + inherit pname version; + srcs = fonts; + sourceRoot = "."; + + dontUnpack = true; + + installPhase = '' + install -D $srcs -t $out/share/fonts/truetype/ ''; - sha256 = "10shwsl1illdafnc352j439lklrxksip1vlh4jc934cr9qf4c1fz"; - meta = with lib; { description = "truetype monospaced typeface designed for X environments"; homepage = "https://b.agaric.net/page/agave";