Merge branch 'master' into staging

That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
parent dc5bbc4700 0e54c74911
commit 0b192a0976
206 changed files with 25329 additions and 3237 deletions
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
    homepage = http://ofb.net/~egnor/xml2/;
    description = "Tools for command line processing of XML, HTML, and CSV";
    license = licenses.gpl2Plus;
+    platforms = platforms.all;
    maintainers = [ maintainers.rycee ];
  };
 }