Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2020-11-11 16:00:34 +01:00
155 changed files with 1569 additions and 801 deletions

View File

@@ -1,14 +1,14 @@
{ lib, fetchzip }:
let
version = "2.200";
version = "2.210";
in
fetchzip {
name = "JetBrainsMono-${version}";
url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip";
sha256 = "16v914ph9sgdz3w56yz9f26zpj2lpxjb6ppnphxlmbllh68z1fh4";
sha256 = "05csy42qji8xbaq5iap2nmki0d0cbiwiq9kbzjd1cah9qn6gfill";
postFetch = ''
mkdir -p $out/share/fonts

View File

@@ -1,4 +1,4 @@
{stdenv, fetchzip, cabextract}:
{ stdenv, fetchzip, cabextract }:
fetchzip {
name = "vista-fonts-1";
@@ -21,7 +21,7 @@ fetchzip {
done
'';
sha256 = "1l27zg5jraa16zm11d3qz1w7m6f1ih3xy5avww454ylm50fw6z11";
sha256 = "sha256-x7JSXS9Q1fzlJTVR+MAS3f2+cmo/H0s1qkY9FPjx2zI=";
meta = {
description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)";