diff options
Diffstat (limited to 'pkgs/data/fonts')
-rw-r--r-- | pkgs/data/fonts/inconsolata-nerdfont/default.nix | 28 | ||||
-rw-r--r-- | pkgs/data/fonts/jetbrains-mono/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/roboto-mono/default.nix | 38 | ||||
-rw-r--r-- | pkgs/data/fonts/roboto-slab/default.nix | 55 | ||||
-rw-r--r-- | pkgs/data/fonts/terminus-nerdfont/default.nix | 28 |
5 files changed, 93 insertions, 60 deletions
diff --git a/pkgs/data/fonts/inconsolata-nerdfont/default.nix b/pkgs/data/fonts/inconsolata-nerdfont/default.nix new file mode 100644 index 000000000000..b4356e73d5c7 --- /dev/null +++ b/pkgs/data/fonts/inconsolata-nerdfont/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchzip }: + +let + version = "2.0.0"; +in fetchzip { + name = "inconsolata-nerdfont-${version}"; + + url = "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/Inconsolata.zip"; + + postFetch = '' + mkdir -p $out/share/fonts/inconsolata-nerdfont + unzip -j $downloadedFile -d $out/share/fonts/inconsolata-nerdfont + ''; + + sha256 = "06i1akjblqd038cn5lvz67lwp6afpv31vqcfdihp66qisgbgm4w9"; + + meta = with lib; { + description = '' + Nerd Fonts is a project that attempts to patch as many developer targeted + and/or used fonts as possible. The patch is to specifically add a high + number of additional glyphs from popular 'iconic fonts' such as Font + Awesome, Devicons, Octicons, and others. + ''; + homepage = https://github.com/ryanoasis/nerd-fonts; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/data/fonts/jetbrains-mono/default.nix index 8a7e841df672..4297d15da948 100644 --- a/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "1.0.4"; + version = "1.0.5"; in fetchzip rec { name = "JetBrainsMono-${version}"; url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; - sha256 = "1m6wppz6mrh7475d92yvwrjgbwkkcfq444v0im90f5c7fsf3dzbd"; + sha256 = "1iqqix7rr22ij0cn7vg812qs4gbjpphndgbzm57abqk658lra4kl"; postFetch = '' mkdir -p $out/share/fonts diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/data/fonts/roboto-mono/default.nix index cfd4e3808aa3..9bb655268014 100644 --- a/pkgs/data/fonts/roboto-mono/default.nix +++ b/pkgs/data/fonts/roboto-mono/default.nix @@ -1,53 +1,53 @@ { stdenv, fetchurl }: let - # last commit on the directory containing the fonts in the upstream repository - commit = "883939708704a19a295e0652036369d22469e8dc"; + # Latest commit touching the robotomono tree + commit = "5338537ef835a3d9ccf8faf386399f13a30605e2"; in stdenv.mkDerivation { pname = "roboto-mono"; - version = "2016-01-11"; + version = "2.002-20190125"; srcs = [ (fetchurl { url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Regular.ttf"; - sha256 = "0r6g1xydy824xbbjilq6pvrv8611ga3q1702v5jj1ly5np6gpddz"; + sha256 = "1f96r4by67hzqpr4p2wkrfnpj9b7x9qrmwns0312w2l2rnp2qajx"; }) (fetchurl { url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Bold.ttf"; - sha256 = "0x9qnrbd7hin873wjzrl6798bvakixd86qdw0z5b4sm56f7fjl32"; + sha256 = "10wg4dchdq4s89r9pd4h8y5l1bf8mix32pksph2wafyr3815kfnm"; }) (fetchurl { url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Italic.ttf"; - sha256 = "17aia6hgpjvvrl79y0f67ncr5y1nhyxj0dzqwdg3dycsa4kij59q"; + sha256 = "1cayhm3wj36q748xd0zdgrhm4pz7wnrskrlf7khxx2s41m3win5b"; }) (fetchurl { url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-BoldItalic.ttf"; - sha256 = "05gqfnps6qzxgyxrrmkmw0by3j88lf88v67n8jgi2chhhm0sw40q"; + sha256 = "04238dxizdlhnnnyzhnqckxf8ciwlnwyzxby6qgpyg232abx0n2z"; }) (fetchurl { url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Medium.ttf"; - sha256 = "0ww96qd0cyj3waxf7a98hyd4cp8snajjvjmbhr66zilql8ylfzk0"; + sha256 = "00rh49d0dbycbkjgd2883w7iqzd6hcry08ycjipsvk091p5nq6qy"; }) (fetchurl { url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-MediumItalic.ttf"; - sha256 = "1n2cvvcpwm68lazfh3s3xhj4mrc01x84mi2ackwf8ahd95fk9p5y"; + sha256 = "0fxl6lblj7anhqmhplnpvjwckjh4g8m6r9jykxdrvpl5hk8mr65b"; }) (fetchurl { url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Light.ttf"; - sha256 = "0na2sxz3n1km1ryz002spfa65d91fm48x0qcda2ac0rly7dgaqjf"; + sha256 = "1h8rbc2p70fabkplsafzah1wcwy92qc1wzkmc1cnb4yq28gxah4a"; }) (fetchurl { url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-LightItalic.ttf"; - sha256 = "171fr8wsbmvfllsbmb9pcdax2qfzhbqzyxfn5bcrz9kx5k9x6198"; + sha256 = "08y2qngwy61mc22f8i00gshgmcf7hwmfxh1f4j824svy4n16zhsc"; }) (fetchurl { url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Thin.ttf"; - sha256 = "0pv54afyprajb16ksm5vklc1q76iv72v427wgamqzrzyvxgn6ymj"; + sha256 = "0fmij9zlfjiyf0vb8n8gvrwi35l830zpmkbhcy1xgx0m8za6mmmy"; }) (fetchurl { url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-ThinItalic.ttf"; - sha256 = "1ziyysl09z24l735y940g92rqhn9v4npwqzajj9m1kn0xz21r1aw"; + sha256 = "0mpwdhjnsk8311nw8fqzy1b7v0wzb4pw639ply1j38a0vibrsmn7"; }) ]; @@ -65,10 +65,10 @@ stdenv.mkDerivation { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1rd3qql779dn9nl940hf988lvv4gfy5llgrlfqq0db0c22b2yfng"; + outputHash = "0fkx2z97k29n1392bf76iwdyz44yp86hmqah7ai6bikzlia38qa0"; - meta = { - homepage = https://www.google.com/fonts/specimen/Roboto+Mono; + meta = with stdenv.lib; { + homepage = "https://www.google.com/fonts/specimen/Roboto+Mono"; description = "Google Roboto Mono fonts"; longDescription = '' Roboto Mono is a monospaced addition to the Roboto type family. Like @@ -81,8 +81,8 @@ stdenv.mkDerivation { wider glyphs are adjusted for weight. Curved caps like 'C' and 'O' take on the straighter sides from Roboto Condensed. ''; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.romildo ]; - platforms = stdenv.lib.platforms.all; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/data/fonts/roboto-slab/default.nix index f9f6ec342e91..1fec03b46fe4 100644 --- a/pkgs/data/fonts/roboto-slab/default.nix +++ b/pkgs/data/fonts/roboto-slab/default.nix @@ -1,51 +1,28 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: -let - # last commit on the directory containing the fonts in the upstream repository - commit = "883939708704a19a295e0652036369d22469e8dc"; -in stdenv.mkDerivation { pname = "roboto-slab"; - version = "2016-01-11"; + version = "2.000"; - srcs = [ - (fetchurl { - url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotoslab/RobotoSlab-Regular.ttf"; - sha256 = "04180b5zk2nzll1rrgx8f1i1za66pk6pbrp0iww2xypjqra5zahk"; - }) - (fetchurl { - url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotoslab/RobotoSlab-Bold.ttf"; - sha256 = "0ayl2hf5j33vixxfa7051hzjjxnx8zhag3rr0mmmnxpsn7md44ms"; - }) - (fetchurl { - url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotoslab/RobotoSlab-Light.ttf"; - sha256 = "09riqgj9ixqjdb3mkzbs799cgmnp3ja3d6izlqkhpkfm52sgafqm"; - }) - (fetchurl { - url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotoslab/RobotoSlab-Thin.ttf"; - sha256 = "1hd0m7lxhr261a4s2nb572ari6v53w2yd8yjr9i534iqfl4jcbsf"; - }) - ]; - - sourceRoot = "./"; - - unpackCmd = '' - ttfName=$(basename $(stripHash $curSrc)) - cp $curSrc ./$ttfName - ''; + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "robotoslab"; + rev = "baeeba45e0c3ccdcfb6a70dc564785941aafef5d"; + sha256 = "1v6z0a2xgwgf9dyj62sriy8ckwpbwlxkki6gfax1f4h4livvzpdn"; + }; installPhase = '' mkdir -p $out/share/fonts/truetype - cp -a *.ttf $out/share/fonts/truetype/ + cp -a fonts/static/*.ttf $out/share/fonts/truetype/ ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0imhvisjzi0rvn32hn04kngca4szx0j39h4c4zs7ryb4wdca76q9"; + outputHash = "0g663npi5lkvwcqafd4cjrm90ph0nv1lig7d19xzfymnj47qpj8x"; - meta = { - homepage = https://www.google.com/fonts/specimen/Roboto+Slab; - description = "Google Roboto Slab fonts"; + meta = with stdenv.lib; { + homepage = "https://www.google.com/fonts/specimen/Roboto+Slab"; + description = "Roboto Slab Typeface by Google"; longDescription = '' Roboto has a dual nature. It has a mechanical skeleton and the forms are largely geometric. At the same time, the font features friendly @@ -57,8 +34,8 @@ stdenv.mkDerivation { This is the Roboto Slab family, which can be used alongside the normal Roboto family and the Roboto Condensed family. ''; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.romildo ]; - platforms = stdenv.lib.platforms.all; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/data/fonts/terminus-nerdfont/default.nix b/pkgs/data/fonts/terminus-nerdfont/default.nix new file mode 100644 index 000000000000..3c1730146b3d --- /dev/null +++ b/pkgs/data/fonts/terminus-nerdfont/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchzip }: + +let + version = "2.0.0"; +in fetchzip { + name = "terminus-nerdfont-${version}"; + + url = "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/Terminus.zip"; + + postFetch = '' + mkdir -p $out/share/fonts/terminus-nerdfont + unzip -j $downloadedFile -d $out/share/fonts/terminus-nerdfont + ''; + + sha256 = "036i1qwwrb0r8hvcjf3h34w0g7mbsmngvrjic98jgikbz3i2f46c"; + + meta = with lib; { + description = '' + Nerd Fonts is a project that attempts to patch as many developer targeted + and/or used fonts as possible. The patch is to specifically add a high + number of additional glyphs from popular 'iconic fonts' such as Font + Awesome, Devicons, Octicons, and others. + ''; + homepage = https://github.com/ryanoasis/nerd-fonts; + license = licenses.mit; + platforms = platforms.all; + }; +} |