Merge remote-tracking branch 'upstream/master' into x-updates

Conflicts:
	pkgs/misc/emulators/wine/default.nix

pkgs/applications/audio/pianobar/default.nix

@@ -0,0 +1,26 @@
+{ fetchurl, stdenv, pkgconfig, libao, faad2, libmad, readline, json_c, libgcrypt, gnutls }:
+
+stdenv.mkDerivation rec {
+  name = "pianobar-2013.05.19";
+
+  src = fetchurl {
+    url = "http://6xq.net/projects/pianobar/${name}.tar.bz2";
+    sha256 = "cf88e82663d2b0aa4d73e761506eac4f3e7bc789b57d92377acd994d785e1046";
+  };
+
+  buildInputs = [
+    pkgconfig libao faad2 libmad json_c libgcrypt gnutls
+  ];
+
+  makeFlags="PREFIX=$(out)";
+
+  CC = "gcc";
+  CFLAGS = "-std=c99";
+
+  meta = {
+    description = "A console front-end for Pandora.com";
+    homepage = "http://6xq.net/projects/pianobar/";
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.unfree;
+  };
+}

pkgs/applications/editors/emacs-modes/jdee/default.nix

@@ -11,7 +11,7 @@ in
     src = fetchsvn {
       url = "https://jdee.svn.sourceforge.net/svnroot/jdee/trunk/jdee";
       rev = revision;
-      sha256 = "1qj5cv74dp6nf6060jyvnlcbmc4sz8a09806gwa1zfiwz6mm9zrs";
+      sha256 = "1z1y957glbqm7z3dhah9h4jysw3173pq1gpx5agfwcw614n516xz";
     };
 
     patchFlags = "-p1 --ignore-whitespace";

pkgs/applications/editors/emacs-modes/quack/default.nix

@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     # XXX: Upstream URL is not versioned, which might eventually break this.
     url = "http://www.neilvandyke.org/quack/quack.el";
-    sha256 = "1w3p03f1f3l2nldxc7dig1kkgbbvy5j7zid0cfmkcrpp1qrcsqic";
+    sha256 = "1q5bsllxkibiddwp32306flqm8s3caffnpbqz5ka260avllp4jj5";
   };
 
   buildInputs = [ emacs ];

pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix

@@ -4,10 +4,11 @@ stdenv.mkDerivation rec {
   name = "session-management-for-emacs-2.2a";
   
   src = fetchurl {
-    url = "mirror://sourceforge.net/sourceforge/emacs-session/session-2.2a.tar.gz";
+    url = "http://downloads.sourceforge.net/project/emacs-session/session/2.2a/session-2.2a.tar.gz";
-    sha256 = "0i01dnkizs349ahyybzy0mjzgj52z65rxynsj2mlw5mm41sbmprp";
+#    url = "mirror://sourceforge.net/sourceforge/emacs-session/session-2.2a.tar.gz";
+    sha256 = "37dfba7420b5164eab90dafa9e8bf9a2c8f76505fe2fefa14a64e81fa76d0144";
   };
-  
+
   buildInputs = [emacs];
   
   installPhase = ''

pkgs/applications/editors/emacs-modes/tuareg/default.nix

@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, emacs }:
+
+# this package installs the emacs-mode which
+# resides in the ocaml compiler sources.
+
+let version = "2.0.6";
+
+in stdenv.mkDerivation {
+  name = "tuareg-mode-${version}";
+  src = fetchurl {
+    url = https://forge.ocamlcore.org/frs/download.php/882/tuareg-2.0.6.tar.gz;
+    sha256 = "ea79ac24623b82ab8047345f8504abca557a537e639d16ce1ac3e5b27f5b1189";
+  }; 
+
+  buildInputs = [ emacs ];
+
+  installPhase = ''
+    ensureDir "$out/share/emacs/site-lisp"
+    cp *.el *.elc  "$out/share/emacs/site-lisp"
+  '';
+
+  meta = {
+    homepage = http://caml.inria.fr;
+    description = "OCaml mode package for Emacs";
+    platforms = stdenv.lib.platforms.unix;
+  };
+}

pkgs/development/interpreters/renpy/default.nix

@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, python, pkgconfig, wrapPython
+, pygame, SDL, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib
+}:
+
+stdenv.mkDerivation {
+  name = "renpy-6.15.5";
+
+  src = fetchurl {
+    url = "http://www.renpy.org/dl/6.15.5/renpy-6.15.5-source.tar.bz2";
+    sha256 = "1k57dak1yk5iyxripqn2syhwwkh70y00pnnb9i1qf19lmiirxa60";
+  };
+
+  buildInputs = [
+    python pkgconfig wrapPython
+    SDL libpng ffmpeg freetype glew mesa fribidi zlib pygame
+  ];
+
+  pythonPath = [ pygame ];
+
+  RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: "${path}") [
+    SDL libpng ffmpeg freetype glew mesa fribidi zlib
+  ]);
+
+  buildPhase = ''
+    python module/setup.py build
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/renpy
+    cp -r renpy renpy.py $out/share/renpy
+    python module/setup.py install --prefix=$out --install-lib=$out/share/renpy/module
+
+    wrapPythonPrograms
+    makeWrapper ${python}/bin/python $out/bin/renpy \
+      --set PYTHONPATH $program_PYTHONPATH \
+      --set RENPY_BASE $out/share/renpy \
+      --set RENPY_LESS_UPDATES 1 \
+      --add-flags "-O $out/share/renpy/renpy.py"
+  '';
+
+  NIX_CFLAGS_COMPILE = "-I${pygame}/include/${python.libPrefix}";
+
+  meta = {
+    description = "Ren'Py Visual Novel Engine";
+    homepage = "http://renpy.org/";
+    licence = "MIT";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/development/libraries/aspell/dictionaries.nix

@@ -29,7 +29,7 @@ let
 in {
 
   de = buildDict {
-    shortName = "de-20030222-1";
+    shortName = "de-20030222_1";
     fullName = "German";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/de/aspell6-de-20030222-1.tar.bz2;
@@ -38,7 +38,7 @@ in {
   };
     
   en = buildDict {
-    shortName = "en-6.0-0";
+    shortName = "en-6.0_0";
     fullName = "English";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/en/aspell6-en-6.0-0.tar.bz2;
@@ -47,7 +47,7 @@ in {
   };
     
   es = buildDict {
-    shortName = "es-0.50-2";
+    shortName = "es-0.50_2";
     fullName = "Spanish";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/es/aspell-es-0.50-2.tar.bz2;
@@ -56,7 +56,7 @@ in {
   };
     
   eo = buildDict {
-    shortName = "eo-0.50-2";
+    shortName = "eo-0.50_2";
     fullName = "Esperanto";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/eo/aspell-eo-0.50-2.tar.bz2;
@@ -65,7 +65,7 @@ in {
   };
 
   fr = buildDict {
-    shortName = "fr-0.50-3";
+    shortName = "fr-0.50_3";
     fullName = "French";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/fr/aspell-fr-0.50-3.tar.bz2;
@@ -74,7 +74,7 @@ in {
   };
     
   it = buildDict {
-    shortName = "it-0.53-0";
+    shortName = "it-0.53_0";
     fullName = "Italian";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/it/aspell-it-0.53-0.tar.bz2;
@@ -83,7 +83,7 @@ in {
   };
     
   la = buildDict {
-    shortName = "la-20020503-0";
+    shortName = "la-20020503_0";
     fullName = "Latin";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/la/aspell6-la-20020503-0.tar.bz2;
@@ -92,7 +92,7 @@ in {
   };
     
   nl = buildDict {
-    shortName = "nl-0.50-2";
+    shortName = "nl-0.50_2";
     fullName = "Dutch";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/nl/aspell-nl-0.50-2.tar.bz2;
@@ -105,7 +105,7 @@ in {
   };
     
   pl = buildDict {
-    shortName = "pl-6.0_20061121";
+    shortName = "pl-6.0_20061121_0";
     fullName = "Polish";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/pl/aspell6-pl-6.0_20061121-0.tar.bz2;
@@ -114,7 +114,7 @@ in {
   };
      
   ru = buildDict {
-    shortName = "ru-0.99f7-1";
+    shortName = "ru-0.99f7_1";
     fullName = "Russian";
     src = fetchurl {
       url = mirror://gnu/aspell/dict/ru/aspell6-ru-0.99f7-1.tar.bz2;

pkgs/development/libraries/glew/default.nix

@@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ mesa x11 libXmu libXi ];
 
+  patchPhase = ''
+    sed -i 's|lib64|lib|' config/Makefile.linux
+  '';
+
   installPhase = ''
     GLEW_DEST=$out make install
     mkdir -pv $out/share/doc/glew

pkgs/development/libraries/haskell/accelerate-cuda/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "accelerate-cuda";
-  version = "0.13.0.1";
+  version = "0.13.0.2";
-  sha256 = "0nswa73ajvmh1s6n2nks4zm3ybfm8v46wd789cs09f5s90ingpsj";
+  sha256 = "1i8p6smj82k9nw0kz17247nzby8k8x0il8d2d3rbps5j03795dfk";
   buildDepends = [
     accelerate binary cryptohash cuda fclabels filepath hashable
     hashtables languageCQuote mainlandPretty mtl SafeSemaphore srcloc

pkgs/development/libraries/haskell/accelerate/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "accelerate";
-  version = "0.13.0.1";
+  version = "0.13.0.2";
-  sha256 = "01vkvvvzlj023cwxz90clrcgz4xyz0nb8idm1zad21gzrij14915";
+  sha256 = "1xcgcr3wrvvckjhxbr80567gmg6rx9ks7rl4jcr6c6mdv6svx4jb";
   buildDepends = [ fclabels hashable hashtables ];
   noHaddock = true;
   meta = {

pkgs/development/libraries/haskell/classy-prelude/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude";
-  version = "0.5.7";
+  version = "0.5.8";
-  sha256 = "1wq8la7nq3dh21yqwcjhwgy5s5mpqlvmrfma48v8ch6w4wwb0sqz";
+  sha256 = "1yq2x3mfkasprmsx1gracjhih9l9x0dsq6pdf90khlcl11qh57ir";
   buildDepends = [
     basicPrelude hashable liftedBase monadControl systemFilepath text
     transformers unorderedContainers vector

pkgs/development/libraries/haskell/fingertree/default.nix

@@ -1,9 +1,15 @@
-{ cabal }:
+{ cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2
+}:
 
 cabal.mkDerivation (self: {
   pname = "fingertree";
-  version = "0.0.1.1";
+  version = "0.1.0.0";
-  sha256 = "00llr24b2r539250fangl0jj39gf26gjwvhjpy5qg8l920hrjn78";
+  sha256 = "0c35sryzsijwavvw9x1pk5p99rhmp4g8pjh2ds419mlfgxc039ms";
+  testDepends = [
+    HUnit QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2
+  ];
   meta = {
     description = "Generic finger-tree structure, with example instances";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/monadcryptorandom/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monadcryptorandom";
-  version = "0.5.1";
+  version = "0.5.2";
-  sha256 = "10waxc0i7hcqlgb9iwcdz0xqkym4ihavgwq466xlaqzzhcpp38d6";
+  sha256 = "0a0qx331c1kvhmwwam7pbbrnq8ky3spfnw6zsz6rz7g1lk1hfawn";
   buildDepends = [ cryptoApi mtl tagged transformers ];
   meta = {
     homepage = "https://github.com/TomMD/monadcryptorandom";

pkgs/development/libraries/haskell/pipes-concurrency/default.nix

@@ -1,10 +1,10 @@
-{ cabal, pipes, stm, transformers }:
+{ cabal, pipes, stm }:
 
 cabal.mkDerivation (self: {
   pname = "pipes-concurrency";
-  version = "1.1.0";
+  version = "1.2.0";
-  sha256 = "05xpwxhf08yf88ya89f8gcy4vphi6qxyccf2yiyi5zrf6c2pkr00";
+  sha256 = "058v9d3wf9n1d25rhdq5vj60p8mll5yv2zn2k1092bg7qisip1fq";
-  buildDepends = [ pipes stm transformers ];
+  buildDepends = [ pipes stm ];
   meta = {
     description = "Concurrency for the pipes ecosystem";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/postgresql-simple/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "postgresql-simple";
-  version = "0.3.3.0";
+  version = "0.3.3.1";
-  sha256 = "0srkalfg41gdnzwwa2bmwwrcdqnw13f7b94wv4d5a6sg6yf1ry1l";
+  sha256 = "0fqndncfy6yg27ndfaqyqd2q9wrbabkdq388s4q9m7maj222xlb9";
   buildDepends = [
     attoparsec blazeBuilder blazeTextual postgresqlLibpq text time
     transformers vector

pkgs/development/libraries/haskell/yesod-core/default.nix

@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.2.1";
+  version = "1.2.2";
-  sha256 = "1p9xaw0d9dx68q7i99kjcqy1lhmd164drbcw3489560wa71mwamk";
+  sha256 = "1fapqx1lrhhqjc9k9yc964sxnawj7ga62w83csbkkhwq3g5425yp";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit cookie dataDefault

pkgs/development/libraries/haskell/yesod-persistent/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-persistent";
-  version = "1.2.0";
+  version = "1.2.1";
-  sha256 = "1gzzs62mnx2q15sm3hvlk18qjgk3bi828klgl2ckc0462f7z8d0k";
+  sha256 = "06kzxdbg3xw128zlacsf51qi7qnccw0gjnwscxshljgipiicfhfc";
   buildDepends = [
     blazeBuilder conduit liftedBase persistent persistentTemplate
     poolConduit resourcet transformers yesodCore

pkgs/development/libraries/haskell/yesod-platform/default.nix

@@ -28,8 +28,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-platform";
-  version = "1.2.0.1";
+  version = "1.2.1";
-  sha256 = "0hff8kx5d1z8xmy7fnzzhvy9774r26i4bczkb4cz30v3v5pf2g15";
+  sha256 = "1wa1g37ipigscv8xwb5zyfawjw0fxqmwr2l6wdf507r0kvclk2ap";
   buildDepends = [
     aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit
     authenticate base64Bytestring baseUnicodeSymbols blazeBuilder

pkgs/development/libraries/haskell/yesod-routes/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-routes";
-  version = "1.2.0";
+  version = "1.2.0.1";
-  sha256 = "1d7z0v6jrl08w7qz3apwdjss3vq151y28l7231cpqiia46damib2";
+  sha256 = "0pp7g3ccd0swh1j62am1vg9r2gh65jcci5w2n4r42sqzfnql0i8z";
   buildDepends = [ pathPieces text vector ];
   testDepends = [ hspec HUnit pathPieces text ];
   meta = {

pkgs/development/libraries/haskell/yesod/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "1.2.0.1";
+  version = "1.2.1";
-  sha256 = "1whkw0lmkyja2j6vbfcf5rjmmhmc85r4arjwjrvdmz6jkjyqham3";
+  sha256 = "19gwhav6sr6gd2kh92ga8a09hq9grllmnacdqkgasxwjsfxqa6zg";
   buildDepends = [
     aeson blazeHtml blazeMarkup dataDefault hamlet monadControl
     networkConduit safe shakespeareCss shakespeareJs text transformers

pkgs/development/libraries/smpeg/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk, m4, pkgconfig, mesa }:
 
 stdenv.mkDerivation rec {
-  name = "smpeg-svn-${version}";
+  name = "smpeg-svn${version}";
   version = "390";
 
   src = fetchsvn {

pkgs/development/libraries/x264/default.nix

@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "snapshot-20130424-2245-stable";
-  name = "x264-${version}";
+  name = "x264-20130424_2245";
 
   src = fetchurl {
     url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2";

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

@@ -1,46 +1,37 @@
-{ fetchurl, stdenv, python, pkgconfig, SDL, SDL_image, SDL_mixer, SDL_ttf
+{ stdenv, fetchurl, python, pkgconfig
-, numeric }:
+, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg
+}:
 
 stdenv.mkDerivation {
-  name = "pygame-1.7";
+  name = "pygame-1.9.1";
 
   src = fetchurl {
-    url = http://www.pygame.org/ftp/pygame-1.7.1release.tar.gz ;
+    url = "http://www.pygame.org/ftp/pygame-1.9.1release.tar.gz";
-    sha256 = "0hl0rmgjcqj217fibwyilz7w9jpg0kh7hsa7vyzd4cgqyliskpqi";
+    sha256 = "0cyl0ww4fjlf289pjxa53q4klyn55ajvkgymw0qrdgp4593raq52";
   };
 
-  buildInputs = [python pkgconfig SDL SDL_image SDL_ttf numeric];
+  buildInputs = [
- 
+    python pkgconfig SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg
+  ];
+
+  patches = [ ./pygame-v4l.patch ];
+
   configurePhase = ''
-    export LOCALBASE=///
+    for i in ${SDL_image} ${SDL_mixer} ${SDL_ttf} ${libpng} ${libjpeg}; do
-    sed -e "/origincdirs =/a'${SDL_image}/include/SDL','${SDL_image}/include'," -i config_unix.py
+      sed -e "/origincdirs =/a'$i/include'," -i config_unix.py
-    sed -e "/origlibdirs =/aoriglibdirs += '${SDL_image}/lib'," -i config_unix.py
+      sed -e "/origlibdirs =/aoriglibdirs += '$i/lib'," -i config_unix.py
-    sed -e "/origincdirs =/a'${SDL_mixer}/include/SDL','${SDL_mixer}/include'," -i config_unix.py
+    done
-    sed -e "/origlibdirs =/aoriglibdirs += '${SDL_mixer}/lib'," -i config_unix.py
-    sed -e "/origincdirs =/a'${SDL_ttf}/include/SDL','${SDL_ttf}/include'," -i config_unix.py
-    sed -e "/origlibdirs =/aoriglibdirs += '${SDL_ttf}/lib'," -i config_unix.py
-    sed -e "/origincdirs =/a'${numeric}/include/python2.5'," -i config_unix.py
 
-    sed -e "s|get_python_inc(0)|\"${numeric}/include/python2.5\"|g" -i config_unix.py
+    yes Y | LOCALBASE=/ python config.py
-
-    # XXX: `Numeric.pth' should be found by Python but it's not, hence the
-    # $PYTHONPATH setting below.  Gobolinux has the same problem:
-    # http://bugs.python.org/issue1431 .
-    yes Y | \
-      PYTHONPATH="${numeric}/lib/python2.5/site-packages/Numeric:$PYTHONPATH" \
-      python config.py
-
-    # That `config.py' is really deeply broken.
-    sed -i Setup \
-        -e "s|^NUMERIC *=.*$|NUMERIC = -I${numeric}/include/python2.5|g ;
-            s|^MIXER *=.*$|MIXER = -I${SDL_mixer}/include -L${SDL_mixer}/lib -lSDL_mixer|g"
   '';
 
-  buildPhase = "yes Y | python setup.py build";	
+  buildPhase = "python setup.py build"; 
 
-  installPhase = "yes Y | python setup.py install --prefix=\${out} ";
+  installPhase = "python setup.py install --prefix=$out";
 
   meta = {
     description = "Python library for games";
+    homepage = "http://www.pygame.org/";
+    licences = "LGPLv2.1+";
   };
 }

pkgs/development/python-modules/pygame/pygame-v4l.patch

@@ -0,0 +1,88 @@
+diff -crB pygame-1.9.1release/Setup.in pygame-1.9.1release-v4lpatch//Setup.in
+*** pygame-1.9.1release/Setup.in	Thu Jul  2 06:41:56 2009
+--- pygame-1.9.1release-v4lpatch//Setup.in	Thu Mar 24 17:31:22 2011
+***************
+*** 34,40 ****
+  _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
+  movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
+  scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
+! _camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
+  pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
+  
+  GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
+--- 34,40 ----
+  _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
+  movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
+  scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
+! _camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG)
+  pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
+  
+  GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
+diff -crB pygame-1.9.1release/src/_camera.c pygame-1.9.1release-v4lpatch//src/_camera.c
+*** pygame-1.9.1release/src/_camera.c	Sun Mar 15 20:30:41 2009
+--- pygame-1.9.1release-v4lpatch//src/_camera.c	Thu Mar 24 16:58:18 2011
+***************
+*** 160,179 ****
+  {
+  #if defined(__unix__)
+      if (v4l2_open_device(self) == 0) {
+!         if (v4l_open_device(self) == 0) {
+!             v4l2_close_device(self);
+!             return NULL;
+!         } else {
+!             self->camera_type = CAM_V4L;
+!             if (v4l_init_device(self) == 0) {
+!                 v4l2_close_device(self);
+!                 return NULL;
+!             }
+!             if (v4l_start_capturing(self) == 0) {
+!                 v4l2_close_device(self);
+!                 return NULL;
+!             }
+!         }
+      } else {
+          self->camera_type = CAM_V4L2;
+          if (v4l2_init_device(self) == 0) {
+--- 160,167 ----
+  {
+  #if defined(__unix__)
+      if (v4l2_open_device(self) == 0) {
+! 	v4l2_close_device(self);
+!         return NULL;
+      } else {
+          self->camera_type = CAM_V4L2;
+          if (v4l2_init_device(self) == 0) {
+diff -crB pygame-1.9.1release/src/camera.h pygame-1.9.1release-v4lpatch//src/camera.h
+*** pygame-1.9.1release/src/camera.h	Fri Oct 10 04:37:10 2008
+--- pygame-1.9.1release-v4lpatch//src/camera.h	Thu Mar 24 16:44:32 2011
+***************
+*** 39,45 ****
+  
+      #include <asm/types.h>          /* for videodev2.h */
+  
+-     #include <linux/videodev.h>
+      #include <linux/videodev2.h>
+  #endif
+  
+--- 39,44 ----
+***************
+*** 51,57 ****
+  #define RGB_OUT 1
+  #define YUV_OUT 2
+  #define HSV_OUT 4
+- #define CAM_V4L 1
+  #define CAM_V4L2 2
+  
+  struct buffer 
+--- 50,55 ----
+***************
+*** 111,118 ****
+  int v4l2_close_device (PyCameraObject* self);
+  int v4l2_open_device (PyCameraObject* self);
+  
+- /* internal functions specific to v4l */
+- int v4l_open_device (PyCameraObject* self);
+- int v4l_init_device(PyCameraObject* self);
+- int v4l_start_capturing(PyCameraObject* self);
+  #endif
+--- 109,112 ----

pkgs/development/tools/haskell/hlint/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hlint";
-  version = "1.8.45";
+  version = "1.8.46";
-  sha256 = "14j77bjmdsxz5z0ka6mhnr2j29kpr5a39kbdq8ziga668wihdrz9";
+  sha256 = "0mq25xv0lmxfp9099pj7akmmw5pi0adq2w286wb4lpli82v8nfzf";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/misc/emulators/wine/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib
 , ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge
-, libxml2, libxslt, openssl, gnutls, cups, libdrm
+, libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper
 }:
 
 assert stdenv.isLinux;
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
     xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite
     alsaLib ncurses libpng libjpeg lcms fontforge
-    libxml2 libxslt openssl gnutls cups
+    libxml2 libxslt openssl gnutls cups makeWrapper
   ];
 
   # Wine locates a lot of libraries dynamically through dlopen().  Add
@@ -42,7 +42,10 @@ stdenv.mkDerivation rec {
   # elements specified above.
   dontPatchELF = true;
 
-  postInstall = "install -D ${gecko} $out/share/wine/gecko/${gecko.name}";
+  postInstall = ''
+    install -D ${gecko} $out/share/wine/gecko/${gecko.name}
+    wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.gcc.gcc}/lib
+  '';
 
   enableParallelBuilding = true;
 

pkgs/servers/nosql/riak/1.3.1.nix

@@ -0,0 +1,63 @@
+{ stdenv, fetchurl, unzip, erlang }:
+
+let
+  srcs = {
+     riak = fetchurl {
+      url = "http://s3.amazonaws.com/downloads.basho.com/riak/1.3/1.3.1/riak-1.3.1.tar.gz";
+      sha256 = "a69093fc5df1b79f58645048b9571c755e00c3ca14dfd27f9f1cae2c6e628f01";
+    };
+     leveldb = fetchurl {
+      url = "https://github.com/basho/leveldb/zipball/1.3.1";
+      sha256 = "10glzfsxs1167n7hmzl106xkfmn1qdjcqvillga2r5dsmn6vvi8a";
+    };
+  };
+in
+stdenv.mkDerivation rec {
+  name = "riak-1.3.1";
+
+  buildInputs = [unzip erlang];
+
+  src = srcs.riak;
+
+  patches = [ ./riak-1.3.1.patch ./riak-admin-1.3.1.patch ];
+
+  postUnpack = ''
+    ln -sv ${srcs.leveldb} $sourceRoot/deps/eleveldb/c_src/leveldb.zip
+    pushd $sourceRoot/deps/eleveldb/c_src/
+    unzip leveldb.zip
+    mv basho-leveldb-* leveldb
+    cd ../../
+    mkdir riaknostic/deps
+    cp -R lager riaknostic/deps
+    cp -R getopt riaknostic/deps
+    cp -R meck riaknostic/deps
+    popd
+  '';
+
+  buildPhase = ''
+    make rel
+  '';
+
+  doCheck = false;
+
+  installPhase = ''
+    mkdir $out
+    mv rel/riak/etc rel/riak/riak-etc
+    mkdir -p rel/riak/etc
+    mv rel/riak/riak-etc rel/riak/etc/riak
+    mv rel/riak/* $out
+  '';
+
+  meta = {
+    maintainers = stdenv.lib.maintainers.orbitz;
+    description = "Dynamo inspired NoSQL DB by Basho";
+    longDescription = ''
+      This patches the riak and riak-admin scripts to work better in Nix.
+      Rather than the scripts using their own location to determine where
+      the data, log, and etc directories should live, the scripts expect
+      RIAK_DATA_DIR, RIAK_LOG_DIR, and RIAK_ETC_DIR to be defined
+      and use those.
+    '';
+    platforms   = stdenv.lib.platforms.all;
+  };
+}

pkgs/servers/nosql/riak/riak-1.3.1.patch

@@ -0,0 +1,64 @@
+--- a/rel/files/riak	2013-05-22 20:45:55.613299952 +0200
++++ b/rel/files/riak	2013-06-04 03:20:47.679943612 +0200
+@@ -13,33 +13,34 @@
+ fi
+ unset POSIX_SHELL # clear it so if we invoke other scripts, they run as ksh as well
+ 
++if [ -z "$RIAK_ETC_DIR" ]; then
++    echo "Must set RIAK_ETC_DIR"
++    exit 1
++fi
++
++if [ -z "$RIAK_LOG_DIR" ]; then
++    echo "Must set RIAK_LOG_DIR"
++    exit 1
++fi
++
++if [ -z "$RIAK_DATA_DIR" ]; then
++    echo "Must set RIAK_DATA_DIR"
++    exit 1
++fi
++
+ RUNNER_SCRIPT_DIR={{runner_script_dir}}
+ RUNNER_SCRIPT=${0##*/}
+ 
+ RUNNER_BASE_DIR={{runner_base_dir}}
+-RUNNER_ETC_DIR={{runner_etc_dir}}
++RUNNER_ETC_DIR=$RIAK_ETC_DIR
+ RUNNER_LIB_DIR={{platform_lib_dir}}
+-RUNNER_LOG_DIR={{runner_log_dir}}
++RUNNER_LOG_DIR=$RIAK_LOG_DIR
+ # Note the trailing slash on $PIPE_DIR/
+ PIPE_DIR={{pipe_dir}}
+-RUNNER_USER={{runner_user}}
+-PLATFORM_DATA_DIR={{platform_data_dir}}
++PLATFORM_DATA_DIR=$RIAK_DATA_DIR
+ SSL_DIST_CONFIG=$PLATFORM_DATA_DIR/ssl_distribution.args_file
+ RIAK_VERSION="git"
+ 
+-WHOAMI=$(whoami)
+-
+-# Make sure this script is running as the appropriate user
+-if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" != "x$RUNNER_USER" ]); then
+-    type sudo > /dev/null 2>&1
+-    if [ $? -ne 0 ]; then
+-        echo "sudo doesn't appear to be installed and your EUID isn't $RUNNER_USER" 1>&2
+-        exit 1
+-    fi
+-    echo "Attempting to restart script through sudo -H -u $RUNNER_USER" >&2
+-    exec sudo -H -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
+-fi
+-
+ # Warn the user if ulimit -n is less than 4096
+ ULIMIT_F=`ulimit -n`
+ if [ "$ULIMIT_F" -lt 4096 ]; then
+@@ -48,9 +49,6 @@
+     echo "!!!!"
+ fi
+ 
+-# Make sure CWD is set to runner base dir
+-cd $RUNNER_BASE_DIR
+-
+ # Make sure log directory exists
+ mkdir -p $RUNNER_LOG_DIR
+ 

pkgs/servers/nosql/riak/riak-admin-1.3.1.patch

@@ -0,0 +1,52 @@
+--- a/rel/files/riak-admin	2013-05-22 20:45:55.613299952 +0200
++++ b/rel/files/riak-admin	2013-06-04 03:30:00.101604175 +0200
+@@ -11,31 +11,31 @@
+ fi
+ unset POSIX_SHELL # clear it so if we invoke other scripts, they run as ksh as well
+ 
++
++if [ -z "$RIAK_ETC_DIR" ]; then
++    echo "Must set RIAK_ETC_DIR"
++    exit 1
++fi
++
++if [ -z "$RIAK_LOG_DIR" ]; then
++    echo "Must set RIAK_LOG_DIR"
++    exit 1
++fi
++
++if [ -z "$RIAK_DATA_DIR" ]; then
++    echo "Must set RIAK_DATA_DIR"
++    exit 1
++fi
++
+ RUNNER_SCRIPT_DIR={{runner_script_dir}}
+ RUNNER_SCRIPT=${0##*/}
+ 
+ RUNNER_BASE_DIR={{runner_base_dir}}
+-RUNNER_ETC_DIR={{runner_etc_dir}}
++RUNNER_ETC_DIR=$RIAK_ETC_DIR
+ RUNNER_LIB_DIR={{platform_lib_dir}}
+-RUNNER_LOG_DIR={{runner_log_dir}}
++RUNNER_LOG_DIR=$RIAK_LOG_DIR
+ RUNNER_USER={{runner_user}}
+ 
+-WHOAMI=$(whoami)
+-
+-# Make sure this script is running as the appropriate user
+-if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" != "x$RUNNER_USER" ]); then
+-    type sudo > /dev/null 2>&1
+-    if [ $? -ne 0 ]; then
+-        echo "sudo doesn't appear to be installed and your EUID isn't $RUNNER_USER" 1>&2
+-        exit 1
+-    fi
+-    echo "Attempting to restart script through sudo -H -u $RUNNER_USER" >&2
+-    exec sudo -H -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
+-fi
+-
+-# Make sure CWD is set to runner base dir
+-cd $RUNNER_BASE_DIR
+-
+ # Extract the target node name from node.args
+ NAME_ARG=`egrep "^ *-s?name" $RUNNER_ETC_DIR/vm.args`
+ if [ -z "$NAME_ARG" ]; then

pkgs/tools/filesystems/ntfs-3g/default.nix

@@ -2,7 +2,7 @@
 , crypto ? false, libgcrypt, gnutls, pkgconfig}:
 
 stdenv.mkDerivation rec {
-  pname = "ntfs-3g_ntfsprogs";
+  pname = "ntfs-3g";
   version = "2012.1.15";
   name = "${pname}-${version}";
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = stdenv.lib.optional crypto pkgconfig;
 
   src = fetchurl {
-    url = "http://tuxera.com/opensource/${name}.tgz";
+    url = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz";
     sha256 = "09gvfgvqm4dswzxmwvg3r23bv39cp8y8b6qs2jcwmrqd032i25kg";
   };
 

pkgs/tools/misc/hddtemp/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "hddtemp-0.3-beta15";
+  name = "hddtemp-0.3_beta15";
 
   db = fetchurl{
     url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db;

pkgs/tools/misc/rmlint/default.nix

@@ -0,0 +1,19 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "rmlint-1.0.8";
+
+  src = fetchurl {
+    url = "https://github.com/downloads/sahib/rmlint/rmlint_1.0.8.tar.gz";
+    sha256 = "bea39a5872b39d3596e756f242967bc5bde6febeb996fdcd63fbcf5bfdc75f01";
+  };
+
+  makeFlags="DESTDIR=$(out)";
+
+  meta = {
+    description = "A tool to remove duplicates and other lint";
+    homepage = "https://github.com/sahib/rmlint";
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl3;
+  };
+}

pkgs/tools/networking/openconnect.nix

@@ -1,26 +1,25 @@
 { stdenv, fetchurl, pkgconfig, vpnc, openssl, libxml2 } :
 
 stdenv.mkDerivation rec {
-  name = "openconnect-5.00";
+  name = "openconnect-5.01";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.infradead.org/pub/openconnect/${name}.tar.gz"
     ];
-    sha256 = "8bacd8d00b2c0ecf35594a8417e695b5ed3a7757467f22f980134de81ee7713a";
+    sha256 = "1l90ks87iwmy7jprav11lhjr4n18ycy0d9fndspg50p9qd3jlvwi";
   };
 
   preConfigure = ''
       export PKG_CONFIG=${pkgconfig}/bin/pkg-config
       export LIBXML2_CFLAGS="-I ${libxml2}/include/libxml2"
       export LIBXML2_LIBS="-L${libxml2}/lib -lxml2"
-      export CFLAGS="-D NO_BROKEN_DTLS_CHECK $CFLAGS"
     '';
 
   configureFlags = [
     "--with-vpnc-script=${vpnc}/etc/vpnc/vpnc-script"
     "--disable-nls"
-
+    "--without-openssl-version-check"
   ];
 
   propagatedBuildInputs = [ vpnc openssl libxml2 ];

pkgs/tools/text/html-tidy/default.nix

@@ -2,7 +2,7 @@
 
 let date = "2009-07-04"; in
   stdenv.mkDerivation rec {
-    name = "html-tidy-${date}";
+    name = "html-tidy-20090704";
 
     # According to http://tidy.sourceforge.net/, there are no new
     # release tarballs, so one has to either get the code from CVS or

pkgs/top-level/all-packages.nix

@@ -1559,6 +1559,8 @@ let
 
   ripmime = callPackage ../tools/networking/ripmime {};
 
+  rmlint = callPackage ../tools/misc/rmlint {};
+
   rng_tools = callPackage ../tools/security/rng-tools { };
 
   rsnapshot = callPackage ../tools/backup/rsnapshot {
@@ -3031,6 +3033,11 @@ let
 
   regina = callPackage ../development/interpreters/regina {};
 
+  renpy = callPackage ../development/interpreters/renpy {
+    ffmpeg = ffmpeg_1;
+    wrapPython = pythonPackages.wrapPython;
+  };
+
   ruby18 = callPackage ../development/interpreters/ruby/ruby-18.nix { };
   ruby19 = callPackage ../development/interpreters/ruby/ruby-19.nix { };
   ruby2 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.0.nix { });
@@ -5695,6 +5702,8 @@ let
 
   mongodb = callPackage ../servers/nosql/mongodb { };
 
+  riak = callPackage ../servers/nosql/riak/1.3.1.nix { };
+
   mysql4 = import ../servers/sql/mysql {
     inherit fetchurl stdenv ncurses zlib perl;
     ps = procps; /* !!! Linux only */
@@ -7073,7 +7082,7 @@ let
 
     cua = callPackage ../applications/editors/emacs-modes/cua { };
 
-    ecb = callPackage ../applications/editors/emacs-modes/ecb { };
+    # ecb = callPackage ../applications/editors/emacs-modes/ecb { };
 
     jabber = callPackage ../applications/editors/emacs-modes/jabber { };
 
@@ -7107,6 +7116,8 @@ let
 
     ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { };
 
+    tuaregMode = callPackage ../applications/editors/emacs-modes/tuareg { };
+
     hol_light_mode = callPackage ../applications/editors/emacs-modes/hol_light { };
 
     htmlize = callPackage ../applications/editors/emacs-modes/htmlize { };
@@ -7862,6 +7873,8 @@ let
 
   pdftk = callPackage ../tools/typesetting/pdftk { };
 
+  pianobar = callPackage ../applications/audio/pianobar { };
+
   pianobooster = callPackage ../applications/audio/pianobooster { };
 
   picard = callPackage ../applications/audio/picard { };

pkgs/top-level/haskell-packages.nix

@@ -1559,11 +1559,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   pipes = callPackage ../development/libraries/haskell/pipes {};
 
-  pipes-concurrency = callPackage ../development/libraries/haskell/pipes-concurrency {};
+  pipesConcurrency = callPackage ../development/libraries/haskell/pipes-concurrency {};
 
-  pipes-parse = callPackage ../development/libraries/haskell/pipes-parse {};
+  pipesParse = callPackage ../development/libraries/haskell/pipes-parse {};
 
-  pipes-safe = callPackage ../development/libraries/haskell/pipes-safe {};
+  pipesSafe = callPackage ../development/libraries/haskell/pipes-safe {};
 
   polyparse = callPackage ../development/libraries/haskell/polyparse {};