public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-01-02 21:41:13 +01:00
parent bdfb1bd01b 129c73802f
commit f08e3e38d4
118 changed files with 2412 additions and 2737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/data/fonts/material-design-icons/default.nix
View File

@@ -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";

4
pkgs/data/fonts/victor-mono/default.nix
View File

@@ -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";