diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-02 21:41:13 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-02 21:41:13 +0100 |
| commit | f08e3e38d4bf983480fcde77911136bab70d8e80 (patch) | |
| tree | 6286ff43b53a5df79fcfcf31d22443a18f0455ee /pkgs/data | |
| parent | bdfb1bd01b2da393a3cdf567764a79e418f2b62e (diff) | |
| parent | 129c73802fdddacb20cf194bd2968d73ebced590 (diff) | |
| download | nixpkgs-f08e3e38d4bf983480fcde77911136bab70d8e80.tar nixpkgs-f08e3e38d4bf983480fcde77911136bab70d8e80.tar.gz nixpkgs-f08e3e38d4bf983480fcde77911136bab70d8e80.tar.bz2 nixpkgs-f08e3e38d4bf983480fcde77911136bab70d8e80.tar.lz nixpkgs-f08e3e38d4bf983480fcde77911136bab70d8e80.tar.xz nixpkgs-f08e3e38d4bf983480fcde77911136bab70d8e80.tar.zst nixpkgs-f08e3e38d4bf983480fcde77911136bab70d8e80.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/material-design-icons/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/data/fonts/victor-mono/default.nix | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix index 1c36d0f57fe..201b0dfe417 100644 --- a/pkgs/data/fonts/material-design-icons/default.nix +++ b/pkgs/data/fonts/material-design-icons/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "3.3.92"; + version = "4.7.95"; in fetchFromGitHub { name = "material-design-icons-${version}"; owner = "Templarian"; @@ -10,14 +10,13 @@ in fetchFromGitHub { postFetch = '' tar xf $downloadedFile --strip=1 - mkdir -p $out/share/fonts/{eot,svg,truetype,woff,woff2} + mkdir -p $out/share/fonts/{eot,truetype,woff,woff2} cp fonts/*.eot $out/share/fonts/eot/ - cp fonts/*.svg $out/share/fonts/svg/ cp fonts/*.ttf $out/share/fonts/truetype/ cp fonts/*.woff $out/share/fonts/woff/ cp fonts/*.woff2 $out/share/fonts/woff2/ ''; - sha256 = "0dbm4qfd0b91yrw3cv4i377pnm98fgj936nk1m5wlx8mx8jahz48"; + sha256 = "0da92kz8ryy60kb5xm52md13w28ih4sfap8g3v9b4ziyww66zjhz"; meta = with lib; { description = "3200+ Material Design Icons from the Community"; diff --git a/pkgs/data/fonts/victor-mono/default.nix b/pkgs/data/fonts/victor-mono/default.nix index 74f851d77b5..ea562f7fa6e 100644 --- a/pkgs/data/fonts/victor-mono/default.nix +++ b/pkgs/data/fonts/victor-mono/default.nix @@ -2,7 +2,7 @@ let pname = "victor-mono"; - version = "1.2.7"; + version = "1.3.0"; in fetchFromGitHub rec { name = "${pname}-${version}"; @@ -26,7 +26,7 @@ in fetchFromGitHub rec { unzip -j VictorMonoAll.zip \*.otf -d $out/share/fonts/opentype/${pname} ''; - sha256 = "0x4ydp11ry94wkkspnmy1xpzqq3m45xg60z1hq4ll9gmlccaknj0"; + sha256 = "1lv2x7kfspabnhvm8z79n165fw3awvzj1r8f0g5zn26wgdalgw69"; meta = with lib; { description = "Free programming font with cursive italics and ligatures"; |