Merge branch 'master' into stdenv-updates.

There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix, which I resolved to the best of my knowledge. I'd appreciate if some of the ruby gurus could have a look at the outcome of my merge, though.
2013-06-11 12:11:25 +02:00
parent a3cc980193 c662109f8a
commit 6b1ebeccf2
172 changed files with 4164 additions and 1333 deletions
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/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;
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/pkgs/development/libraries/crypto++/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
  # I add what 'enableParallelBuilding' would add to the make call,
  # if we were using the generic build phase.
  buildPhase = ''
-    make PREFIX="$out" all -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
+    make PREFIX="$out" all libcryptopp.so -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
  '';

  # TODO: Installing cryptotest.exe doesn't seem to be necessary. We run
--- a/pkgs/development/libraries/despotify/default.nix
+++ b/pkgs/development/libraries/despotify/default.nix
@@ -5,7 +5,7 @@

 stdenv.mkDerivation rec {

-  name = "despotify";
+  name = "despotify-svn521";

  src = fetchsvn {
    url = "https://despotify.svn.sourceforge.net/svnroot/despotify";
--- a/pkgs/development/libraries/glew/default.nix
+++ b/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
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -1,15 +1,15 @@
-{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle
+{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
 , guileBindings, guile, perl, gmp }:

 assert guileBindings -> guile != null;

 stdenv.mkDerivation (rec {

-  name = "gnutls-3.1.10";
+  name = "gnutls-3.1.12";

  src = fetchurl {
-    url = "mirror://gnupg/gnutls/v3.1/${name}.tar.xz";
-    sha256 = "0in6wxlvpv48maawmbg3jysq2rhjqxypgi6kkr173hc8kksp6lsk";
+    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${name}.tar.lz";
+    sha256 = "1h8j3xi2jad2dclybgqffb5264hdqrxpsx99irs03yy9np6iw5l8";
  };

  # Note: GMP is a dependency of Nettle, whose public headers include
@@ -31,10 +31,10 @@ stdenv.mkDerivation (rec {
  # for the actual fix.
  enableParallelBuilding = false;

-  buildInputs = [ zlib lzo ]
+  buildInputs = [ zlib lzo lzip ]
    ++ stdenv.lib.optional guileBindings guile;

-  nativeBuildInputs = [ perl ];
+  nativeBuildInputs = [ perl pkgconfig ];

  propagatedBuildInputs = [ nettle libtasn1 ];

@@ -42,7 +42,7 @@ stdenv.mkDerivation (rec {
  # http://hydra.nixos.org/build/2962084/nixlog/1/raw .
  doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);

-  meta = {
+  meta = with stdenv.lib; {
    description = "The GNU Transport Layer Security Library";

    longDescription = ''
@@ -61,8 +61,7 @@ stdenv.mkDerivation (rec {

    homepage = http://www.gnu.org/software/gnutls/;
    license = "LGPLv2.1+";
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ maintainers.ludo ];
  };
 }

--- a/pkgs/development/libraries/haskell/Agda/default.nix
+++ b/pkgs/development/libraries/haskell/Agda/default.nix
@@ -1,6 +1,6 @@
 { cabal, alex, binary, deepseq, filepath, geniplate, happy
 , hashable, hashtables, haskeline, haskellSrcExts, mtl, parallel
-, QuickCheck, text, unorderedContainers, xhtml, zlib
+, QuickCheck, text, time, unorderedContainers, xhtml, zlib
 }:

 cabal.mkDerivation (self: {
@@ -11,8 +11,8 @@ cabal.mkDerivation (self: {
  isExecutable = true;
  buildDepends = [
    binary deepseq filepath geniplate hashable hashtables haskeline
-    haskellSrcExts mtl parallel QuickCheck text unorderedContainers
-    xhtml zlib
+    haskellSrcExts mtl parallel QuickCheck text time
+    unorderedContainers xhtml zlib
  ];
  buildTools = [ alex happy ];
  jailbreak = true;
--- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
+++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
@@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "accelerate-cuda";
-  version = "0.13.0.1";
-  sha256 = "0nswa73ajvmh1s6n2nks4zm3ybfm8v46wd789cs09f5s90ingpsj";
+  version = "0.13.0.2";
+  sha256 = "1i8p6smj82k9nw0kz17247nzby8k8x0il8d2d3rbps5j03795dfk";
  buildDepends = [
    accelerate binary cryptohash cuda fclabels filepath hashable
    hashtables languageCQuote mainlandPretty mtl SafeSemaphore srcloc
--- a/pkgs/development/libraries/haskell/accelerate/default.nix
+++ b/pkgs/development/libraries/haskell/accelerate/default.nix
@@ -2,10 +2,9 @@

 cabal.mkDerivation (self: {
  pname = "accelerate";
-  version = "0.13.0.1";
-  sha256 = "01vkvvvzlj023cwxz90clrcgz4xyz0nb8idm1zad21gzrij14915";
+  version = "0.13.0.4";
+  sha256 = "1rhbvzgafw3cx2wi4zfil4nxcziqpbh20q3nafck30q2xvrwkmwm";
  buildDepends = [ fclabels hashable hashtables ];
-  noHaddock = true;
  meta = {
    homepage = "https://github.com/AccelerateHS/accelerate/";
    description = "An embedded language for accelerated array processing";
--- a/pkgs/development/libraries/haskell/bmp/1.2.5.2.nix
+++ b/pkgs/development/libraries/haskell/bmp/1.2.5.2.nix
@@ -2,9 +2,10 @@

 cabal.mkDerivation (self: {
  pname = "bmp";
-  version = "1.2.4.1";
-  sha256 = "1ipy8v5n5dmajnai2cf7591chklxcbhpvwjdgvdwglipds2hjpap";
+  version = "1.2.5.2";
+  sha256 = "0f88f2ynm1fpzbjijy5fa8blfrdv42h5h28hfjlpd4fp0h96in5x";
  buildDepends = [ binary ];
+  jailbreak = true;
  meta = {
    homepage = "http://code.ouroborus.net/bmp";
    description = "Read and write uncompressed BMP image files";
--- a/pkgs/development/libraries/haskell/classy-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix
@@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "classy-prelude";
-  version = "0.5.7";
-  sha256 = "1wq8la7nq3dh21yqwcjhwgy5s5mpqlvmrfma48v8ch6w4wwb0sqz";
+  version = "0.5.8";
+  sha256 = "1yq2x3mfkasprmsx1gracjhih9l9x0dsq6pdf90khlcl11qh57ir";
  buildDepends = [
    basicPrelude hashable liftedBase monadControl systemFilepath text
    transformers unorderedContainers vector
--- a/pkgs/development/libraries/haskell/contravariant/default.nix
+++ b/pkgs/development/libraries/haskell/contravariant/default.nix
@@ -2,12 +2,12 @@

 cabal.mkDerivation (self: {
  pname = "contravariant";
-  version = "0.4";
-  sha256 = "1nqslc9vcx6v6c33fn7mvb1xhr33yl3ja92p788zx8z1drx9cqc3";
+  version = "0.4.1";
+  sha256 = "0alzl47lqzw9fqjqxdfy40f1aynd8mc00b2h7fj2ch0zq82hm85q";
  buildDepends = [ tagged transformers transformersCompat ];
  meta = {
    homepage = "http://github.com/ekmett/contravariant/";
-    description = "Haskell 98 contravariant functors";
+    description = "Contravariant functors";
    license = self.stdenv.lib.licenses.bsd3;
    platforms = self.ghc.meta.platforms;
  };
--- a/pkgs/development/libraries/haskell/entropy/default.nix
+++ b/pkgs/development/libraries/haskell/entropy/default.nix
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "entropy";
-  version = "0.2.2";
-  sha256 = "1zri5qs19cbz9ydbh076q6834pspf2gqn06ssz4hsq6j65cnd9x2";
+  version = "0.2.2.1";
+  sha256 = "1yl1gmkmbalm27pjlpm9nhsbxpvxl8w7p8psq5apyrbdqnv9yhbg";
  meta = {
    homepage = "https://github.com/TomMD/entropy";
    description = "A platform independent entropy source";
--- a/pkgs/development/libraries/haskell/file-embed/default.nix
+++ b/pkgs/development/libraries/haskell/file-embed/default.nix
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "file-embed";
-  version = "0.0.4.7";
-  sha256 = "1hn08499kay0y6ik5z1s58s8r9h1nzf116avgi6ia4b565wpzkvi";
+  version = "0.0.4.8";
+  sha256 = "1jq4jdrxw822gzz7mc07nx4yj233mwmykp6xk371pf3hnq8rly0h";
  buildDepends = [ filepath ];
  testDepends = [ filepath HUnit ];
  meta = {
--- a/pkgs/development/libraries/haskell/fingertree/default.nix
+++ b/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";
-  sha256 = "00llr24b2r539250fangl0jj39gf26gjwvhjpy5qg8l920hrjn78";
+  version = "0.1.0.0";
+  sha256 = "0c35sryzsijwavvw9x1pk5p99rhmp4g8pjh2ds419mlfgxc039ms";
+  testDepends = [
+    HUnit QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2
+  ];
  meta = {
    description = "Generic finger-tree structure, with example instances";
    license = self.stdenv.lib.licenses.bsd3;
--- a/pkgs/development/libraries/haskell/ghc-vis/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix
@@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "ghc-vis";
-  version = "0.7.0.1";
-  sha256 = "0k6pm1lqmcmgdqzcdbygdyg6bgx4k0gi77k1mxwprgr9vv3ly26w";
+  version = "0.7.1";
+  sha256 = "05j3yw1276wvy4va7r7pbnvhjg1k1mxzp4baxcb9jlb5dxfh0daa";
  buildDepends = [
    cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text
    transformers xdot
--- a/pkgs/development/libraries/haskell/hledger-lib/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix
@@ -1,15 +1,21 @@
 { cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, prettyShow
-, regexCompat, regexpr, safe, split, time, transformers, utf8String
+, regexCompat, regexpr, safe, split, testFramework
+, testFrameworkHunit, time, transformers, utf8String
 }:

 cabal.mkDerivation (self: {
  pname = "hledger-lib";
-  version = "0.20.0.1";
-  sha256 = "1skm2jii7d8b6a6i98xwxckxwhikgj44823wqzdk8f3bq9zlwhcg";
+  version = "0.21.2";
+  sha256 = "07li348kmwz9j4bfgmkq7zs9nyqxi5hhydij2fg4jwj0hbfxvmy9";
  buildDepends = [
    cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat
    regexpr safe split time transformers utf8String
  ];
+  testDepends = [
+    cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat
+    regexpr safe split testFramework testFrameworkHunit time
+    transformers
+  ];
  meta = {
    homepage = "http://hledger.org";
    description = "Core data types, parsers and utilities for the hledger accounting tool";
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -1,26 +1,25 @@
 { cabal, blazeHtml, blazeMarkup, clientsession, cmdargs
-, dataDefault, filepath, hamlet, hjsmin, hledger, hledgerLib
-, httpConduit, HUnit, monadControl, networkConduit, parsec, regexpr
-, safe, shakespeareCss, shakespeareJs, shakespeareText, text, time
-, transformers, wai, waiExtra, waiHandlerLaunch, warp, yaml, yesod
-, yesodCore, yesodDefault, yesodForm, yesodStatic, yesodTest
+, dataDefault, filepath, hamlet, hjsmin, hledger, hledgerLib, hspec
+, httpConduit, HUnit, json, networkConduit, parsec, regexpr, safe
+, shakespeareText, text, time, transformers, wai, waiExtra
+, waiHandlerLaunch, warp, yaml, yesod, yesodCore, yesodPlatform
+, yesodStatic, yesodTest
 }:

 cabal.mkDerivation (self: {
  pname = "hledger-web";
-  version = "0.20.0.1";
-  sha256 = "0fq3wfsy2ykyplr66ac91yd2vwzfw3ji8mq9q4jn58nnh6bgxfa1";
+  version = "0.21.2";
+  sha256 = "1z8nyvqzyjh36g50w4gmh8mzvydanfn1s3gx4nliwk4mjfj4bbkl";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
    blazeHtml blazeMarkup clientsession cmdargs dataDefault filepath
-    hamlet hjsmin hledger hledgerLib httpConduit HUnit monadControl
-    networkConduit parsec regexpr safe shakespeareCss shakespeareJs
-    shakespeareText text time transformers wai waiExtra
-    waiHandlerLaunch warp yaml yesod yesodCore yesodDefault yesodForm
-    yesodStatic
+    hamlet hjsmin hledger hledgerLib httpConduit HUnit json
+    networkConduit parsec regexpr safe shakespeareText text time
+    transformers wai waiExtra waiHandlerLaunch warp yaml yesod
+    yesodCore yesodPlatform yesodStatic
  ];
-  testDepends = [ yesodCore yesodDefault yesodTest ];
+  testDepends = [ hspec yesod yesodTest ];
  doCheck = false;
  meta = {
    homepage = "http://hledger.org";
--- a/pkgs/development/libraries/haskell/hledger/default.nix
+++ b/pkgs/development/libraries/haskell/hledger/default.nix
@@ -1,18 +1,24 @@
-{ cabal, cmdargs, filepath, haskeline, hledgerLib, HUnit, mtl
-, parsec, regexpr, safe, shakespeareText, split, text, time
-, utf8String
+{ cabal, cmdargs, csv, filepath, haskeline, hledgerLib, HUnit, mtl
+, parsec, prettyShow, regexCompat, regexpr, safe, shakespeareText
+, split, testFramework, testFrameworkHunit, text, time
+, transformers, utf8String
 }:

 cabal.mkDerivation (self: {
  pname = "hledger";
-  version = "0.20.0.1";
-  sha256 = "0sdsxdydpmnarxz94py8rlbcffpan7l299ff7j9gn4f42z3sarw7";
+  version = "0.21.2";
+  sha256 = "04n9bm97zqh8am83fr2aflw3gv5nwm9jm7bp9vzd4986f1c43ig3";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
    cmdargs filepath haskeline hledgerLib HUnit mtl parsec regexpr safe
    shakespeareText split text time utf8String
  ];
+  testDepends = [
+    cmdargs csv filepath haskeline hledgerLib HUnit mtl parsec
+    prettyShow regexCompat regexpr safe shakespeareText split
+    testFramework testFrameworkHunit text time transformers
+  ];
  meta = {
    homepage = "http://hledger.org";
    description = "The main command-line interface for the hledger accounting tool";
--- a/pkgs/development/libraries/haskell/hsshellscript/default.nix
+++ b/pkgs/development/libraries/haskell/hsshellscript/default.nix
@@ -0,0 +1,15 @@
+{ cabal, c2hs, parsec, random }:
+
+cabal.mkDerivation (self: {
+  pname = "hsshellscript";
+  version = "3.3.1";
+  sha256 = "0z3afp3r1j1in03fv2yb5sfbzgcrhdig6gay683bzgh85glwxhlp";
+  buildDepends = [ parsec random ];
+  buildTools = [ c2hs ];
+  meta = {
+    homepage = "http://www.volker-wysk.de/hsshellscript/";
+    description = "Haskell for Unix shell scripting tasks";
+    license = "LGPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/language-java/default.nix
+++ b/pkgs/development/libraries/haskell/language-java/default.nix
@@ -0,0 +1,22 @@
+{ cabal, alex, cpphs, filepath, HUnit, mtl, parsec, QuickCheck, syb
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "language-java";
+  version = "0.2.4";
+  sha256 = "1fb36xq75mzmbsh25s0pscazvz6nvfy2mn1270653m7s3gdgcs5f";
+  buildDepends = [ cpphs parsec syb ];
+  testDepends = [
+    filepath HUnit mtl QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2
+  ];
+  buildTools = [ alex ];
+  doCheck = false;
+  meta = {
+    homepage = "http://github.com/vincenthz/language-java";
+    description = "Manipulating Java source: abstract syntax, lexer, parser, and pretty-printer";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/libffi/default.nix
+++ b/pkgs/development/libraries/haskell/libffi/default.nix
@@ -0,0 +1,13 @@
+{ cabal, libffi }:
+
+cabal.mkDerivation (self: {
+  pname = "libffi";
+  version = "0.1";
+  sha256 = "0g7jnhng3j7z5517aaqga0144aamibsbpgm3yynwyfzkq1kp0f28";
+  pkgconfigDepends = [ libffi ];
+  meta = {
+    description = "A binding to libffi";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/lifted-base/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-base/default.nix
@@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "lifted-base";
-  version = "0.2.0.5";
-  sha256 = "1an7wlz31szccbypbrh59i3py210mh7jbfi0zaizd32q0im1573r";
+  version = "0.2.1.0";
+  sha256 = "0c4vzyfyjvqv5q8mprgxf9ckibpp5k1zh9k5slmdsd9m1l3pwwqy";
  buildDepends = [
    baseUnicodeSymbols monadControl transformersBase
  ];
--- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
+++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "monadcryptorandom";
-  version = "0.5.1";
-  sha256 = "10waxc0i7hcqlgb9iwcdz0xqkym4ihavgwq466xlaqzzhcpp38d6";
+  version = "0.5.2";
+  sha256 = "0a0qx331c1kvhmwwam7pbbrnq8ky3spfnw6zsz6rz7g1lk1hfawn";
  buildDepends = [ cryptoApi mtl tagged transformers ];
  meta = {
    homepage = "https://github.com/TomMD/monadcryptorandom";
--- a/pkgs/development/libraries/haskell/mongoDB/default.nix
+++ b/pkgs/development/libraries/haskell/mongoDB/default.nix
@@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "mongoDB";
-  version = "1.3.2";
-  sha256 = "0gv0i2z6f797ibjfp16ax2aiqa66sclxjy8sabrwydwcyr96xb4y";
+  version = "1.4.0";
+  sha256 = "1cj73k6lfpxmfaigqwwglnncfl1ikz6yjgs0d9f6k42kwysbddwz";
  buildDepends = [
    binary bson cryptohash liftedBase monadControl mtl network parsec
    random randomShuffle text transformersBase
--- a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix
@@ -0,0 +1,13 @@
+{ cabal, pipes, stm }:
+
+cabal.mkDerivation (self: {
+  pname = "pipes-concurrency";
+  version = "1.2.0";
+  sha256 = "058v9d3wf9n1d25rhdq5vj60p8mll5yv2zn2k1092bg7qisip1fq";
+  buildDepends = [ pipes stm ];
+  meta = {
+    description = "Concurrency for the pipes ecosystem";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/pipes-parse/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-parse/default.nix
@@ -0,0 +1,13 @@
+{ cabal, pipes }:
+
+cabal.mkDerivation (self: {
+  pname = "pipes-parse";
+  version = "1.0.0";
+  sha256 = "0fk39a6d0ik5ghwyj6yyi9d0cj2sp22812fin7amcxcafrplf88w";
+  buildDepends = [ pipes ];
+  meta = {
+    description = "Parsing infrastructure for the pipes ecosystem";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/pipes-safe/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-safe/default.nix
@@ -0,0 +1,13 @@
+{ cabal, pipes, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "pipes-safe";
+  version = "1.2.0";
+  sha256 = "0ki9i9378j8kgw5dd91b38r686pcr9fl2vf9dfgfshia072ppggj";
+  buildDepends = [ pipes transformers ];
+  meta = {
+    description = "Safety for the pipes ecosystem";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/pipes/default.nix
+++ b/pkgs/development/libraries/haskell/pipes/default.nix
@@ -0,0 +1,13 @@
+{ cabal, mmorph, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "pipes";
+  version = "3.3.0";
+  sha256 = "1bgznfv7hxqwj5f7vkm8d41phw63bl2swzr0wrz0pcqxlr42likb";
+  buildDepends = [ mmorph transformers ];
+  meta = {
+    description = "Compositional pipelines";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
@@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "postgresql-simple";
-  version = "0.3.3.0";
-  sha256 = "0srkalfg41gdnzwwa2bmwwrcdqnw13f7b94wv4d5a6sg6yf1ry1l";
+  version = "0.3.3.1";
+  sha256 = "0fqndncfy6yg27ndfaqyqd2q9wrbabkdq388s4q9m7maj222xlb9";
  buildDepends = [
    attoparsec blazeBuilder blazeTextual postgresqlLibpq text time
    transformers vector
--- a/pkgs/development/libraries/haskell/repa-examples/default.nix
+++ b/pkgs/development/libraries/haskell/repa-examples/default.nix
@@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "repa-examples";
-  version = "3.2.3.1";
-  sha256 = "1lflgpnig2ks2mwp7bywyjqr2v426gbk1675mkkvjncgr5ahf11g";
+  version = "3.2.3.2";
+  sha256 = "1l8bvaaap5gl62j9zinjgj8vlqq4b52p46hnj8kq9n09lxq6xq96";
  isLibrary = false;
  isExecutable = true;
  buildDepends = [
--- a/pkgs/development/libraries/haskell/repa/default.nix
+++ b/pkgs/development/libraries/haskell/repa/default.nix
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "repa";
-  version = "3.2.3.2";
-  sha256 = "0xwaqkir4gjlhnvd1r69ycswg4p65ig38d2np69hv195zr47pmvh";
+  version = "3.2.3.3";
+  sha256 = "0rdny7yjcmz9iy07sqnjmwyr58f0kyzzdycwi55j963rb4vqkacn";
  buildDepends = [ QuickCheck vector ];
  meta = {
    homepage = "http://repa.ouroborus.net";
--- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
@@ -1,10 +1,11 @@
-{ cabal, parsec, shakespeare, text }:
+{ cabal, hspec, parsec, shakespeare, text }:

 cabal.mkDerivation (self: {
  pname = "shakespeare-i18n";
-  version = "1.0.0.2";
-  sha256 = "11ydkl6v31v79q8a8fqf4p99p7dv9dlimr3rhi9cs5lrxz9gmf5z";
+  version = "1.0.0.3";
+  sha256 = "0k5daz6ayc4d6zxsq7p27bp5fq4qr31qxw9z9mwb5xcz2404d00r";
  buildDepends = [ parsec shakespeare text ];
+  testDepends = [ hspec text ];
  meta = {
    homepage = "http://www.yesodweb.com/book/shakespearean-templates";
    description = "A type-based approach to internationalization";
--- a/pkgs/development/libraries/haskell/stm-chans/default.nix
+++ b/pkgs/development/libraries/haskell/stm-chans/default.nix
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "stm-chans";
-  version = "2.0.0";
-  sha256 = "041dmjmr70was4vxf1ihizzarms7a8x53m80i65ggxxmq5xqmsa3";
+  version = "3.0.0";
+  sha256 = "1nnl5h88dshcmk0ydhkf84kkf6989igxry9r0z7lwlxfgf7q9nim";
  buildDepends = [ stm ];
  meta = {
    homepage = "http://code.haskell.org/~wren/";
--- a/pkgs/development/libraries/haskell/stm-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix
@@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "stm-conduit";
-  version = "2.0.0";
-  sha256 = "015gz4fqijgcs6dls5l8ry47q4a33a6ik0hsj5mw48iw44af39jr";
+  version = "2.1.0";
+  sha256 = "0rxnw7kpxvhwmpbn2v9ps0b2hw9321817nyywjjq3x8fadg8w99l";
  buildDepends = [ conduit resourcet stm stmChans transformers ];
  testDepends = [
    conduit HUnit QuickCheck stm stmChans testFramework
--- a/pkgs/development/libraries/haskell/tls-extra/default.nix
+++ b/pkgs/development/libraries/haskell/tls-extra/default.nix
@@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "tls-extra";
-  version = "0.6.3";
-  sha256 = "1ng8h3v5px63fpb4y3sd47djzpksyzzavilsdnp1kd453abpmx9l";
+  version = "0.6.4";
+  sha256 = "058ia1cabs7ribz287iqkkjvqpp2n7c219f3xc92fhm0qq00mh5n";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -10,8 +10,8 @@

 cabal.mkDerivation (self: {
  pname = "yesod-core";
-  version = "1.2.1";
-  sha256 = "1p9xaw0d9dx68q7i99kjcqy1lhmd164drbcw3489560wa71mwamk";
+  version = "1.2.2";
+  sha256 = "1fapqx1lrhhqjc9k9yc964sxnawj7ga62w83csbkkhwq3g5425yp";
  buildDepends = [
    aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
    caseInsensitive cereal clientsession conduit cookie dataDefault
--- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
@@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "yesod-persistent";
-  version = "1.2.0";
-  sha256 = "1gzzs62mnx2q15sm3hvlk18qjgk3bi828klgl2ckc0462f7z8d0k";
+  version = "1.2.1";
+  sha256 = "06kzxdbg3xw128zlacsf51qi7qnccw0gjnwscxshljgipiicfhfc";
  buildDepends = [
    blazeBuilder conduit liftedBase persistent persistentTemplate
    poolConduit resourcet transformers yesodCore
--- a/pkgs/development/libraries/haskell/yesod-platform/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix
@@ -0,0 +1,65 @@
+{ cabal, aeson, ansiTerminal, asn1Data, asn1Types, attoparsec
+, attoparsecConduit, authenticate, base64Bytestring
+, baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml
+, blazeMarkup, byteorder, caseInsensitive, cereal, certificate
+, cipherAes, cipherRc4, clientsession, conduit, cookie, cprngAes
+, cryptoApi, cryptoConduit, cryptohash, cryptoNumbers, cryptoPubkey
+, cryptoPubkeyTypes, cryptoRandomApi, cssText, dataDefault
+, dataDefaultClass, dataDefaultInstancesBase
+, dataDefaultInstancesContainers, dataDefaultInstancesDlist
+, dataDefaultInstancesOldLocale, dateCache, dlist, emailValidate
+, entropy, failure, fastLogger, fileEmbed, filesystemConduit
+, hamlet, hashable, hjsmin, hspec, hspecExpectations, htmlConduit
+, httpConduit, httpDate, httpTypes, languageJavascript, liftedBase
+, mimeMail, mimeTypes, mmorph, monadControl, monadLogger
+, networkConduit, pathPieces, pem, persistent, persistentTemplate
+, poolConduit, primitive, publicsuffixlist, pureMD5, pwstoreFast
+, quickcheckIo, resourcePool, resourcet, safe, semigroups, setenv
+, SHA, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs
+, shakespeareText, silently, simpleSendfile, skein, socks
+, stringsearch, systemFileio, systemFilepath, tagged, tagsoup
+, tagstreamConduit, tls, tlsExtra, transformersBase, unixCompat
+, unorderedContainers, utf8Light, utf8String, vault, vector, void
+, wai, waiAppStatic, waiExtra, waiLogger, waiTest, warp, word8
+, xmlConduit, xmlTypes, xssSanitize, yaml, yesod, yesodAuth
+, yesodCore, yesodForm, yesodPersistent, yesodRoutes, yesodStatic
+, yesodTest, zlibBindings, zlibConduit
+}:
+
+cabal.mkDerivation (self: {
+  pname = "yesod-platform";
+  version = "1.2.1";
+  sha256 = "1wa1g37ipigscv8xwb5zyfawjw0fxqmwr2l6wdf507r0kvclk2ap";
+  buildDepends = [
+    aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit
+    authenticate base64Bytestring baseUnicodeSymbols blazeBuilder
+    blazeBuilderConduit blazeHtml blazeMarkup byteorder caseInsensitive
+    cereal certificate cipherAes cipherRc4 clientsession conduit cookie
+    cprngAes cryptoApi cryptoConduit cryptohash cryptoNumbers
+    cryptoPubkey cryptoPubkeyTypes cryptoRandomApi cssText dataDefault
+    dataDefaultClass dataDefaultInstancesBase
+    dataDefaultInstancesContainers dataDefaultInstancesDlist
+    dataDefaultInstancesOldLocale dateCache dlist emailValidate entropy
+    failure fastLogger fileEmbed filesystemConduit hamlet hashable
+    hjsmin hspec hspecExpectations htmlConduit httpConduit httpDate
+    httpTypes languageJavascript liftedBase mimeMail mimeTypes mmorph
+    monadControl monadLogger networkConduit pathPieces pem persistent
+    persistentTemplate poolConduit primitive publicsuffixlist pureMD5
+    pwstoreFast quickcheckIo resourcePool resourcet safe semigroups
+    setenv SHA shakespeare shakespeareCss shakespeareI18n shakespeareJs
+    shakespeareText silently simpleSendfile skein socks stringsearch
+    systemFileio systemFilepath tagged tagsoup tagstreamConduit tls
+    tlsExtra transformersBase unixCompat unorderedContainers utf8Light
+    utf8String vault vector void wai waiAppStatic waiExtra waiLogger
+    waiTest warp word8 xmlConduit xmlTypes xssSanitize yaml yesod
+    yesodAuth yesodCore yesodForm yesodPersistent yesodRoutes
+    yesodStatic yesodTest zlibBindings zlibConduit
+  ];
+  jailbreak = true;
+  meta = {
+    homepage = "http://www.yesodweb.com/";
+    description = "Meta package for Yesod";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/yesod-routes/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "yesod-routes";
-  version = "1.2.0";
-  sha256 = "1d7z0v6jrl08w7qz3apwdjss3vq151y28l7231cpqiia46damib2";
+  version = "1.2.0.1";
+  sha256 = "0pp7g3ccd0swh1j62am1vg9r2gh65jcci5w2n4r42sqzfnql0i8z";
  buildDepends = [ pathPieces text vector ];
  testDepends = [ hspec HUnit pathPieces text ];
  meta = {
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -6,8 +6,8 @@

 cabal.mkDerivation (self: {
  pname = "yesod";
-  version = "1.2.0.1";
-  sha256 = "1whkw0lmkyja2j6vbfcf5rjmmhmc85r4arjwjrvdmz6jkjyqham3";
+  version = "1.2.1";
+  sha256 = "19gwhav6sr6gd2kh92ga8a09hq9grllmnacdqkgasxwjsfxqa6zg";
  buildDepends = [
    aeson blazeHtml blazeMarkup dataDefault hamlet monadControl
    networkConduit safe shakespeareCss shakespeareJs text transformers
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -1,18 +1,16 @@
 { stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl, sqlite} :

 stdenv.mkDerivation rec {
-  name = "heimdal-1.3.3";
+  name = "heimdal-1.5.2";

  src = fetchurl {
    urls = [
      "http://www.h5l.org/dist/src/${name}.tar.gz"
      "http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz"
    ];
-    sha256 = "0c465by1g7niy3nkfs5mwrm6j6w2cvrf4988h3lpmj194lkjp3cc";
+    sha256 = "22603f282f31173533b939d289f3374258aa1ccccbe51ee088d7568d321279ec";
  };

-  patches = [ ./no-md2.patch ];
-  
  ## ugly, X should be made an option
  configureFlags = [
    "--with-openldap=${openldap}"
@@ -21,7 +19,7 @@ stdenv.mkDerivation rec {
  ];
  # dont succeed with --libexec=$out/sbin, so
  postInstall = ''
-    mv $out/libexec/* $out/sbin/
+    mv "$out/libexec/"* $out/sbin/
    rmdir $out/libexec
  '';

--- a/pkgs/development/libraries/kerberos/no-md2.patch
+++ b/pkgs/development/libraries/kerberos/no-md2.patch
@@ -1,46 +0,0 @@
-http://old.nabble.com/-patch--fix-build-with-openssl-1.0-td28388913.html
-
-diff -Naur -x '*~' heimdal-1.3.2/include/crypto-headers.h heimdal-1.3.2-fix-build-openssl-1.0/include/crypto-headers.h
--- heimdal-1.3.2/include/crypto-headers.h 2010-03-22 05:11:24.000000000 +0100
-+++ heimdal-1.3.2-fix-build-openssl-1.0/include/crypto-headers.h 2010-04-28 14:54:53.000000000 +0200
-@@ -13,7 +13,9 @@
- #include <openssl/des.h>
- #include <openssl/rc4.h>
- #include <openssl/rc2.h>
-+#ifdef HAVE_OPENSSL_MD2_H
- #include <openssl/md2.h>
-+#endif
- #include <openssl/md4.h>
- #include <openssl/md5.h>
- #include <openssl/sha.h>
-diff -Naur -x '*~' heimdal-1.3.2/lib/hx509/crypto.c heimdal-1.3.2-fix-build-openssl-1.0/lib/hx509/crypto.c
--- heimdal-1.3.2/lib/hx509/crypto.c 2010-03-22 05:11:24.000000000 +0100
-+++ heimdal-1.3.2-fix-build-openssl-1.0/lib/hx509/crypto.c 2010-04-28 15:12:20.000000000 +0200
-@@ -1354,6 +1354,7 @@
-     NULL
- };
- 
-+#ifdef HAVE_OPENSSL_MD2_H
- static const struct signature_alg md2_alg = {
-     "rsa-md2",
-     &asn1_oid_id_rsa_digest_md2,
-@@ -1366,6 +1367,7 @@
-     evp_md_verify_signature,
-     NULL
- };
-+#endif
- 
- /*
-  * Order matter in this structure, "best" first for each "key
-@@ -1387,7 +1389,9 @@
-     &sha256_alg,
-     &sha1_alg,
-     &md5_alg,
-+#ifdef HAVE_OPENSSL_MD2_H
-     &md2_alg,
-+#endif
-     NULL
- };
- 
-
-
--- a/pkgs/development/libraries/libf2c/default.nix
+++ b/pkgs/development/libraries/libf2c/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, unzip}:

 stdenv.mkDerivation rec {
-  name = "libf2c";
+  name = "libf2c-20100903";
  
  src = fetchurl {
    url = http://www.netlib.org/f2c/libf2c.zip;
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}:

 stdenv.mkDerivation rec {
-  name = "libgphoto2-2.4.14";
+  name = "libgphoto2-2.5.2";

  src = fetchurl {
    url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr";
+    sha256 = "0f1818l1vs5fbmrihzyv3qasddbqi3r01jik5crrxddwalsi2bd3";
  };
  
  nativeBuildInputs = [ pkgconfig gettext ];
--- a/pkgs/development/libraries/libixp_for_wmii/default.nix
+++ b/pkgs/development/libraries/libixp_for_wmii/default.nix
@@ -1,6 +1,6 @@
 args: with args;
 stdenv.mkDerivation {
-  name = "libixp_for_wmii";
+  name = "libixp_for_wmii-0.4";
  phases = "unpackPhase installPhase";
  installPhase = "
     export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g')
--- a/pkgs/development/libraries/libotr/3.2.nix
+++ b/pkgs/development/libraries/libotr/3.2.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, libgcrypt}:

 stdenv.mkDerivation {
-  name = "libotr-3.2.0";
+  name = "libotr-3.2.1";
  src = fetchurl {
    url = http://www.cypherpunks.ca/otr/libotr-3.2.0.tar.gz;
    sha256 = "14v6idnqpp2vhgir9bzp1ay2gmhqsb8iavrkwmallakfwch9sfyq";
--- a/pkgs/development/libraries/libyaml/default.nix
+++ b/pkgs/development/libraries/libyaml/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:

 stdenv.mkDerivation {
-  name = "libyaml";
+  name = "libyaml-0.1.3";

  src = fetchurl {
    url = http://pyyaml.org/download/libyaml/yaml-0.1.3.tar.gz;
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, SDL, ffmpeg, libdv, libsamplerate, libvorbis
-, libxml2 , pkgconfig, qt4, sox }:
+, libxml2 , pkgconfig, qt4, sox, gtk2 }:

 stdenv.mkDerivation rec {
  name = "mlt-${version}";
@@ -10,18 +10,20 @@ stdenv.mkDerivation rec {
    sha256 = "0m4nzxli1pl8w59m4iwwhpmr1xdz7xfknmbl3a0mkkd1jzdiq3nc";
  };

-  buildInputs = 
+  buildInputs =
    [ SDL ffmpeg libdv libsamplerate libvorbis libxml2 pkgconfig qt4
-      sox
+      sox # gtk2 /*optional*/
    ];

  # Mostly taken from:
  # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine
-  configureFlags = [ "--enable-gpl" "--avformat-swscale" ];
+  configureFlags = [ "--enable-gpl" "--enable-gpl3" "--avformat-swscale" ];
+
+  enableParallelBuilding = true;

  meta = {
    homepage = http://www.mltframework.org/;
    description = "Open source multimedia framework, designed for television broadcasting";
-    license = "GPLv2+";
+    license = "GPLv3";
  };
 }
--- a/pkgs/development/libraries/nettle/default.nix
+++ b/pkgs/development/libraries/nettle/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, gmp, gnum4 }:

 stdenv.mkDerivation (rec {
-  name = "nettle-2.5";
+  name = "nettle-2.7.1";

  src = fetchurl {
    url = "mirror://gnu/nettle/${name}.tar.gz";
-    sha256 = "0wicr7amx01l03rm0pzgr1qvw3f9blaw17vjsy1301dh13ll58aa";
+    sha256 = "0h2vap31yvi1a438d36lg1r1nllfx3y19r4rfxv7slrm6kafnwdw";
  };

  buildInputs = [ gnum4 ];
@@ -15,6 +15,9 @@ stdenv.mkDerivation (rec {

  enableParallelBuilding = true;

+  # It doesn't build otherwise
+  dontDisableStatic = true;
+
  patches = stdenv.lib.optional (stdenv.system == "i686-cygwin")
              ./cygwin.patch;

--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl }:

-let version = "4.9.6"; in
+let version = "4.10"; in

 stdenv.mkDerivation {
  name = "nspr-${version}";

  src = fetchurl {
    url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha256 = "1yf6sr21fisr0mlh4cq0ymcfp8nsvjskmx8dlm9mvhaw7kfzv4vn";
+    sha1 = "10dbf68c07497dab30be09db526931c885d5a7e9";
  };

-  preConfigure = "cd mozilla/nsprpub";
+  preConfigure = "cd nspr";

  configureFlags = "--enable-optimize --disable-debug ${if stdenv.is64bit then "--enable-64bit" else ""}";

--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -10,6 +10,9 @@
 , flashplayerFix ? false, gdk_pixbuf
 , gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs
 , developerBuild ? false
+, docs ? false
+, examples ? false
+, demos ? false
 }:

 with stdenv.lib;
@@ -72,7 +75,9 @@ stdenv.mkDerivation rec {
      -exceptions -xmlpatterns

      -make libs -make tools -make translations
-      -nomake demos -nomake examples -nomake docs
+      -${if demos then "" else "no"}make demos
+      -${if examples then "" else "no"}make examples
+      -${if docs then "" else "no"}make docs

      -no-phonon ${if buildWebkit then "" else "-no"}-webkit ${if buildMultimedia then "" else "-no"}-multimedia -audio-backend
      ${if developerBuild then "-developer-build" else ""}
--- a/pkgs/development/libraries/science/biology/biolib/default.nix
+++ b/pkgs/development/libraries/science/biology/biolib/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, rLang, zlib }:

 stdenv.mkDerivation rec {
-  name = "biolib";
+  name = "biolib-${version}";
  
  version = "0.0.1";
  
--- a/pkgs/development/libraries/smpeg/default.nix
+++ b/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 {
--- a/pkgs/development/libraries/x264/default.nix
+++ b/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";