Merge branch 'master' into staging

Conflicts: pkgs/development/libraries/fontconfig/default.nix
2014-12-07 14:02:48 +01:00
parent 43c4d78bc6 ad4ad11fbc
commit 4aa3eec330
299 changed files with 22706 additions and 13278 deletions
--- a/pkgs/development/compilers/go/1.2.nix
+++ b/pkgs/development/compilers/go/1.2.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation {
    homepage = http://golang.org/;
    description = "The Go Programming language";
    license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [ pierron viric wizeman ];
+    maintainers = with stdenv.lib.maintainers; [ pierron viric ];
    platforms = stdenv.lib.platforms.linux;
  };
 }