Merge master into staging-next

2021-04-08 00:17:24 +00:00
parent 6e4d572602 d70959a2e2
commit 8d1d992273
62 changed files with 1712 additions and 1320 deletions
--- a/pkgs/data/fonts/paratype-pt/mono.nix
+++ b/pkgs/data/fonts/paratype-pt/mono.nix
@@ -3,7 +3,7 @@
 fetchzip {
  name = "paratype-pt-mono";

-  url = [
+  urls = [
    "https://company.paratype.com/system/attachments/631/original/ptmono.zip"
    "http://rus.paratype.ru/system/attachments/631/original/ptmono.zip"
  ];
--- a/pkgs/data/fonts/paratype-pt/sans.nix
+++ b/pkgs/data/fonts/paratype-pt/sans.nix
@@ -3,7 +3,7 @@
 fetchzip {
  name = "paratype-pt-sans";

-  url = [
+  urls = [
    "https://company.paratype.com/system/attachments/629/original/ptsans.zip"
    "http://rus.paratype.ru/system/attachments/629/original/ptsans.zip"
  ];
--- a/pkgs/data/fonts/paratype-pt/serif.nix
+++ b/pkgs/data/fonts/paratype-pt/serif.nix
@@ -3,7 +3,7 @@
 fetchzip {
  name = "paratype-pt-serif";

-  url = [
+  urls = [
    "https://company.paratype.com/system/attachments/634/original/ptserif.zip"
    "http://rus.paratype.ru/system/attachments/634/original/ptserif.zip"
  ];