Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2020-04-21 08:29:51 +02:00
213 changed files with 3824 additions and 2109 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub }:
let
version = "4.106";
version = "4.202";
in fetchFromGitHub {
name = "fira-${version}";
@@ -15,7 +15,7 @@ in fetchFromGitHub {
cp otf/*.otf $out/share/fonts/opentype
'';
sha256 = "0c97nmihcq0ki7ywj8zn048a2bgrszc61lb9p0djfi65ar52jab4";
sha256 = "1iwxbp7kw5kghh5nbycb05zby7p2ib61mywva3h6giv2wd4lpxnz";
meta = with lib; {
homepage = "https://mozilla.github.io/Fira/";
+1
View File
@@ -48,5 +48,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = with maintainers; [ simonvandel romildo ];
platforms = platforms.linux;
broken = true; # since libsass 3.6.3
};
}
+1
View File
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
license = with licenses; [ cc-by-sa-40 gpl3 ];
platforms = platforms.linux;
maintainers = [ maintainers.jD91mZM2 ];
broken = true; # since libsass 3.6.3
};
}