Merge branch 'master' into staging

That's to get mesa rebuild from master, as it's nontrivial.

pkgs/development/python-modules/pygame/default.nix

@@ -1,9 +1,10 @@
-{ stdenv, fetchurl, buildPythonPackage, pkgconfig, smpeg, libX11
+{ stdenv, lib, fetchurl, buildPythonPackage, python, smpeg, libX11
 , SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, isPy3k,
 }:
 
-buildPythonPackage {
-  name = "pygame-1.9.1";
+buildPythonPackage rec {
+  name = "pygame-${version}";
+  version = "1.9.1";
 
   src = fetchurl {
     url = "http://www.pygame.org/ftp/pygame-1.9.1release.tar.gz";
@@ -11,11 +12,11 @@ buildPythonPackage {
   };
 
   buildInputs = [
-    pkgconfig SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg
+    SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg
     smpeg portmidi libX11
   ];
 
-  # /nix/store/94kswjlwqnc0k2bnwgx7ckx0w2kqzaxj-stdenv/setup: line 73: python: command not found
+  # http://ubuntuforums.org/showthread.php?t=1960262
   disabled = isPy3k;
 
   # Tests fail because of no audio device and display.
@@ -23,18 +24,26 @@ buildPythonPackage {
 
   patches = [ ./pygame-v4l.patch ];
 
-  preConfigure = stdenv.lib.concatMapStrings (dep: ''
+  preConfigure = ''
     sed \
-      -e "/origincdirs =/a'${dep.dev or dep.out}/include'," \
-      -e "/origlibdirs =/aoriglibdirs += '${dep.lib or dep.out}/lib'," \
+      -e "s/^origincdirs = .*/origincdirs = []/" \
+      -e "s/^origlibdirs = .*/origlibdirs = []/" \
+      -e "/\/include\/smpeg/d" \
       -i config_unix.py
-  '') [ SDL_image SDL_mixer SDL_ttf libpng libjpeg portmidi libX11 ] + ''
-    LOCALBASE=/ python config.py
+    ${lib.concatMapStrings (dep: ''
+      sed \
+        -e "/^origincdirs =/aorigincdirs += ['${lib.getDev dep}/include']" \
+        -e "/^origlibdirs =/aoriglibdirs += ['${lib.getLib dep}/lib']" \
+        -i config_unix.py
+      '') buildInputs
+    }
+    LOCALBASE=/ ${python.interpreter} config.py
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Python library for games";
     homepage = "http://www.pygame.org/";
-    license = stdenv.lib.licenses.lgpl21Plus;
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
   };
 }

pkgs/development/python-modules/pygame/git.nix

@@ -0,0 +1,45 @@
+{ stdenv, lib, fetchFromBitbucket, buildPythonPackage, python, smpeg, libX11
+, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi
+}:
+
+buildPythonPackage rec {
+  name = "pygame-${version}";
+  version = "2016-05-17";
+
+  src = fetchFromBitbucket {
+    owner = "pygame";
+    repo = "pygame";
+    rev = "575c7a74d85a37db7c645421c02cf0b6b78a889f";
+    sha256 = "1i5xqmw93kfidcji2wacgkm5y4mcnbksy8iimih0729k19rbhznc";
+  };
+
+  buildInputs = [
+    SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg
+    smpeg portmidi libX11
+  ];
+
+  # Tests fail because of no audio device and display.
+  doCheck = false;
+
+  preConfigure = ''
+    sed \
+      -e "s/^origincdirs = .*/origincdirs = []/" \
+      -e "s/^origlibdirs = .*/origlibdirs = []/" \
+      -i config_unix.py
+    ${lib.concatMapStrings (dep: ''
+      sed \
+        -e "/^origincdirs =/aorigincdirs += ['${lib.getDev dep}/include']" \
+        -e "/^origlibdirs =/aoriglibdirs += ['${lib.getLib dep}/lib']" \
+        -i config_unix.py
+      '') buildInputs
+    }
+    LOCALBASE=/ ${python.interpreter} config.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Python library for games";
+    homepage = "http://www.pygame.org/";
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+  };
+}