Merge branch 'master' into staging

2016-12-29 13:56:16 +01:00
parent e4f23bc8af c2d90eaa91
commit 9d09bc6728
110 changed files with 2974 additions and 1094 deletions
--- a/pkgs/development/python-modules/pygame/git.nix
+++ b/pkgs/development/python-modules/pygame/git.nix
@@ -41,5 +41,6 @@ buildPythonPackage rec {
    homepage = "http://www.pygame.org/";
    license = licenses.lgpl21Plus;
    platforms = platforms.linux;
+    broken = true;
  };
 }