diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/data/fonts/raleway/default.nix index 935fde722ed..c1d766f7d36 100644 --- a/pkgs/data/fonts/raleway/default.nix +++ b/pkgs/data/fonts/raleway/default.nix @@ -1,44 +1,40 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: +{ lib, fetchzip, stdenvNoCC }: -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation (self: { pname = "raleway"; - version = "2016-08-30"; + version = "4.101"; - src = fetchFromGitHub { - owner = "impallari"; - repo = "Raleway"; - rev = "fa27f47b087fc093c6ae11cfdeb3999ac602929a"; - hash = "sha256-mcIpE+iqG6M43I5TT95oV+5kNgphunmyxC+Jaj0JysQ="; + src = fetchzip { + url = "https://github.com/theleagueof/raleway/releases/download/${self.version}/Raleway-${self.version}.tar.xz"; + hash = "sha256-itNHIMoRjiaqYAJoDNetkCquv47VAfel8MAzwsd//Ww="; }; installPhase = '' runHook preInstall - find . -name "*-Original.otf" -exec install -Dt $out/share/fonts/opentype {} \; + install -D -m444 -t $out/share/fonts/truetype $src/static/TTF/*.ttf + install -D -m444 -t $out/share/fonts/opentype $src/static/OTF/*.otf runHook postInstall ''; meta = { description = "Raleway is an elegant sans-serif typeface family"; - longDescription = '' Initially designed by Matt McInerney as a single thin weight, it was expanded into a 9 weight family by Pablo Impallari and Rodrigo Fuenzalida - in 2012 and iKerned by Igino Marini. In 2013 the Italics where added. + in 2012 and iKerned by Igino Marini. In 2013 the Italics where added, and + most recently — a variable version. - It is a display face and the download features both old style and lining - numerals, standard and discretionary ligatures, a pretty complete set of - diacritics, as well as a stylistic alternate inspired by more geometric - sans-serif typefaces than its neo-grotesque inspired default character - set. + It features both old style and lining numerals, standard and + discretionary ligatures, a pretty complete set of diacritics, as well as + a stylistic alternate inspired by more geometric sans-serif typefaces + than its neo-grotesque inspired default character set. It also has a sister display family, Raleway Dots. ''; - - homepage = "https://github.com/impallari/Raleway"; + homepage = "https://www.theleagueofmoveabletype.com/raleway"; license = lib.licenses.ofl; - - maintainers = with lib.maintainers; [ Profpatsch ]; + maintainers = with lib.maintainers; [ minijackson Profpatsch ]; }; -} +})