From cfea75c381208ccfb64bdd9731f5fb1c6e4f69f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 2 Jul 2012 20:38:57 +0200
Subject: [PATCH 01/22] speed dreams: fixing the build (libpng version)

---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e40da2c94dc51..f316344a32ba0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7927,6 +7927,7 @@ let
     # Torcs wants to make shared libraries linked with plib libraries (it provides static).
     # i686 is the only platform I know than can do that linking without plib built with -fPIC
     plib = plib.override { enablePIC = if stdenv.isi686 then false else true; };
+    libpng = libpng12;
   };
 
   torcs = callPackage ../games/torcs {

From c43a18b8ec8563a911216d66f4427b9b916f7adf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 2 Jul 2012 20:40:16 +0200
Subject: [PATCH 02/22] speed dreams: fixing build (libpng order in
 buildInputs)

I forgot committing this in my previous commit for speed dreams.
---
 pkgs/games/speed-dreams/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix
index 2a6b239608fd2..e14b9b26a4f05 100644
--- a/pkgs/games/speed-dreams/default.nix
+++ b/pkgs/games/speed-dreams/default.nix
@@ -16,9 +16,10 @@ stdenv.mkDerivation rec {
     cd */
   '';
 
-  buildInputs = [ mesa freeglut libX11 plib openal freealut libXrandr xproto
-    libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib bash 
-    p7zip SDL enet libjpeg cmake];
+  # Order important; it wants libpng12 and some x libs propagate libpng15
+  buildInputs = [ libpng mesa freeglut libX11 plib openal freealut libXrandr xproto
+    libXext libSM libICE libXi libXt libXrender libXxf86vm zlib bash 
+    p7zip SDL enet libjpeg cmake ];
 
   installTargets = "install";
 

From 95072d14858d26f0b814a880c69a5db3fc2af0a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 2 Jul 2012 21:00:09 +0200
Subject: [PATCH 03/22] pyqt: Adding a new url; the old does not work anymore.

---
 pkgs/development/python-modules/pyqt/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix
index 358254dd013b6..9b1d74ff6168d 100644
--- a/pkgs/development/python-modules/pyqt/default.nix
+++ b/pkgs/development/python-modules/pyqt/default.nix
@@ -4,7 +4,10 @@ stdenv.mkDerivation rec {
   name = "PyQt-x11-gpl-4.9.1";
   
   src = fetchurl {
-    url = "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz";
+    urls = [
+      "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz"
+      "http://pkgs.fedoraproject.org/lookaside/pkgs/PyQt4/PyQt-x11-gpl-4.9.1.tar.gz/7f495dc49f71e3bfb64bf942e0d8bb3c/PyQt-x11-gpl-4.9.1.tar.gz"
+    ];
     sha256 = "1ccvc80z8a0k0drvba9ngivsnv2k2nn5317yf86w1zwh45zmb0zj";
   };
   

From 40b91ced4024152328e32ebbd19a849f62da993c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 2 Jul 2012 21:27:18 +0200
Subject: [PATCH 04/22] octave: disabling parallel building

The error http://hydra.nixos.org/build/2748254/log/tail-reload
makes me think there are concurrency problems in the octave build.
In my computer it builds fine.
---
 pkgs/development/interpreters/octave/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index dbbb0324d1440..4293e0112991e 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -15,7 +15,9 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  enableParallelBuilding = true;
+  /* The build failed with a missing libranlib.la in hydra,
+     but worked on my computer. I think they have concurrency problems */
+  enableParallelBuilding = false;
 
   configureFlags = [ "--enable-readline" "--enable-dl" ];
 

From bda2b3ca5a6cab6ea9a02fbcea77cb5e84c390c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 2 Jul 2012 21:40:14 +0200
Subject: [PATCH 05/22] blackshadeselite: fix build in gcc 4.6

I simply added '-fpermissive', and it went on.
---
 pkgs/games/blackshadeselite/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/blackshadeselite/default.nix b/pkgs/games/blackshadeselite/default.nix
index 63139872cf9ca..0f4904bfed97c 100644
--- a/pkgs/games/blackshadeselite/default.nix
+++ b/pkgs/games/blackshadeselite/default.nix
@@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   NIX_LDFLAGS = "-lSDL_image";
+  NIX_CFLAGS_COMPILE = "-fpermissive";
 
   buildInputs = [ SDL SDL_image mesa openal libvorbis freealut popt ];
 

From aab4bec314be1fa7e15c2d6a99d708d2f8996312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 2 Jul 2012 21:53:03 +0200
Subject: [PATCH 06/22] ufoai: fixing the build. Building with libpng12.

---
 pkgs/games/ufoai/default.nix    | 3 ++-
 pkgs/top-level/all-packages.nix | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix
index 80f527e26e1c7..85440f88901e3 100644
--- a/pkgs/games/ufoai/default.nix
+++ b/pkgs/games/ufoai/default.nix
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
   # for the xvidcore static lib
   NIX_CFLAGS_COMPILE = "-pthread -lm";
 
-  buildInputs = [ SDL mesa SDL_image SDL_ttf SDL_mixer libpng libjpeg zlib curl libvorbis
+  # Order is important, x libs include a libpng version that fails for ufoai
+  buildInputs = [ libpng SDL mesa SDL_image SDL_ttf SDL_mixer libjpeg zlib curl libvorbis
     libtheora xvidcore pkgconfig glib gtk gtkglext gtksourceview libxml2 openal gettext
     p7zip ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f316344a32ba0..a18dc54cfe703 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7940,6 +7940,7 @@ let
 
   ufoai = callPackage ../games/ufoai {
     inherit (gnome) gtksourceview gtkglext;
+    libpng = libpng12;
   };
 
   ultimatestunts = callPackage ../games/ultimatestunts { };

From 808e50c7cfa5cb26be634cd33caa5ece85ef35f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 2 Jul 2012 22:17:38 +0200
Subject: [PATCH 07/22] freeswitch: Updating to the latest master. This fixes
 the build.

They say that 'master' is the best stable code to use.
---
 pkgs/servers/sip/freeswitch/default.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix
index 770dc6d277bea..5b341b7deb937 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/pkgs/servers/sip/freeswitch/default.nix
@@ -1,14 +1,21 @@
-{ fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline, openssl, perl, libjpeg }:
+{ fetchgit, stdenv, ncurses, curl, pkgconfig, gnutls, readline, openssl, perl, libjpeg
+, libzrtpcpp, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "freeswitch-1.0.7";
+  name = "freeswitch-git-0db52e6";
 
-  src = fetchurl {
-    url = http://latest.freeswitch.org/freeswitch-1.0.7.tar.gz;
-    sha256 = "0r7mqsc50y7aqm8arbwiq75ikwfrrfhhzdf9r070snrf3b8qkj8w";
+  src = fetchgit {
+    url = "git://git.freeswitch.org/freeswitch.git";
+    rev = "0db52e6e556fce584f1850c3a3b87c8f46ff87c5";
+    sha256 = "5cc7161c1ba64c5faf3dda2669e9aafd529eaa66be2fd83f284304444bcab9ff";
   };
 
-  buildInputs = [ ncurses curl pkgconfig gnutls readline openssl perl libjpeg ];
+  preConfigure = ''
+    ./bootstrap.sh
+  '';
+
+  buildInputs = [ ncurses curl pkgconfig gnutls readline openssl perl libjpeg
+    autoconf automake libtool libzrtpcpp ];
 
   meta = {
     description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch";

From f0e4e770f00401a1522e03a328e7ba5f4ca00574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 2 Jul 2012 22:26:38 +0200
Subject: [PATCH 08/22] fltk: updating, the old url didn't work.

---
 pkgs/development/libraries/fltk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix
index bb835bb9c2905..d51419f37540d 100644
--- a/pkgs/development/libraries/fltk/default.nix
+++ b/pkgs/development/libraries/fltk/default.nix
@@ -4,11 +4,11 @@
 let inherit (composableDerivation) edf; in
 
 composableDerivation.composableDerivation {} rec {
-  name = "fltk-2.0.x-alpha-r8550";
+  name = "fltk-2.0.x-alpha-r9296";
 
   src = fetchurl {
     url = "ftp://ftp.easysw.com/pub/fltk/snapshots/${name}.tar.bz2";
-    sha256 = "0y9fazsv61j8dkg9aiinnw4nd68h7zxmvapmygrl4rq5ywqygng7";
+    sha256 = "0353ngb7gpyklc9mdz8629big2na3c73akfwhis8fhqp7jkbs9ih";
   };
 
   propagatedBuildInputs = [ x11 inputproto libXi freeglut ];

From dcdea9d2b8a68b66ed3844fd9adce20d30f4f925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 2 Jul 2012 22:27:18 +0200
Subject: [PATCH 09/22] cinepaint: updating, and making it build

I wrote a little patch for the cmake files, or it
didn't install.

I also used the NIX_LDFLAGS trick; they are not doing proper linking somehow.
---
 .../graphics/cinepaint/default.nix            | 12 ++++++----
 .../graphics/cinepaint/install.patch          | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 +++-
 3 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/graphics/cinepaint/install.patch

diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix
index 2f1af0f89dd47..bea04f6dc2c34 100644
--- a/pkgs/applications/graphics/cinepaint/default.nix
+++ b/pkgs/applications/graphics/cinepaint/default.nix
@@ -2,7 +2,7 @@
   flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11,
   perlXMLParser, python, pygtk, gettext, intltool, babl, gegl,
   glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr,
-  mesa, libXext, libXpm, libXxf86vm, pixman, libpthreadstubs } :
+  mesa, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } :
 
 stdenv.mkDerivation rec {
   name = "cinepaint-1.0";
@@ -12,15 +12,19 @@ stdenv.mkDerivation rec {
     sha256 = "02mbpsykd7sfr9h6c6gxld6i3bdwnsgvm70b5yff01gwi69w2wi7";
   };
 
-  buildInputs = [ gtk freetype fontconfig lcms flex libtiff libjpeg libpng
+  buildInputs = [ libpng gtk freetype fontconfig lcms flex libtiff libjpeg
     libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl
     gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa
-    libXext libXpm libXxf86vm pixman libpthreadstubs
+    libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk
   ];
 
+  patches = [ ./install.patch ];
+
   buildNativeInputs = [ cmake pkgconfig ];
 
-  NIX_CFLAGS_COMPILE = "-I.";
+  NIX_LDFLAGS = "-llcms -ljpeg";
+
+  # NIX_CFLAGS_COMPILE = "-I.";
 
   meta = {
     homepage = http://www.cinepaint.org/;
diff --git a/pkgs/applications/graphics/cinepaint/install.patch b/pkgs/applications/graphics/cinepaint/install.patch
new file mode 100644
index 0000000000000..f15ff1c4414da
--- /dev/null
+++ b/pkgs/applications/graphics/cinepaint/install.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dfb182f..5adaaa5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -138,7 +138,7 @@ STRING(REPLACE "/" "\\/" ESCAPEDPREFIX ${PREFIX})
+ # Note that for MacOS this needs to be revised 
+ # for the @OSX_ICC...@ variables
+ ADD_CUSTOM_COMMAND(
+-   OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/gimprc
++   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gimprc
+    COMMAND  sed -e s/\@platform\@//g
+ 		-e s/\@prefix\@/${ESCAPEDPREFIX}/g 
+ 	        -e s/\@exec_prefix\@/\${prefix}/g
+@@ -155,8 +155,8 @@ ADD_CUSTOM_COMMAND(
+ 
+ ADD_CUSTOM_TARGET(RCFile ALL echo
+       ""
+-      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/user_install 
+-              ${CMAKE_CURRENT_SOURCE_DIR}/gimprc
++      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/user_install 
++              ${CMAKE_CURRENT_BINARY_DIR}/gimprc
+    )
+ 
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a18dc54cfe703..2bc9d10b2bcd7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6402,7 +6402,10 @@ let
 
   compiz_plugins_extra = callPackage ../applications/window-managers/compiz/plugins-extra.nix { };
 
-  cinepaint = callPackage ../applications/graphics/cinepaint { };
+  cinepaint = callPackage ../applications/graphics/cinepaint {
+    fltk = fltk13;
+    libpng = libpng12;
+  };
 
   codeville = builderDefsPackage (import ../applications/version-management/codeville/0.8.0.nix) {
     inherit makeWrapper;

From cb0d79e60f1c9bf843f5e677bc1a57be8ecc4fb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 1 Jul 2012 17:32:03 +0200
Subject: [PATCH 10/22] viking: Update to 1.3.

---
 pkgs/applications/misc/viking/default.nix     | 26 ++++++----
 .../applications/misc/viking/gpsdclient.patch | 51 -------------------
 .../misc/viking/implicit-declaration.patch    | 13 -----
 pkgs/applications/misc/viking/test-bc.patch   | 22 --------
 pkgs/top-level/all-packages.nix               |  4 +-
 5 files changed, 20 insertions(+), 96 deletions(-)
 delete mode 100644 pkgs/applications/misc/viking/gpsdclient.patch
 delete mode 100644 pkgs/applications/misc/viking/implicit-declaration.patch
 delete mode 100644 pkgs/applications/misc/viking/test-bc.patch

diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix
index a98ed2aa5ff58..70ac055db098d 100644
--- a/pkgs/applications/misc/viking/default.nix
+++ b/pkgs/applications/misc/viking/default.nix
@@ -1,19 +1,27 @@
 { fetchurl, stdenv, pkgconfig, intltool, gettext, gtk, expat, curl
-, gpsd, bc, file }:
+, gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper
+, docbook_xml_dtd_412 }:
 
-stdenv.mkDerivation rec {
-  name = "viking-0.9.8";
+let version = "1.3"; in
+stdenv.mkDerivation {
+  name = "viking-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/viking/${name}.tar.gz";
-    sha256 = "1is8g6ld5pd13iiv9qm8526q1cblg01pqyakg52sd6k7fys7dz2d";
+    url = "mirror://sourceforge/viking/viking/${version}/viking-${version}.tar.gz";
+    sha256 = "1psgy1myx9xn7zgpvqrpricsv041sz41mm82hj5i28k72fq47p2l";
   };
 
-  patches = [
-    ./test-bc.patch ./gpsdclient.patch ./implicit-declaration.patch
-  ];
+  buildInputs =
+   [ pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils
+     libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412
+   ];
 
-  buildInputs = [ pkgconfig intltool gettext gtk expat curl gpsd bc file ];
+  configureFlags = [ "--disable-scrollkeeper" ];
+
+  preBuild =
+    '' sed -i help/Makefile \
+           -e 's|--noout|--noout --nonet --path "${scrollkeeper}/share/xml/scrollkeeper/dtds"|g'
+    '';
 
   doCheck = true;
 
diff --git a/pkgs/applications/misc/viking/gpsdclient.patch b/pkgs/applications/misc/viking/gpsdclient.patch
deleted file mode 100644
index 417226322600f..0000000000000
--- a/pkgs/applications/misc/viking/gpsdclient.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Debian patch that allows compilation with libgps (from `gpsd').
-Failing to apply this patch, we get the following error:
-
-  vikgpslayer.c:237: error: field 'realtime_gpsd_unit' has incomplete type
-  vikgpslayer.c: In function 'vik_gps_layer_new':
-  vikgpslayer.c:473: warning: implicit declaration of function 'gpsd_units'
-  vikgpslayer.c: In function 'rt_gpsd_try_connect':
-  vikgpslayer.c:1321: warning: passing argument 2 of 'gps_set_raw_hook' from incompatible pointer type
-
-diff -urNad trunk~/src/gpsdclient.h trunk/src/gpsdclient.h
---- trunk~/src/gpsdclient.h	1970-01-01 01:00:00.000000000 +0100
-+++ trunk/src/gpsdclient.h	2009-04-15 14:30:22.000000000 +0200
-@@ -0,0 +1,25 @@
-+/* $Id: gpsdclient.h 5330 2009-03-03 04:05:42Z ckuethe $ */
-+/* gpsdclient.h -- common functions for GPSD clients */
-+
-+#ifndef _GPSD_GPSDCLIENT_H_
-+#define _GPSD_GPSDCLIENT_H_
-+struct fixsource_t 
-+/* describe a data source */
-+{
-+    char *spec;		/* pointer to actual storage */
-+    char *server;
-+    char *port;
-+    char *device;
-+};
-+
-+enum unit {unspecified, imperial, nautical, metric};
-+enum unit gpsd_units(void);
-+enum deg_str_type { deg_dd, deg_ddmm, deg_ddmmss };
-+
-+extern /*@observer@*/ char *deg_to_str( enum deg_str_type type,  double f);
-+
-+extern void gpsd_source_spec(/*@null@*/const char *fromstring, 
-+			     /*@out@*/struct fixsource_t *source);
-+
-+#endif /* _GPSDCLIENT_H_ */
-+/* gpsdclient.h ends here */
-diff -urNad trunk~/src/vikgpslayer.c trunk/src/vikgpslayer.c
---- trunk~/src/vikgpslayer.c	2009-02-08 14:47:01.000000000 +0100
-+++ trunk/src/vikgpslayer.c	2009-04-15 14:30:55.000000000 +0200
-@@ -39,6 +39,9 @@
- #include <glib/gi18n.h>
- #ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
- #include <gps.h>
-+#ifndef gpsd_units
-+#include "gpsdclient.h"
-+#endif
- #endif
- 
- #if ! GLIB_CHECK_VERSION(2,14,0)
diff --git a/pkgs/applications/misc/viking/implicit-declaration.patch b/pkgs/applications/misc/viking/implicit-declaration.patch
deleted file mode 100644
index 60f8ad1177ffd..0000000000000
--- a/pkgs/applications/misc/viking/implicit-declaration.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Debian patch that fixes an implicat declaration.
-
-diff -urNad trunk~/src/util.c trunk/src/util.c
---- trunk~/src/util.c	2009-02-08 14:47:01.000000000 +0100
-+++ trunk/src/util.c	2009-04-15 17:23:44.000000000 +0200
-@@ -26,6 +26,7 @@
- #endif
- 
- #include <glib/gi18n.h>
-+#include <glib/gprintf.h>
- 
- #include "dialog.h"
- 
diff --git a/pkgs/applications/misc/viking/test-bc.patch b/pkgs/applications/misc/viking/test-bc.patch
deleted file mode 100644
index fc0c91eec522e..0000000000000
--- a/pkgs/applications/misc/viking/test-bc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-For some reason, `bc -l' yields no output.
-
---- viking-0.9.8/test/check_degrees_conversions.sh	2008-03-15 23:01:48.000000000 +0100
-+++ viking-0.9.8/test/check_degrees_conversions.sh	2009-05-30 23:23:27.000000000 +0200
-@@ -7,7 +7,7 @@ function check_success()
-   for value in "$@"
-   do
-     result=`./degrees_converter "$value" | cut -d' ' -f3`
--    diff=`echo "$result - $expected" | bc -l`
-+    diff=`echo "$result - $expected" | bc`
-     if [ $diff != 0 ]
-     then
-       echo "$value -> $result != $expected"
-@@ -23,7 +23,7 @@ function check_failure()
-   for value in "$@"
-   do
-     result=`./degrees_converter "$value" | cut -d' ' -f3`
--    diff=`echo "$result - $expected" | bc -l`
-+    diff=`echo "$result - $expected" | bc`
-     if [ $diff = 0 ]
-     then
-       echo "$value -> $result = $expected"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2bc9d10b2bcd7..c59993528ce9a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1533,7 +1533,9 @@ let
 
   vifm = callPackage ../applications/misc/vifm {};
 
-  viking = callPackage ../applications/misc/viking { };
+  viking = callPackage ../applications/misc/viking {
+    inherit (gnome) scrollkeeper;
+  };
 
   vncrec = builderDefsPackage ../tools/video/vncrec {
     inherit (xlibs) imake libX11 xproto gccmakedep libXt

From 946f2c10ea2a3493c7533f53d7c0e8782e420775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 2 Jul 2012 23:00:47 +0200
Subject: [PATCH 11/22] xineLib: update to 1.2.2

---
 pkgs/development/libraries/xine-lib/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
index 13b2fdce45827..4ae48a4c04e13 100644
--- a/pkgs/development/libraries/xine-lib/default.nix
+++ b/pkgs/development/libraries/xine-lib/default.nix
@@ -5,21 +5,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xine-lib-1.2.0";
+  name = "xine-lib-1.2.2";
   
   src = fetchurl {
-    url = "mirror://sourceforge/xine/${name}.tar.bz2";
-    sha256 = "1yss9cxxkcb6dzrv78xvi845ls6lhhbv6g8yfm6zjjl07v7jbm6c";
+    url = "mirror://sourceforge/xine/${name}.tar.xz";
+    sha256 = "1mjk686h1qzqj51h4xs4xvagfgnnhm8czbzzjvr5w034pr8n8rg1";
   };
 
-  patches = [ ./zlib126.patch ];
-#  patches =
-#    [ (fetchurl {
-#        url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.1.19-ffmpeg.patch?revision=1.1";
-#        sha256 = "0dqr0kc829djfn0wvk4jg84v61pxynqbp4s4phvywd7x9caf092b";
-#      })
-#    ];
-  
   buildNativeInputs = [ pkgconfig perl ];
 
   buildInputs = [

From 8a764b7891cbb8d4753c420254608814de428905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 2 Jul 2012 23:01:00 +0200
Subject: [PATCH 12/22] xine-ui: update to 0.99.7

---
 pkgs/applications/video/xine-ui/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
index 38bacb2511772..821e1c7bb0c5a 100644
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/pkgs/applications/video/xine-ui/default.nix
@@ -1,18 +1,18 @@
-{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng12, readline, ncurses, curl
-, lirc, shared_mime_info }:
+{stdenv, fetchurl, pkgconfig, xlibs, libpng, xineLib, readline, ncurses, curl
+, lirc, shared_mime_info, libjpeg }:
 
 stdenv.mkDerivation rec {
-  name = "xine-ui-0.99.6";
+  name = "xine-ui-0.99.7";
   
   src = fetchurl {
     url = "mirror://sourceforge/xine/${name}.tar.xz";
-    sha256 = "1wwylnckm5kfq5fi154w8jqf5cwvp7c1ani15q7sgfrfdkmy7caf";
+    sha256 = "1i3byriqav06b55kwzs4dkzrjw7mmmcv0rc7jzb52hn8qp8xz34x";
   };
   
   buildNativeInputs = [ pkgconfig shared_mime_info ];
 
   buildInputs =
-    [ xineLib libpng12 readline ncurses curl lirc
+    [ xineLib libpng readline ncurses curl lirc libjpeg
       xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto
       xlibs.libXinerama xlibs.libXi xlibs.libXft
     ];

From 5592b1f9b181fa5872b2e75c5ca8fcbd6e023b24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 2 Jul 2012 23:01:23 +0200
Subject: [PATCH 13/22] eaglemode: update to 0.84.0

It failds to build with xine-lib, but it goes on as it's
not a strong requirement. Then, the final path is not dependant
on xine anymore. I hope next releases fix this.
---
 pkgs/applications/misc/eaglemode/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix
index f027588c5dc6e..519db53ea18f4 100644
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@@ -2,11 +2,11 @@
 librsvg, glib, gtk, libXext, libXxf86vm, poppler }:
 
 stdenv.mkDerivation {
-  name = "eaglemode-0.83.0";
+  name = "eaglemode-0.84.0";
  
   src = fetchurl {
-    url = mirror://sourceforge/eaglemode/eaglemode-0.83.0.tar.bz2;
-    sha256 = "0rlvi9ljf3ml2l4ydkcgjjja8wk9c7h5qlpdr4x4ghh6sqq0q2x3";
+    url = mirror://sourceforge/eaglemode/eaglemode-0.84.0.tar.bz2;
+    sha256 = "0n20b419j0l7h7jr4s3f3n09ka0ysg9nqs8mcwsrx24rcq7nv0cs";
   };
  
   buildInputs = [ perl libX11 xineLib libjpeg libpng libtiff pkgconfig 
@@ -14,9 +14,12 @@ stdenv.mkDerivation {
  
   # The program tries to dlopen both Xxf86vm and Xext, so we use the
   # trick on NIX_LDFLAGS and dontPatchELF to make it find them.
+  # I use 'yes y' to skip a build error linking with xineLib, 
+  # because xine stopped exporting "_x_vo_new_port"
+  #  http://sourceforge.net/projects/eaglemode/forums/forum/808824/topic/5115261
   buildPhase = ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -lXxf86vm -lXext"
-    yes n | perl make.pl build
+    yes y | perl make.pl build
   '';
 
   dontPatchELF = true;

From ef1d8eb915404ee55a5edbf6636228f5ab337dc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 2 Jul 2012 23:09:01 +0200
Subject: [PATCH 14/22] xine-lib: removing a now unused patch

I forgot that in a previous commit.
---
 .../libraries/xine-lib/zlib126.patch          | 52 -------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 pkgs/development/libraries/xine-lib/zlib126.patch

diff --git a/pkgs/development/libraries/xine-lib/zlib126.patch b/pkgs/development/libraries/xine-lib/zlib126.patch
deleted file mode 100644
index f48063e038b5b..0000000000000
--- a/pkgs/development/libraries/xine-lib/zlib126.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-http://anonscm.debian.org/hg/xine-lib/xine-lib/rev/24d09421ed09
-
-# HG changeset patch
-# User Ulrich Müller <ulm@gentoo.org>
-# Date 1327945720 0
-# Node ID 24d09421ed09d3a78efeab5c9b8ab31daaaba4fd
-# Parent  da296856c52e654cf599248de3a01bb754363c79
-Compile failure in osd.c with sys-libs/zlib-1.2.6
-
-diff -r da296856c52e -r 24d09421ed09 misc/xine-fontconv.c
---- a/misc/xine-fontconv.c	Wed Jan 18 22:01:28 2012 +0000
-+++ b/misc/xine-fontconv.c	Mon Jan 30 17:48:40 2012 +0000
-@@ -109,7 +109,7 @@
- osd_font_t     font;
- 
- 
--static int gzwrite_i16(gzFile *fp, uint16_t number) {
-+static int gzwrite_i16(gzFile fp, uint16_t number) {
-   return gzputc(fp, number & 0xFF) != -1 &&
-          gzputc(fp, (number >> 8) & 0xFF) != -1;
- }
-@@ -341,7 +341,7 @@
- 
-   char                filename[1024];
-   FT_Bitmap          *out_bitmap;
--  gzFile             *fp;
-+  gzFile              fp;
-   int                 error;
-   int                 error_counter;
-   int                 glyph_index;
-diff -r da296856c52e -r 24d09421ed09 src/xine-engine/osd.c
---- a/src/xine-engine/osd.c	Wed Jan 18 22:01:28 2012 +0000
-+++ b/src/xine-engine/osd.c	Mon Jan 30 17:48:40 2012 +0000
-@@ -650,7 +650,7 @@
-   osd->display_y = y;
- }
- 
--static uint16_t gzread_i16(gzFile *fp) {
-+static uint16_t gzread_i16(gzFile fp) {
-   uint16_t ret;
-   ret = gzgetc(fp);
-   ret |= (gzgetc(fp)<<8);
-@@ -663,7 +663,7 @@
- 
- static int osd_renderer_load_font(osd_renderer_t *this, char *filename) {
- 
--  gzFile      *fp;
-+  gzFile       fp;
-   osd_font_t  *font = NULL;
-   int          i, ret = 0;
- 
-

From 8a5d9bad94c8e35883fbe42efb56b451f0e07f2c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 3 Jul 2012 13:57:45 +0200
Subject: [PATCH 15/22] Update VirtualBox to version 4.1.18.

This should make #15 obsolete, as those patches were cherry-picked from
upstream.
---
 pkgs/applications/virtualization/virtualbox/default.nix       | 4 ++--
 .../virtualization/virtualbox/guest-additions/default.nix     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 1e17c10ffd26b..2736c603a48da 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -8,7 +8,7 @@
 
 with stdenv.lib;
 
-let version = "4.1.16"; in
+let version = "4.1.18"; in
 
 stdenv.mkDerivation {
   name = "virtualbox-${version}-${kernel.version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "0kl21wqz822qgdcilfail5qqgsbhgzixwbbwpkmsh6670jc4jw5n";
+    sha256 = "e650e4fdc23581b9edc0e5d5705cc596c76796851ebf65ccda0edb8e413fa3b7";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 7583b706e4c67..ec77ca91910f8 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
 , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}:
 
-let version = "4.1.16"; in
+let version = "4.1.18"; in
 
 stdenv.mkDerivation {
   name = "VirtualBox-GuestAdditions-${version}";
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "1f2p26cg005xc6vi9dbim0macv60d8k8nq20rk7awrbghfib5imm";
+    sha256 = "1zsjh4q71ny10s2zaxnaw4w3bs961c21xv6dd6zpwhnbimlhlrqb";
   };
   KERN_DIR = "${kernel}/lib/modules/*/build";
   buildInputs = [ patchelf cdrkit makeWrapper ];

From 8e476fb0f45af96831eaa3374a75f87d7d49a16a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Wed, 4 Jul 2012 00:47:33 +0200
Subject: [PATCH 16/22] Add calf - audio effects plugin pack and lv2 - audio
 plugin standard

---
 pkgs/applications/audio/calf/default.nix | 22 +++++++++++++++++++
 pkgs/applications/audio/lv2/default.nix  | 27 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  6 ++++++
 3 files changed, 55 insertions(+)
 create mode 100644 pkgs/applications/audio/calf/default.nix
 create mode 100644 pkgs/applications/audio/lv2/default.nix

diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix
new file mode 100644
index 0000000000000..4b1f6dcd26870
--- /dev/null
+++ b/pkgs/applications/audio/calf/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, cairo, expat, glib, gtk, jackaudio, ladspaH
+, libglade, lv2, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "calf-${version}";
+  version = "0.0.18.6";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/calf/${name}.tar.gz";
+    sha256 = "03w6jjkrr6w8da6qzd0x4dlkg295c6jxby500x4cj07wpbpk6irh";
+  };
+
+  buildInputs =
+    [ cairo jackaudio gtk glib expat libglade ladspaH lv2 pkgconfig ];
+
+  meta = with stdenv.lib; {
+    homepage = http://calf.sourceforge.net;
+    description = "A set of high quality open source audio plugins for musicians";
+    license = licenses.lgpl2;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/applications/audio/lv2/default.nix b/pkgs/applications/audio/lv2/default.nix
new file mode 100644
index 0000000000000..136a825eef903
--- /dev/null
+++ b/pkgs/applications/audio/lv2/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, gtk, libsndfile, pkgconfig, python }:
+
+stdenv.mkDerivation rec {
+  name = "lv2-${version}";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "http://lv2plug.in/spec/${name}.tar.bz2";
+    sha256 = "0lfp7679wwqd49k4mjxwqslpfx5fz2q7akxqayg400zqn70whzl5";
+  };
+
+  buildInputs = [ gtk libsndfile pkgconfig python ];
+
+  configurePhase = "python waf configure --prefix=$out";
+
+  buildPhase = "python waf";
+
+  installPhase = "python waf install";
+
+  meta = with stdenv.lib; {
+    homepage = http://lv2plug.in;
+    description = "A plugin standard for audio systems";
+    license = licenses.mit;
+    maintainers = [ maintainers.goibhniu ];
+
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c59993528ce9a..e40873d6dcd83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6345,6 +6345,10 @@ let
 
   bvi = callPackage ../applications/editors/bvi { };
 
+  calf = callPackage ../applications/audio/calf {
+      inherit (gnome) libglade;
+  };
+
   calibre = callPackage ../applications/misc/calibre { };
 
   carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) {
@@ -7030,6 +7034,8 @@ let
 
   lxdvdrip = callPackage ../applications/video/lxdvdrip { };
 
+  lv2 = callPackage ../applications/audio/lv2 { };
+
   lynx = callPackage ../applications/networking/browsers/lynx { };
 
   lyx = callPackage ../applications/misc/lyx {

From 2e2335c5c031f9121121809cd51e50961690227d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 3 Jul 2012 20:13:44 -0400
Subject: [PATCH 17/22] reviewboard: Update to 1.6.9 and fix the build

ReviewBoard requires Django 1.3.1.
---
 pkgs/top-level/python-packages.nix | 35 ++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fc7775cb867a9..4d61c2e473b19 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -525,6 +525,23 @@ let pythonPackages = python.modules // rec {
   };
 
   
+  django_1_3_1 = buildPythonPackage rec {
+    name = "Django-1.3.1";
+
+    src = fetchurl {
+      url = "http://www.djangoproject.com/m/releases/1.3/${name}.tar.gz";
+      sha256 = "0sqmvqy3y5h76pa3zjcnyiy5x01bzzy03afdp2qdwqx0x321i4dg";
+    };
+
+    doCheck = false;
+
+    meta = {
+      description = "A high-level Python Web framework";
+      homepage = https://www.djangoproject.com/;
+    };
+  };
+
+  
   django_evolution = buildPythonPackage rec {
     name = "django_evolution-0.6.7";
 
@@ -533,7 +550,7 @@ let pythonPackages = python.modules // rec {
       md5 = "24b8373916f53f74d701b99a6cf41409";
     };
 
-    propagatedBuildInputs = [ django ];
+    propagatedBuildInputs = [ django_1_3_1 ];
 
     meta = {
       description = "A database schema evolution tool for the Django web framework";
@@ -543,14 +560,14 @@ let pythonPackages = python.modules // rec {
 
   
   djblets = buildPythonPackage rec {
-    name = "Djblets-0.6.16";
+    name = "Djblets-0.6.19";
 
     src = fetchurl {
-      url = "http://downloads.reviewboard.org/releases/Djblets/0.6/Djblets-0.6.16.tar.gz";
-      sha256 = "1793jy0y5w79p8395lvvdlmvdybgwvc5lvgzmk1csf08ba772vc4";
+      url = "http://downloads.reviewboard.org/releases/Djblets/0.6/${name}.tar.gz";
+      sha256 = "1hhvpi81yknvlaazq1cpgamp9vf3x1fcr0ba64q3j2yz1kgin1i8";
     };
 
-    propagatedBuildInputs = [ pkgs.pil django ];
+    propagatedBuildInputs = [ pkgs.pil django_1_3_1 ];
 
     meta = {
       description = "A collection of useful extensions for Django";
@@ -1986,17 +2003,17 @@ let pythonPackages = python.modules // rec {
 
   
   reviewboard = buildPythonPackage rec {
-    name = "ReviewBoard-1.6.6";
+    name = "ReviewBoard-1.6.9";
 
     src = fetchurl {
       url = "http://downloads.reviewboard.org/releases/ReviewBoard/1.6/${name}.tar.gz";
-      sha256 = "de965f48c9e63198d3c7c2bb2e8404170868e8c0ee4d6ab796abb9b1ccda6c1d";
+      sha256 = "06pwbmqwsb0g2y8zg5hk5ibaivsl1af7v0vnkqranimf4yaa10mc";
     };
 
     propagatedBuildInputs =
       [ recaptcha_client pytz memcached dateutil paramiko flup pygments
-        djblets django django_evolution pkgs.pycrypto python.modules.sqlite3
-        pysvn pkgs.pil
+        djblets django_1_3_1 django_evolution pkgs.pycrypto python.modules.sqlite3
+        pysvn pkgs.pil psycopg2
       ];
   };
 

From d0bfd4b6234b26e0ca03c817b7ba56a9cd9e540c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 4 Jul 2012 09:53:26 +0200
Subject: [PATCH 18/22] opencv: updating to 2.4.1.

Let's hydra tell us if it breaks anything.
---
 pkgs/development/libraries/opencv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index 46c170d33f991..009935e14c07f 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg
 , pkgconfig, gstreamer, xineLib, glib }:
 
-let v = "2.3.1a"; in
+let v = "2.4.1"; in
 
 stdenv.mkDerivation rec {
   name = "opencv-${v}";
 
   src = fetchurl {
     url = "mirror://sourceforge/opencvlibrary/OpenCV-${v}.tar.bz2";
-    sha256 = "0325s7pa2npcw2gc06pr6q5ik4xdyf08rvkfc0myn10w20lzb8m9";
+    sha256 = "1wxijbz1jfsg4695fls83825ppiacxfn5x07al0qkkx5rm7spdi9";
   };
 
   buildInputs = [ gtk glib libjpeg libpng libtiff jasper ffmpeg xineLib gstreamer ];

From 1d31c4d4d0bc730ed663673a44fa5cd983040085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Wed, 4 Jul 2012 22:59:25 +0200
Subject: [PATCH 19/22] Fix the lexicographical ordering, lv2 comes before
 lxdvdrip (thanks shlevy)

---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e40873d6dcd83..f3af400193928 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7032,10 +7032,10 @@ let
 
   lmms = callPackage ../applications/audio/lmms { };
 
-  lxdvdrip = callPackage ../applications/video/lxdvdrip { };
-
   lv2 = callPackage ../applications/audio/lv2 { };
 
+  lxdvdrip = callPackage ../applications/video/lxdvdrip { };
+
   lynx = callPackage ../applications/networking/browsers/lynx { };
 
   lyx = callPackage ../applications/misc/lyx {

From 94cfff93eb5f446cc2977050742e8031c30c5ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Wed, 4 Jul 2012 00:47:33 +0200
Subject: [PATCH 20/22] Add calf - audio effects plugin pack and lv2 - audio
 plugin standard

---
 pkgs/applications/audio/calf/default.nix | 22 +++++++++++++++++++
 pkgs/applications/audio/lv2/default.nix  | 27 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  6 ++++++
 3 files changed, 55 insertions(+)
 create mode 100644 pkgs/applications/audio/calf/default.nix
 create mode 100644 pkgs/applications/audio/lv2/default.nix

diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix
new file mode 100644
index 0000000000000..4b1f6dcd26870
--- /dev/null
+++ b/pkgs/applications/audio/calf/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, cairo, expat, glib, gtk, jackaudio, ladspaH
+, libglade, lv2, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "calf-${version}";
+  version = "0.0.18.6";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/calf/${name}.tar.gz";
+    sha256 = "03w6jjkrr6w8da6qzd0x4dlkg295c6jxby500x4cj07wpbpk6irh";
+  };
+
+  buildInputs =
+    [ cairo jackaudio gtk glib expat libglade ladspaH lv2 pkgconfig ];
+
+  meta = with stdenv.lib; {
+    homepage = http://calf.sourceforge.net;
+    description = "A set of high quality open source audio plugins for musicians";
+    license = licenses.lgpl2;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/applications/audio/lv2/default.nix b/pkgs/applications/audio/lv2/default.nix
new file mode 100644
index 0000000000000..136a825eef903
--- /dev/null
+++ b/pkgs/applications/audio/lv2/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, gtk, libsndfile, pkgconfig, python }:
+
+stdenv.mkDerivation rec {
+  name = "lv2-${version}";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "http://lv2plug.in/spec/${name}.tar.bz2";
+    sha256 = "0lfp7679wwqd49k4mjxwqslpfx5fz2q7akxqayg400zqn70whzl5";
+  };
+
+  buildInputs = [ gtk libsndfile pkgconfig python ];
+
+  configurePhase = "python waf configure --prefix=$out";
+
+  buildPhase = "python waf";
+
+  installPhase = "python waf install";
+
+  meta = with stdenv.lib; {
+    homepage = http://lv2plug.in;
+    description = "A plugin standard for audio systems";
+    license = licenses.mit;
+    maintainers = [ maintainers.goibhniu ];
+
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c59993528ce9a..e40873d6dcd83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6345,6 +6345,10 @@ let
 
   bvi = callPackage ../applications/editors/bvi { };
 
+  calf = callPackage ../applications/audio/calf {
+      inherit (gnome) libglade;
+  };
+
   calibre = callPackage ../applications/misc/calibre { };
 
   carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) {
@@ -7030,6 +7034,8 @@ let
 
   lxdvdrip = callPackage ../applications/video/lxdvdrip { };
 
+  lv2 = callPackage ../applications/audio/lv2 { };
+
   lynx = callPackage ../applications/networking/browsers/lynx { };
 
   lyx = callPackage ../applications/misc/lyx {

From 219bad5a69e5e3f1bcaffac59dd255279ce0e85c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Wed, 4 Jul 2012 22:59:25 +0200
Subject: [PATCH 21/22] Fix the lexicographical ordering, lv2 comes before
 lxdvdrip (thanks shlevy)

---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e40873d6dcd83..f3af400193928 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7032,10 +7032,10 @@ let
 
   lmms = callPackage ../applications/audio/lmms { };
 
-  lxdvdrip = callPackage ../applications/video/lxdvdrip { };
-
   lv2 = callPackage ../applications/audio/lv2 { };
 
+  lxdvdrip = callPackage ../applications/video/lxdvdrip { };
+
   lynx = callPackage ../applications/networking/browsers/lynx { };
 
   lyx = callPackage ../applications/misc/lyx {

From a3770a6f6b5442ce95563b230380c7db71dc470a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Thu, 5 Jul 2012 00:39:32 +0200
Subject: [PATCH 22/22] Move lv2 into development/libraries/audio since it is a
 library and not an audio application

---
 .../libraries}/audio/lv2/default.nix                          | 0
 pkgs/top-level/all-packages.nix                               | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/{applications => development/libraries}/audio/lv2/default.nix (100%)

diff --git a/pkgs/applications/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix
similarity index 100%
rename from pkgs/applications/audio/lv2/default.nix
rename to pkgs/development/libraries/audio/lv2/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3af400193928..deca440030536 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4624,6 +4624,8 @@ let
 
   librdf = callPackage ../development/libraries/librdf { };
 
+  lv2 = callPackage ../applications/audio/lv2 { };
+
   qrupdate = callPackage ../development/libraries/qrupdate { };
 
   redland = pkgs.librdf_redland;
@@ -7032,8 +7034,6 @@ let
 
   lmms = callPackage ../applications/audio/lmms { };
 
-  lv2 = callPackage ../applications/audio/lv2 { };
-
   lxdvdrip = callPackage ../applications/video/lxdvdrip { };
 
   lynx = callPackage ../applications/networking/browsers/lynx { };