Merge remote-tracking branch 'origin/master' into multiple-outputs

Conflicts: pkgs/development/libraries/gtk+/2.x.nix pkgs/development/libraries/libsamplerate/default.nix pkgs/development/libraries/libsndfile/default.nix pkgs/misc/cups/default.nix pkgs/top-level/all-packages.nix
2013-08-21 17:05:30 +02:00
parent 9555f3ba06 77b9f28658
commit 10cb4a8cf2
1087 changed files with 30296 additions and 32019 deletions
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
    license = "LGPLv2+";

    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
  };
 }