Merge branch master into staging to fix eval error

This fixes the eval error of the small (and "big"?) NixOS test set that was fixed in 1088f05 & eba8f542.
2020-10-28 03:03:27 +01:00
parent 5d03fe6ac4 c127653b72
commit db0fe5c3eb
459 changed files with 6060 additions and 2715 deletions
@@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation rec {

  meta = with lib; {
    homepage = "https://github.com/SorkinType/Merriweather";
-    description = "Merriweather was designed to be a text face that is pleasant to read on screens";
+    description = "A text face designed to be pleasant to read on screens";
    license = licenses.ofl;
    platforms = platforms.all;
    maintainers = with maintainers; [ emily ];
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "matcha-gtk-theme";
-  version = "2020-10-05";
+  version = "2020-10-23";

  src = fetchFromGitHub {
    owner = "vinceliuice";
    repo = pname;
    rev = version;
-    sha256 = "0pkgpipffwxphn16p6r911mbhqhjyk60svirxzm2phlhxl0ddwpj";
+    sha256 = "125wcvr457lbs8zxp8r18q7gzagp0wbg518iynzmbax8gsjds8w3";
  };

  buildInputs = [ gdk-pixbuf librsvg ];