Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1523028

pkgs/data/fonts/agave/default.nix

@@ -2,7 +2,7 @@
 
 let
   pname = "agave";
-  version = "009";
+  version = "10";
 in fetchurl {
   name = "${pname}-${version}";
   url = "https://github.com/agarick/agave/releases/download/v${version}/agave-r.ttf";
@@ -13,7 +13,7 @@ in fetchurl {
     install -D $downloadedFile $out/share/fonts/truetype/agave-r.ttf
   '';
 
-  sha256 = "16qvz3zpwiq2nw0gxygva5pssswcia5xp0q6ir5jfkackvqf3fql";
+  sha256 = "1mfj6a9sp00mjz7420yyrbbs5bqks3fz2slwgcppklxnz0890r9f";
 
   meta = with lib; {
     description = "truetype monospaced typeface designed for X environments";

pkgs/data/fonts/mno16/default.nix

@@ -0,0 +1,21 @@
+{ lib, fetchzip }:
+
+let
+  pname = "mno16";
+  version = "1.0";
+in fetchzip rec {
+  name = "${pname}-${version}";
+  url = "https://github.com/sevmeyer/${pname}/releases/download/${version}/${name}.zip";
+  sha256 = "1x06nl281fcjk6g1p4cgrgxakmwcci6vvasskaygsqlzxd8ig87w";
+
+  postFetch = ''
+    mkdir -p $out/share/fonts/truetype
+    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/
+  '';
+
+  meta = with lib; {
+    description = "minimalist monospaced font";
+    homepage = https://sev.dev/fonts/mno16; 
+    license = licenses.cc0;
+  };
+}

pkgs/data/fonts/mplus-outline-fonts/default.nix

@@ -1,7 +1,7 @@
 { lib, fetchzip }:
 
 let
-  version = "063";
+  version = "063a";
 in fetchzip rec {
   name = "mplus-${version}";
 
@@ -13,7 +13,7 @@ in fetchzip rec {
     cp *.ttf $out/share/fonts/truetype
   '';
 
-  sha256 = "0d485l2ihxfk039rrrnfviamlbj13cwky0c752m4ikwvgiqiq94y";
+  sha256 = "1khbkch2r96ppifc93bmy1v047pgciyhfmcjb98ggncp5ix885xz";
 
   meta = with lib; {
     description = "M+ Outline Fonts";

pkgs/data/fonts/xits-math/default.nix

@@ -2,23 +2,19 @@
 
 stdenv.mkDerivation rec {
   name = "xits-math-${version}";
-  version = "1.108";
+  version = "1.200";
 
   src = fetchFromGitHub {
-    owner = "khaledhosny";
-    repo = "xits-math";
+    owner = "alif-type";
+    repo = "xits";
     rev = "v${version}";
-    sha256 = "08nn676c41a7gmmhrzi8mm0g74z8aiaafjk48pqcwxvjj9av7xjg";
+    sha256 = "0s1qqqg3zv9k4wqn1vkx0z895fjccg96n58syc1d5f2wba9kyfcm";
   };
 
   nativeBuildInputs = [ fontforge ] ++ (with python2Packages; [ python fonttools ]);
 
   postPatch = ''
     rm *.otf
-
-    substituteInPlace tools/postprocess.py --replace \
-      'font = ttLib.TTFont(sys.argv[1])' \
-      'font = ttLib.TTFont(sys.argv[1], recalcTimestamp=False)'
   '';
 
   installPhase = ''

pkgs/data/themes/plata/default.nix

@@ -3,31 +3,30 @@
 , cinnamonSupport ? true
 , gnomeFlashbackSupport ? true
 , gnomeShellSupport ? true
-, mateSupport ? true
 , openboxSupport ? true
 , xfceSupport ? true
 , gtkNextSupport ? false
 , plankSupport ? false
 , steamSupport ? false
-, telegramSupport ? false
-, tweetdeckSupport ? false, zip ? null
+, telegramSupport ? false, zip ? null
+, tweetdeckSupport ? false
 , selectionColor ? null # Primary color for 'selected-items' (Default: #3F51B5 = Indigo500)
 , accentColor ? null # Secondary color for notifications and OSDs (Default: #7986CB = Indigo300)
 , suggestionColor ? null # Secondary color for 'suggested' buttons (Default: #673AB7 = DPurple500)
 , destructionColor ? null # Tertiary color for 'destructive' buttons (Default: #F44336 = Red500)
 }:
 
-assert tweetdeckSupport -> zip != null;
+assert telegramSupport -> zip != null;
 
 stdenv.mkDerivation rec {
-  name = "plata-theme-${version}";
-  version = "0.8.0";
+  pname = "plata-theme";
+  version = "0.8.3";
 
   src = fetchFromGitLab {
     owner = "tista500";
     repo = "plata-theme";
     rev = version;
-    sha256 = "10xvfrc945zqlgzlx8zjyg0gnkwmq9vfjk0yqjy3gg62i65s8sch";
+    sha256 = "0ibgymdrw91lnng76lb0x55zg6nm9f2vap19wk7qsq3bcw6ny2zi";
   };
 
   preferLocalBuild = true;
@@ -41,7 +40,7 @@ stdenv.mkDerivation rec {
     libxml2
     gnome2.glib.dev
   ]
-  ++ stdenv.lib.optional tweetdeckSupport zip;
+  ++ stdenv.lib.optional telegramSupport zip;
 
   buildInputs = [
     gdk_pixbuf
@@ -61,7 +60,6 @@ stdenv.mkDerivation rec {
       (enableFeature cinnamonSupport "cinnamon")
       (enableFeature gnomeFlashbackSupport "flashback")
       (enableFeature gnomeShellSupport "gnome")
-      (enableFeature mateSupport "mate")
       (enableFeature openboxSupport "openbox")
       (enableFeature xfceSupport "xfce")
       (enableFeature gtkNextSupport "gtk_next")