diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-21 08:29:51 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-21 08:29:51 +0200 |
commit | 803b3d296c7fbc4daf5ae4d712204f8b28c0834a (patch) | |
tree | afb2a1e3e1489050764a358d850e4804e516587c /pkgs/data | |
parent | d2d7fbc431a06ec58f537921dc1b898167a69adc (diff) | |
parent | b71232fc53af1d7c7fcbb05d3e42ff5f562912ca (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/fira/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/themes/arc/default.nix | 1 | ||||
-rw-r--r-- | pkgs/data/themes/yaru/default.nix | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix index 23baee7cb9d9e..039c5099b56ea 100644 --- a/pkgs/data/fonts/fira/default.nix +++ b/pkgs/data/fonts/fira/default.nix @@ -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/"; diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index c08d4c5778611..53e81b323dc13 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -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 }; } diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 9e56326b2eb6a..6033d64d79bc6 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -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 }; } |