From d5d53b4710fb7a09ec777430c63238c65586eba0 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 3 Oct 2011 16:55:33 +0000
Subject: [PATCH 01/16] boolstuff-0.1.13

svn path=/nixpkgs/trunk/; revision=29602
---
 pkgs/development/libraries/boolstuff/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix
index 419215a45a5..c05fddc18cf 100644
--- a/pkgs/development/libraries/boolstuff/default.nix
+++ b/pkgs/development/libraries/boolstuff/default.nix
@@ -1,18 +1,20 @@
 { stdenv, fetchurl, pkgconfig }:
 
-stdenv.mkDerivation {
-  name = "boolstuff-0.1.12";
+let baseurl = "http://perso.b2b2c.ca/sarrazip/dev"; in
+
+stdenv.mkDerivation rec {
+  name = "boolstuff-0.1.13";
 
   src = fetchurl {
-    url = http://perso.b2b2c.ca/sarrazip/dev/boolstuff-0.1.12.tar.gz;
-    sha256 = "0h39civar6fjswaf3bn1r2ddj589rya0prd6gzsyv3qzr9srprq9";
+    url = "${baseurl}/${name}.tar.gz";
+    sha256 = "0akwb57lnzq1ak32k6mdxbma2gj0pqhj8y9m6hq79djb9s3mxvmn";
   };
 
-  buildInputs = [ pkgconfig ];
+  buildNativeInputs = [ pkgconfig ];
 
   meta = { 
     description = "Library for operations on boolean expression binary trees";
-    homepage = http://perso.b2b2c.ca/sarrazip/dev/boolstuff.html;
+    homepage = "${baseurl}/boolstuff.html";
     license = "GPL";
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;

From 492c7016d09afd0000060a176870177d82bafac0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Oct 2011 20:20:58 +0000
Subject: [PATCH 02/16] haskell-hamlet: updated to version 0.10.2

svn path=/nixpkgs/trunk/; revision=29607
---
 .../libraries/haskell/hamlet/{0.10.1.nix => 0.10.2.nix}       | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/hamlet/{0.10.1.nix => 0.10.2.nix} (86%)

diff --git a/pkgs/development/libraries/haskell/hamlet/0.10.1.nix b/pkgs/development/libraries/haskell/hamlet/0.10.2.nix
similarity index 86%
rename from pkgs/development/libraries/haskell/hamlet/0.10.1.nix
rename to pkgs/development/libraries/haskell/hamlet/0.10.2.nix
index e3b80dd1edc..1992be553b2 100644
--- a/pkgs/development/libraries/haskell/hamlet/0.10.1.nix
+++ b/pkgs/development/libraries/haskell/hamlet/0.10.2.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "0.10.1";
-  sha256 = "1n68nz2s61j8yfwjpgp9bjl0mc7gcpc5ysmx0vgggqxz2r3gayf6";
+  version = "0.10.2";
+  sha256 = "1p4dz1h640ryhj7prks7qazqyx0l79hi7130ksfchlb5mprz6wq2";
   buildDepends = [
     blazeBuilder blazeHtml failure parsec shakespeare text
   ];
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 907a6dac911..a2c2e88830a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -651,8 +651,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   };
 
   hamlet_0_8_2_1 = callPackage ../development/libraries/haskell/hamlet/0.8.2.1.nix {};
-  hamlet_0_10_1 = callPackage ../development/libraries/haskell/hamlet/0.10.1.nix {};
-  hamlet = self.hamlet_0_10_1;
+  hamlet_0_10_2 = callPackage ../development/libraries/haskell/hamlet/0.10.2.nix {};
+  hamlet = self.hamlet_0_10_2;
 
   happstackData = callPackage ../development/libraries/haskell/happstack/happstack-data.nix {};
 

From 160b7547f3bc952f99e518537dbb015ccf555799 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Oct 2011 20:21:03 +0000
Subject: [PATCH 03/16] haskell-clientsession: updated to version 0.7.3.1

svn path=/nixpkgs/trunk/; revision=29608
---
 pkgs/development/libraries/haskell/clientsession/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
index 2c577fbc2ef..c5096ae9a77 100644
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "clientsession";
-  version = "0.7.3";
-  sha256 = "1f5ri7h8l3v60bj6ywhn2v3kih5lclk76qx7y6jc7nyf9499aja5";
+  version = "0.7.3.1";
+  sha256 = "0q16brla4m5g7dmgln3awx964ms7pi1s2r21idmc0mk4rnw2rpi7";
   buildDepends = [
     base64Bytestring cereal cryptoApi cryptocipher skein
   ];

From 3f7a541c5104d688587ba69e390ae31789451ffa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Oct 2011 20:21:07 +0000
Subject: [PATCH 04/16] haskell-persistent-template: updated to version 0.6.3

svn path=/nixpkgs/trunk/; revision=29609
---
 .../libraries/haskell/persistent-template/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index af69ad9d267..67d8e10a3ef 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "0.6.2";
-  sha256 = "1gnqryn701b97fwzjhkk4x4k7p1w5w8cdn5x9hz8sb68vkgrplfx";
+  version = "0.6.3";
+  sha256 = "1vcjvfjxmv9c0wg7pbx0lw73128f5y0r4sfdsyq3jrkkiq1bgsxa";
   buildDepends = [ monadControl persistent text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";

From e12400f5f147252cdd782349261cf08ad9a6c701 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Oct 2011 20:21:11 +0000
Subject: [PATCH 05/16] haskell-persistent: updated to version 0.6.3

svn path=/nixpkgs/trunk/; revision=29610
---
 .../libraries/haskell/persistent/default.nix         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 9329faad348..879edcbcb7b 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -1,14 +1,14 @@
-{ cabal, blazeHtml, enumerator, monadControl, mtl, pathPieces, pool
-, sqlite, text, time, transformers
+{ cabal, blazeHtml, dataObject, enumerator, monadControl, mtl
+, pathPieces, pool, sqlite, text, time, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "0.6.2";
-  sha256 = "1bzv3wqqy32z20xbda8kr4m1fybnziv0gp6m8v3w0brrvmns20g2";
+  version = "0.6.3";
+  sha256 = "0m50z9k941bhh05jjz1268sn1bi7w8i6jzccldgnbjjvsw2xaisx";
   buildDepends = [
-    blazeHtml enumerator monadControl mtl pathPieces pool text time
-    transformers
+    blazeHtml dataObject enumerator monadControl mtl pathPieces pool
+    text time transformers
   ];
   extraLibraries = [ sqlite ];
   meta = {

From de15159ea04af35e0280dc995aa649e10562b5ed Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Oct 2011 20:21:15 +0000
Subject: [PATCH 06/16] haskell-shakespeare-css: updated to version 0.10.2

svn path=/nixpkgs/trunk/; revision=29611
---
 .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index 0bc2f187fb2..65f2debed9c 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "0.10.1";
-  sha256 = "1qdql6qcm7jzb5r1fvrmpyighn1ykrjgs9za1n9m2r47y0n03hsg";
+  version = "0.10.2";
+  sha256 = "181bknfws2s7jygy527w93v07i04xf1pwyfmylva59p0z45adlb4";
   buildDepends = [ parsec shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";

From d4abe9ac3ffc7a9343b975b4df4b59ce2c7683b9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Oct 2011 20:21:19 +0000
Subject: [PATCH 07/16] haskell-shakespeare-js: updated to version 0.10.2

svn path=/nixpkgs/trunk/; revision=29612
---
 pkgs/development/libraries/haskell/shakespeare-js/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index 064e1828f9d..5a402840d71 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "0.10.1";
-  sha256 = "0j9jzrnvarwkab9zynz8k60ilgj5kyqdm56lricpii27qlkqnmf3";
+  version = "0.10.2";
+  sha256 = "1yyqfp2lj8vq7x2a74wrgm7kx6zp1djp67bls9ip74kxi24dbznv";
   buildDepends = [ shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";

From 96ca3cf9df130fc3ce8aef0d1d3b5b365b989886 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Oct 2011 20:21:23 +0000
Subject: [PATCH 08/16] haskell-shakespeare-text: updated to version 0.10.2

svn path=/nixpkgs/trunk/; revision=29613
---
 .../libraries/haskell/shakespeare-text/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
index 7c8cfceef17..58ffa1404fc 100644
--- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-text";
-  version = "0.10.1";
-  sha256 = "1p05nsfmlibhpik6dd40m0djk5yckl4i2ylx9lwyi68lx0izbm5j";
+  version = "0.10.2";
+  sha256 = "04n1aflg4b5byfsg494d4dskx25nyy0a654wl4cxz8920sl7qpha";
   buildDepends = [ shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";

From 8855e4e69bb8fda84e4ce11bba85566c0945a90a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Oct 2011 20:21:27 +0000
Subject: [PATCH 09/16] haskell-shakespeare: updated to version 0.10.1.1

svn path=/nixpkgs/trunk/; revision=29614
---
 .../development/libraries/haskell/shakespeare/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
index 409b9b838a4..1c57e45713c 100644
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare/default.nix
@@ -1,10 +1,10 @@
-{ cabal, blazeBuilder, blazeHtml, failure, parsec, text }:
+{ cabal, parsec, text }:
 
 cabal.mkDerivation (self: {
   pname = "shakespeare";
-  version = "0.10.1";
-  sha256 = "1ckzfxrs65n8cx0hm64c3jd4hbw48x1vi0cvnkz39k500jpq874f";
-  buildDepends = [ blazeBuilder blazeHtml failure parsec text ];
+  version = "0.10.1.1";
+  sha256 = "1qd5wrcr4ss5zigbb7s6c7y7qbvrnbvgdpwq985yyy71i5hwxv0a";
+  buildDepends = [ parsec text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";
     description = "A toolkit for making compile-time interpolated templates";

From 717d0a154df9c6ae4a260937341e78e770be8416 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Oct 2011 20:21:31 +0000
Subject: [PATCH 10/16] haskell-wai-app-static: updated to version 0.3.4

svn path=/nixpkgs/trunk/; revision=29615
---
 pkgs/development/libraries/haskell/wai-app-static/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index 3fa0595bc13..2ef32922346 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-app-static";
-  version = "0.3.3";
-  sha256 = "04b4cw93agw136xjh9rssiw96vz3kxji7zh209brwfnwh13bra17";
+  version = "0.3.4";
+  sha256 = "0jxlm0qfv59c3q6ngvr94rzrn01byfn3wak208ws18xhk14cv058";
   buildDepends = [
     base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed
     httpDate httpTypes text time transformers unixCompat wai

From 6b4095a1a082e35ff1ba5eae11db70fd0cdf07ac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Oct 2011 20:21:35 +0000
Subject: [PATCH 11/16] haskell-wai-extra: updated to version 0.4.3

svn path=/nixpkgs/trunk/; revision=29616
---
 pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index 9fce21f06db..7a06bfb1958 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "0.4.2";
-  sha256 = "1k2dsjramy14rfd1j8k7zgirdfl2zybd0z0pxkvxdrgr9s2pk51y";
+  version = "0.4.3";
+  sha256 = "07m86khgfyyadjgq8yp9kj3ljlpkvf209b1cfz2x7n5wdq8k2wm9";
   buildDepends = [
     blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator
     httpTypes network text time transformers wai zlibBindings

From fc77db6d2125326a276b214c2b8f4e919db6d081 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 3 Oct 2011 20:42:45 +0000
Subject: [PATCH 12/16] * Wine 1.3.29.

svn path=/nixpkgs/trunk/; revision=29617
---
 pkgs/misc/emulators/wine/default.nix             | 16 ++++++----------
 pkgs/misc/emulators/wine/src-for-default.nix     |  9 ---------
 .../misc/emulators/wine/src-info-for-default.nix |  6 ------
 3 files changed, 6 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/misc/emulators/wine/src-for-default.nix
 delete mode 100644 pkgs/misc/emulators/wine/src-info-for-default.nix

diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 51711c7c528..17755a17b7b 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -6,21 +6,17 @@
 assert stdenv.isLinux;
 assert stdenv.gcc.gcc != null;
 
-let
-  s = import ./src-for-default.nix;
-in
-
 stdenv.mkDerivation rec {
-  name = "wine-${s.version}";
+  name = "wine-1.3.29";
 
   src = fetchurl {
-    url = s.url;
-    sha256 = s.hash;
+    url = "mirror://sourceforge/wine/${name}.tar.bz2";
+    sha256 = "1mi4xzbpqmian9q5bs6df8b1mfgnnd4mlh0kb2ynbpk7kmx0zyj1";
   };
 
   gecko = fetchurl {
-    url = "http://downloads.sourceforge.net/wine/wine_gecko-1.1.0-x86.cab";
-    sha256 = "0a8bpqqhx146innrdwhn4c0jqi90mkmp8kw6aqwildm073yy31hp";
+    url = "mirror://sourceforge/wine/wine_gecko-1.3-x86.msi";
+    sha256 = "1bmm826dhq82jzxdld4x9cyg8mgzg8llkki59n9fvxggi7l5jxab";
   };
 
   buildInputs = [
@@ -45,7 +41,7 @@ stdenv.mkDerivation rec {
   # elements specified above.
   dontPatchELF = true;
 
-  postInstall = "install -D ${gecko} $out/share/wine/gecko/wine_gecko-1.1.0-x86.cab";
+  postInstall = "install -D ${gecko} $out/share/wine/gecko/${gecko.name}";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/misc/emulators/wine/src-for-default.nix b/pkgs/misc/emulators/wine/src-for-default.nix
deleted file mode 100644
index b6669843896..00000000000
--- a/pkgs/misc/emulators/wine/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="1.3.27";
-   name="wine-1.3.27";
-   hash="1vdyxlsl2zlhlcl5npq59axlkvjmkp7yz5p9rvwkqia79xrs8qv1";
-   url="http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2";
-   advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.27.tar.bz2";
-  
-  
-}
diff --git a/pkgs/misc/emulators/wine/src-info-for-default.nix b/pkgs/misc/emulators/wine/src-info-for-default.nix
deleted file mode 100644
index 5f25399a0de..00000000000
--- a/pkgs/misc/emulators/wine/src-info-for-default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  downloadPage = "http://www.winehq.org/";
-  baseName = "wine";
-  versionExtractorSedScript = ''s/[^-]*-(.+)[.]tar[.].*/\1/'';
-  versionReferenceCreator = ''$(replaceAllVersionOccurences)'';
-}

From 8c40562197ae848e742d346356ebfc3b58686ae9 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Tue, 4 Oct 2011 01:40:45 +0000
Subject: [PATCH 13/16] New package for CamlIDL 1.05

svn path=/nixpkgs/trunk/; revision=29619
---
 .../tools/ocaml/camlidl/default.nix           | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/tools/ocaml/camlidl/default.nix

diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix
new file mode 100644
index 00000000000..8f77c0c6fc0
--- /dev/null
+++ b/pkgs/development/tools/ocaml/camlidl/default.nix
@@ -0,0 +1,32 @@
+{stdenv, fetchurl, makeWrapper, ocaml, ncurses}:
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+  pname = "camlidl";
+  version = "1.05";
+  webpage = "http://caml.inria.fr/pub/old_caml_site/camlidl/";
+in
+stdenv.mkDerivation {
+
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://caml.inria.fr/pub/old_caml_site/distrib/bazar-ocaml/${pname}-${version}.tar.gz";
+    sha256 = "0483cs66zsxsavcllpw1qqvyhxb39ddil3h72clcd69g7fyxazl5";
+  };
+
+  buildInputs = [ ocaml ];
+
+  preBuild = ''
+    mv config/Makefile.unix config/Makefile
+    substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out
+    substituteInPlace config/Makefile --replace OCAMLLIB=/usr/local/lib/ocaml OCAMLLIB=$out/lib/ocaml/${ocaml_version}/site-lib/camlidl
+    ensureDir $out/lib/ocaml/${ocaml_version}/site-lib/camlidl/caml
+  '';
+
+  meta = {
+    description = "CamlIDL is a stub code generator and COM binding for Objective Caml";
+    homepage = "${webpage}";
+    license = "LGPL";
+    maintainers = [ stdenv.lib.maintainers.roconnor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70e872fa863..dfed66e5608 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2289,6 +2289,8 @@ let
   mkOcamlPackages = ocaml: self: let callPackage = newScope self; in rec {
     inherit ocaml;
 
+    camlidl = callPackage ../development/tools/ocaml/camlidl { };
+
     camlp5_strict = callPackage ../development/tools/ocaml/camlp5 { };
 
     camlp5_transitional = callPackage ../development/tools/ocaml/camlp5 {

From e413faa019c1f14e577971b517bc353a34e7d961 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 4 Oct 2011 08:54:01 +0000
Subject: [PATCH 14/16] Update liquidWar

svn path=/nixpkgs/trunk/; revision=29621
---
 pkgs/games/liquidwar/src-for-default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/liquidwar/src-for-default.nix b/pkgs/games/liquidwar/src-for-default.nix
index a67b1e816f7..e375a73ce24 100644
--- a/pkgs/games/liquidwar/src-for-default.nix
+++ b/pkgs/games/liquidwar/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="0.0.10beta";
-   name="liquidwar-0.0.10beta";
-   hash="1fc1qfl7p3669dj6dy1wxvf85hhwgbazm3rc365ahsikdgz1c5m0";
+   version="0.0.11beta";
+   name="liquidwar-0.0.11beta";
+   hash="1zahxxmnx74xc3d2vk119r25d794vblmz22j1z5ajnnvc42dqc4f";
    url="http://download.savannah.gnu.org/releases/liquidwar6/${version}/liquidwar6-${version}.tar.gz";
-   advertisedUrl="http://download.savannah.gnu.org/releases/liquidwar6/0.0.10beta/liquidwar6-0.0.10beta.tar.gz";
+   advertisedUrl="http://download.savannah.gnu.org/releases/liquidwar6/0.0.11beta/liquidwar6-0.0.11beta.tar.gz";
   
   
 }

From dd19f22e7e4599aeeba6baa4e46619f300d32eb4 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 4 Oct 2011 11:12:11 +0000
Subject: [PATCH 15/16] Add kde4.kile

svn path=/nixpkgs/trunk/; revision=29622
---
 .../editors/kile/{default.nix => 2.0.nix}     |  0
 pkgs/applications/editors/kile/2.1.nix        | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++-
 3 files changed, 24 insertions(+), 1 deletion(-)
 rename pkgs/applications/editors/kile/{default.nix => 2.0.nix} (100%)
 create mode 100644 pkgs/applications/editors/kile/2.1.nix

diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/2.0.nix
similarity index 100%
rename from pkgs/applications/editors/kile/default.nix
rename to pkgs/applications/editors/kile/2.0.nix
diff --git a/pkgs/applications/editors/kile/2.1.nix b/pkgs/applications/editors/kile/2.1.nix
new file mode 100644
index 00000000000..c2d2167e3dd
--- /dev/null
+++ b/pkgs/applications/editors/kile/2.1.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl, kdelibs, cmake, gettext }:
+
+stdenv.mkDerivation rec {
+  name = "kile-2.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/kile/${name}.tar.bz2";
+    sha256 = "0ag6ya0625w34hpk0bpkjyi0ydw699zbkf86vwc19mh9cb0n0aic";
+  };
+
+  buildNativeInputs = [ cmake gettext ];
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "An integrated LaTeX editor for KDE";
+    homepage = http://kile.sourceforge.net;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    license = stdenv.lib.licenses.gpl2Plus;
+    inherit (kdelibs.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dfed66e5608..afa0dccfe0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7895,7 +7895,7 @@ let
       inherit (kde3) kdelibs;
     };
 
-    kile = callPackage ../applications/editors/kile {
+    kile = callPackage ../applications/editors/kile/2.0.nix {
       inherit (kde3) arts kdelibs;
       qt = qt3;
     };
@@ -7962,6 +7962,8 @@ let
 
       kdiff3 = callPackage ../tools/text/kdiff3 { };
 
+      kile = callPackage ../applications/editors/kile/2.1.nix { };
+
       kmplayer = callPackage ../applications/video/kmplayer {
         inherit (pkgs.gtkLibs) pango;
       };

From 4bd5a070d4489a3f5d58b035717e12001c962742 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 4 Oct 2011 11:12:17 +0000
Subject: [PATCH 16/16] liblastfm: fix compilation with ruby-1.9.x

svn path=/nixpkgs/trunk/; revision=29623
---
 .../libraries/liblastfm/default.nix           | 19 +++++---
 .../libraries/liblastfm/ruby-1.9.patch        | 45 +++++++++++++++++++
 2 files changed, 58 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/libraries/liblastfm/ruby-1.9.patch

diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix
index acc5af0ca9e..57a325a7234 100644
--- a/pkgs/development/libraries/liblastfm/default.nix
+++ b/pkgs/development/libraries/liblastfm/default.nix
@@ -1,18 +1,25 @@
 { stdenv, fetchurl, ruby, qt4, pkgconfig, libsamplerate, fftwSinglePrec }:
 
-stdenv.mkDerivation rec {
-  name = "liblastfm-0.3.0";
+let version = "0.3.3"; in
 
+stdenv.mkDerivation rec {
+  name = "liblastfm-${version}";
+
+  # Upstream does not package git tags as tarballs. Get tarball from github.
   src = fetchurl {
-    url = "http://cdn.last.fm/src/${name}.tar.bz2";
-    sha256 = "0vgpkbqmynm975nlcw3caxpz30wvvz35c7a9kfr2wjqizvxrfwnx";
+    url = "https://github.com/mxcl/liblastfm/tarball/${version}";
+    name = "${name}.tar.gz";
+    sha256 = "0v33vzj89mgx2pc5fmiywlz51i553ckydw9xz70fiflm2inbl1r6";
   };
 
   prefixKey = "--prefix ";
   propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ];
-  buildInputs = [ ruby pkgconfig ];
+  buildNativeInputs = [ ruby pkgconfig ];
 
-  patchPhase = "patchShebangs .";
+  configureFlags = "--release";
+
+  patches = [ ./ruby-1.9.patch ];
+  postPatch = "patchShebangs .";
 
   meta = {
     homepage = http://github.com/mxcl/liblastfm;
diff --git a/pkgs/development/libraries/liblastfm/ruby-1.9.patch b/pkgs/development/libraries/liblastfm/ruby-1.9.patch
new file mode 100644
index 00000000000..ac6d175e73a
--- /dev/null
+++ b/pkgs/development/libraries/liblastfm/ruby-1.9.patch
@@ -0,0 +1,45 @@
+From: Yury G. Kudryashov <urkud.urkud@gmail.com>
+Subject: [PATCH] Fix compilation with ruby-1.9
+
+__FILE__ is a relative path in ruby-1.9
+
+---
+ admin/Makefile.rb |    4 ++--
+ admin/qpp         |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/admin/Makefile.rb b/admin/Makefile.rb
+index 592f5a5..33fe688 100755
+--- a/admin/Makefile.rb
++++ b/admin/Makefile.rb
+@@ -6,7 +6,7 @@
+ 
+ cwd = File.dirname( __FILE__ )
+ require 'find'
+-require "#{cwd}/platform.rb"
++require_relative 'platform'
+ 
+ 
+ ######################################################################### defs
+@@ -158,4 +158,4 @@ puts <<-EOS
+ .PHONY: dist
+ dist:
+ 	git archive --prefix=#{BASENAME}/ HEAD | bzip2 > #{BASENAME}.tar.bz2
+-EOS
+\ No newline at end of file
++EOS
+diff --git a/admin/qpp b/admin/qpp
+index 36b2d05..ee840fd 100755
+--- a/admin/qpp
++++ b/admin/qpp
+@@ -4,7 +4,7 @@
+ 
+ cwd=File.dirname __FILE__
+ require 'find'
+-require "#{cwd}/findsrc"
++require_relative 'findsrc'
+ 
+ sources = Array.new
+ headers = Array.new
+-- 
+tg: (f0b3239..) t/ruby19 (depends on: master)