From 0e931bc5e79c27a427b76595e0c5fe3b72aecccf Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 18 Feb 2021 08:56:17 +0000 Subject: [PATCH] montserrat: 1.0 -> 7.210 --- pkgs/data/fonts/montserrat/default.nix | 37 +++++++++++++------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/pkgs/data/fonts/montserrat/default.nix b/pkgs/data/fonts/montserrat/default.nix index de8ea80b017..41135122f05 100644 --- a/pkgs/data/fonts/montserrat/default.nix +++ b/pkgs/data/fonts/montserrat/default.nix @@ -1,29 +1,28 @@ -# Originally packaged for ArchLinux. -# -# https://aur.archlinux.org/packages/ttf-montserrat/ - -{ lib, fetchzip }: +{ lib, fetchFromGitHub }: let - version = "1.0"; -in fetchzip { - name = "montserrat-${version}"; - - url = "https://marvid.fr/~eeva/mirror/Montserrat.tar.gz"; + pname = "montserrat"; + version = "7.210"; +in fetchFromGitHub { + name = "${pname}-${version}"; + owner = "JulietaUla"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-C6T0Iz1rFC+EsKFJRil2jGTMQ4X7wR80E3eORL5qi0U="; postFetch = '' - tar -xzf $downloadedFile --strip-components=1 - mkdir -p $out/share/fonts/montserrat - cp *.ttf $out/share/fonts/montserrat + tar xf $downloadedFile --strip 1 + install -Dm 444 fonts/otf/*.otf -t $out/share/fonts/otf + install -Dm 444 fonts/ttf/*.ttf -t $out/share/fonts/ttf + install -Dm 444 fonts/webfonts/*.woff -t $out/share/fonts/woff + install -Dm 444 fonts/webfonts/*.woff2 -t $out/share/fonts/woff2 ''; - sha256 = "11sdgvhaqg59mq71aqwqp2mb428984hjxy7hd1vasia9kgk8259w"; - meta = with lib; { description = "A geometric sans serif font with extended latin support (Regular, Alternates, Subrayada)"; - homepage = "https://www.fontspace.com/julieta-ulanovsky/montserrat"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ scolobb ]; + homepage = "https://www.fontspace.com/julieta-ulanovsky/montserrat"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ scolobb jk ]; }; }