Merge remote-tracking branch 'upstream/master' into staging

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

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mplus-${version}";
-  version = "059";
+  version = "061";
 
   src = fetchurl {
-    url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-059.tar.xz";
-    sha256 = "09dzdgqqflpijd3c30m38cyidshawfp4nz162xhn91j9w09y2qkq";
+    url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz";
+    sha256 = "1yrv65l2y8f9jmpalqb5iiay7z1x3754mnqpgp2bax72g8k8728g";
   };
 
   phases = [ "unpackPhase" "installPhase" ];

pkgs/data/icons/maia-icon-theme/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  name = "maia-icon-theme";
+
+  src = fetchFromGitHub {
+    owner = "manjaro";
+    repo = "artwork-maia";
+    rev = "23235fa56e6111d30e9f92576030cc855a0facbe";
+    sha256 = "1d5bv13gds1nx88pc6a9gkrz1lb8sji0wcc5h3bf4mjw0q072nfr";
+  };
+
+  dontBuild = true;
+  
+  installPhase = ''
+    install -dm 755 $out/share/icons
+    rm icons/CMakeLists.txt
+    cp -dr --no-preserve='ownership' icons $out/share/icons/Maia
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Icons based on Breeze and Super Flat Remix";
+    homepage = https://github.com/manjaro/artwork-maia;
+    licence = licenses.free;
+    maintainers = [ maintainers.mounium ];
+    platforms = platforms.all;
+  };
+}