From d0d4e66652bc48b561138d6588525f9af3f0acea Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Thu, 4 Apr 2013 22:57:08 +0200
Subject: ffmpeg: update to 1.2 (and patching mplayer2)

Simple patch required by mplayer2 to build with ffmpeg 1.2.
---
 pkgs/applications/video/mplayer2/default.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix
index 79c25d65c05c..2f35d02eb906 100644
--- a/pkgs/applications/video/mplayer2/default.nix
+++ b/pkgs/applications/video/mplayer2/default.nix
@@ -74,6 +74,8 @@ stdenv.mkDerivation rec {
 
   prePatch = ''
     sed -i /^_install_strip/d configure
+
+    sed -i '/stdlib/a#include <ctype.h>/' sub/sub*.c
   '';
 
   buildInputs = with stdenv.lib;
-- 
cgit 1.4.1


From 5aacc334066f1bb0922ef6b9bba7117dbe1c6cbe Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Thu, 4 Apr 2013 23:32:53 +0200
Subject: dwm: fix SDL games with fullscreen

It worked quite bad when the game resolution was different than the
current.
---
 pkgs/applications/window-managers/dwm/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix
index db4692683507..82eb9e56935f 100644
--- a/pkgs/applications/window-managers/dwm/default.nix
+++ b/pkgs/applications/window-managers/dwm/default.nix
@@ -1,7 +1,10 @@
 {stdenv, fetchurl, libX11, libXinerama, patches ? []}:
 
-stdenv.mkDerivation rec {
+let
   name = "dwm-6.0";
+in
+stdenv.mkDerivation {
+  inherit name;
  
   src = fetchurl {
     url = "http://dl.suckless.org/dwm/${name}.tar.gz";
@@ -13,7 +16,7 @@ stdenv.mkDerivation rec {
   prePatch = ''sed -i "s@/usr/local@$out@" config.mk'';
 
   # Allow users set their own list of patches
-  inherit patches;
+  patches = [ ./confnotify-6.0.patch ] ++ patches;
 
   buildPhase = " make ";
  
-- 
cgit 1.4.1


From ecc136b172821fd25700bef8c7e73fcab0bdb926 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 5 Apr 2013 00:17:04 +0200
Subject: aangifte2012: preload library which seems needed

The last step "gegevens verzenden" will segfault otherwise.
---
 pkgs/applications/taxes/aangifte-2012/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix
index 056ad81feb59..8f36fd485ddd 100644
--- a/pkgs/applications/taxes/aangifte-2012/default.nix
+++ b/pkgs/applications/taxes/aangifte-2012/default.nix
@@ -27,7 +27,8 @@ stdenv.mkDerivation {
     ''
       mkdir -p $out
       cp -prvd * $out/
-      wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin
+      wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin \
+                                    --prefix LD_PRELOAD : $(cat $NIX_GCC/nix-support/orig-gcc)/lib/libgcc_s.so.1
     '';
 
   meta = {
-- 
cgit 1.4.1


From 742d198def859da2ba3d74fbc11134c89ab42e5a Mon Sep 17 00:00:00 2001
From: Cillian de Róiste <goibhniu@fsfe.org>
Date: Fri, 5 Apr 2013 01:24:36 +0200
Subject: Add mid2key: a tool which maps midi notes to keystrokes

---
 pkgs/applications/audio/mid2key/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/audio/mid2key/default.nix

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/audio/mid2key/default.nix b/pkgs/applications/audio/mid2key/default.nix
new file mode 100644
index 000000000000..1e163391a397
--- /dev/null
+++ b/pkgs/applications/audio/mid2key/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, alsaLib, libX11, libXi, libXtst, xextproto }:
+
+stdenv.mkDerivation rec {
+  name = "mid2key-r1";
+
+  src = fetchurl {
+    url = "http://mid2key.googlecode.com/files/${name}.tar.gz";
+    sha256 = "0j2vsjvdgx51nd1qmaa18mcy0yw9pwrhbv2mdwnf913bwsk4y904";
+  };
+
+  unpackPhase = "tar xvzf $src";
+
+  buildInputs = [ alsaLib libX11 libXi libXtst xextproto ];
+
+  buildPhase = "make";
+
+  installPhase = "mkdir -p $out/bin && mv mid2key $out/bin";
+
+  meta = with stdenv.lib; {
+    homepage = http://code.google.com/p/mid2key/;
+    description = "A simple tool which maps midi notes to simulated keystrokes";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index beb1bfcf7265..e125faf33495 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7427,6 +7427,8 @@ let
 
   mhwaveedit = callPackage ../applications/audio/mhwaveedit {};
 
+  mid2key = callPackage ../applications/audio/mid2key { };
+
   midori = builderDefsPackage (import ../applications/networking/browsers/midori) {
     inherit imagemagick intltool python pkgconfig webkit libxml2
       which gettext makeWrapper file libidn sqlite docutils libnotify
-- 
cgit 1.4.1


From 47e93cd27e5fc6225a85b156ec9340f190e6242c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 5 Apr 2013 08:56:40 +0200
Subject: rcs: update to version 5.8.2

It's profoundly satisfying to know that we have the very latest version of RCS.
RCS users, you see, live on the bleeding edge.
---
 pkgs/applications/version-management/rcs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix
index 65625ff27695..afc7bca2d1ab 100644
--- a/pkgs/applications/version-management/rcs/default.nix
+++ b/pkgs/applications/version-management/rcs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "rcs-5.8.1";
+  name = "rcs-5.8.2";
 
   src = fetchurl {
     url = "mirror://gnu/rcs/${name}.tar.gz";
-    sha256 = "1b1y6s4gy3miv2bvx0z01kvnv58h35sw766lccdkxkalk43cml04";
+    sha256 = "1p4kqqrvc7plc3n6ls4xwp6d3mw1jcx9p36pilwd65q31mgbs07a";
   };
 
   doCheck = true;
-- 
cgit 1.4.1


From 0013355b19673aeabad6b5762c03cadab4f696ee Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 5 Apr 2013 09:36:45 +0200
Subject: gmpc: Add meta.platforms

---
 pkgs/applications/audio/gmpc/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix
index cc80a96306f3..10a2f0dcee94 100644
--- a/pkgs/applications/audio/gmpc/default.nix
+++ b/pkgs/applications/audio/gmpc/default.nix
@@ -46,5 +46,6 @@ stdenv.mkDerivation rec {
     description = "A GTK2 frontend for Music Player Daemon";
     license = licenses.gpl2;
     maintainers = [ maintainers.rickynils ];
+    platforms = platforms.linux;
   };
 }
-- 
cgit 1.4.1


From 48f534bce9a0f03fe644c2c31b357a7b695138f7 Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Thu, 4 Apr 2013 12:50:09 +0200
Subject: mplayer2: add reference to libXxf86vm

Otherwise, playing h264 with vdpau complains about not able to sync to vsync.
---
 pkgs/applications/video/mplayer2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix
index 2f35d02eb906..9e89d5384147 100644
--- a/pkgs/applications/video/mplayer2/default.nix
+++ b/pkgs/applications/video/mplayer2/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchgit, freetype, pkgconfig, yasm, freefont_ttf, ffmpeg, libass
 , python3, docutils, which
-, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null
+, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null
 , xineramaSupport ? true, libXinerama ? null
 , xvSupport ? true, libXv ? null
 , alsaSupport ? true, alsaLib ? null
@@ -17,7 +17,7 @@
 , useUnfreeCodecs ? false
 }:
 
-assert x11Support -> (libX11 != null && libXext != null && mesa != null);
+assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null);
 assert xineramaSupport -> (libXinerama != null && x11Support);
 assert xvSupport -> (libXv != null && x11Support);
 assert alsaSupport -> alsaLib != null;
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = with stdenv.lib;
     [ freetype pkgconfig ffmpeg libass docutils which ]
-    ++ optionals x11Support [ libX11 libXext mesa ]
+    ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
     ++ optional alsaSupport alsaLib
     ++ optional xvSupport libXv
     ++ optional theoraSupport libtheora
-- 
cgit 1.4.1


From 2187716c537c16904e4b33ca1c1461aa8b664e1c Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Fri, 5 Apr 2013 12:50:19 +0200
Subject: dwm: adding a patch I missed in a recent commit

---
 .../window-managers/dwm/confnotify-6.0.patch       | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 pkgs/applications/window-managers/dwm/confnotify-6.0.patch

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/window-managers/dwm/confnotify-6.0.patch b/pkgs/applications/window-managers/dwm/confnotify-6.0.patch
new file mode 100644
index 000000000000..5b5e2ebb68a7
--- /dev/null
+++ b/pkgs/applications/window-managers/dwm/confnotify-6.0.patch
@@ -0,0 +1,36 @@
+Fix SDL fullscreen problems when the resolution changes:
+https://groups.google.com/d/msg/wmii/nJBrSjrnnq8/ZEYWOWE5pj4J
+
+diff -r ec4baab78314 dwm.c
+--- a/dwm.c	Mon Dec 19 15:38:30 2011 +0100
++++ b/dwm.c	Sat Jan 14 12:35:50 2012 +0100
+@@ -397,9 +397,10 @@
+ 		showhide(m->stack);
+ 	else for(m = mons; m; m = m->next)
+ 		showhide(m->stack);
+-	if(m)
++	if(m) {
+ 		arrangemon(m);
+-	else for(m = mons; m; m = m->next)
++		restack(m);
++	} else for(m = mons; m; m = m->next)
+ 		arrangemon(m);
+ }
+ 
+@@ -408,7 +409,6 @@
+ 	strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol);
+ 	if(m->lt[m->sellt]->arrange)
+ 		m->lt[m->sellt]->arrange(m);
+-	restack(m);
+ }
+ 
+ void
+@@ -1827,6 +1827,8 @@
+ 		.event_mask = ButtonPressMask|ExposureMask
+ 	};
+ 	for(m = mons; m; m = m->next) {
++		if (m->barwin)
++			continue;
+ 		m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
+ 		                          CopyFromParent, DefaultVisual(dpy, screen),
+ 		                          CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
-- 
cgit 1.4.1


From 05e5f5d515b0766d3867b5eaf470a532b20e3c7f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 5 Apr 2013 06:59:16 -0400
Subject: Fix tarball

libiconvOrLibc is null on ppc

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/applications/search/recoll/default.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 966d41315a1c..6bfa7c7905b0 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -3,6 +3,8 @@
 , djvulibre, groff, libxslt, unzip, xpdf, antiword, catdoc, lyx
 , ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconvOrLibc }:
 
+assert stdenv.system != "powerpc-linux";
+
 stdenv.mkDerivation rec {
   ver = "1.18.1";
   name = "recoll-${ver}";
-- 
cgit 1.4.1


From d5a036d63d6c03cfa4973ee6d6778f070dd702e9 Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Fri, 5 Apr 2013 16:02:16 +0200
Subject: Adding Skype Call Recorder.

---
 .../skype-call-recorder/default.nix                | 23 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix                    |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
new file mode 100644
index 000000000000..eb9cd5945bca
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, cmake, lame, id3lib, libvorbis, qt4, libogg }:
+
+stdenv.mkDerivation {
+  name = "skype-call-recorder-0.8";
+  src = fetchurl {
+    url = "http://atdot.ch/scr/files/0.8/skype-call-recorder-0.8.tar.gz";
+    sha256 = "1iijkhq3aj9gr3bx6zl8ryvzkqcdhsm9yisimakwq0lnw0lgf5di";
+  };
+
+  patchPhase = ''
+    sed -i -e '/ADD_EXECUTABLE/aSET(LIBRARIES ''${LIBRARIES} ogg)' CMakeLists.txt
+  '';
+
+  buildInputs = [ cmake lame id3lib libvorbis qt4 libogg ];
+
+  meta = {
+    homepage = http://atdot.ch/scr/;
+    description = "Open source tool to record your Skype calls on Linux";
+    license = "GPLv2+"
+    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [viric];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e125faf33495..84adc0c75b5b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7748,6 +7748,8 @@ let
     usePulseAudio = config.pulseaudio or true;
   };
 
+  skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { };
+
   st = callPackage ../applications/misc/st { };
 
   dropbox = callPackage ../applications/networking/dropbox { };
-- 
cgit 1.4.1


From ad5b5bcf0a7e0624bf2b50b41d872d52d013ccc5 Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Fri, 5 Apr 2013 16:11:03 +0200
Subject: skype-call-recorder: fix expression and improve conferences

I missed a semicolon; I also add an upstream patch about
improving the hosted conferences support:
http://repo.or.cz/w/skype-call-recorder.git/commit/abd67f1d44eef81baf2e9729f95e002c4ecc7350
---
 .../networking/instant-messengers/skype-call-recorder/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
index eb9cd5945bca..2fa82e1251bc 100644
--- a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
@@ -7,16 +7,20 @@ stdenv.mkDerivation {
     sha256 = "1iijkhq3aj9gr3bx6zl8ryvzkqcdhsm9yisimakwq0lnw0lgf5di";
   };
 
-  patchPhase = ''
+  # Keep an rpath reference to the used libogg
+  prePatch = ''
     sed -i -e '/ADD_EXECUTABLE/aSET(LIBRARIES ''${LIBRARIES} ogg)' CMakeLists.txt
   '';
 
+  # Better support for hosted conferences
+  patches = [ ./conference.patch ];
+
   buildInputs = [ cmake lame id3lib libvorbis qt4 libogg ];
 
   meta = {
     homepage = http://atdot.ch/scr/;
     description = "Open source tool to record your Skype calls on Linux";
-    license = "GPLv2+"
+    license = "GPLv2+";
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [viric];
   };
-- 
cgit 1.4.1


From 77b62dd985aae231cd9a4be65d3cda4a166f74cd Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Fri, 5 Apr 2013 17:53:09 +0200
Subject: skype-call-recorder: I forgot another patch. grmbl

---
 .../skype-call-recorder/conference.patch           | 148 +++++++++++++++++++++
 1 file changed, 148 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch b/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch
new file mode 100644
index 000000000000..8b8ce8fd7bbf
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch
@@ -0,0 +1,148 @@
+From abd67f1d44eef81baf2e9729f95e002c4ecc7350 Mon Sep 17 00:00:00 2001
+From: jlh <jlh@gmx.ch>
+Date: Fri, 16 Oct 2009 17:40:54 +0200
+Subject: [PATCH] Rudimentary support for recording hosted conference calls
+
+---
+ call.cpp |   37 +++++++++++++++++++++++++++++++++++--
+ call.h   |   11 ++++++++++-
+ 2 files changed, 45 insertions(+), 3 deletions(-)
+
+diff --git a/call.cpp b/call.cpp
+index c2b02f2..663c1c1 100644
+--- a/call.cpp
++++ b/call.cpp
+@@ -90,9 +90,10 @@ void AutoSync::reset() {
+ 
+ // Call class
+ 
+-Call::Call(QObject *p, Skype *sk, CallID i) :
+-	QObject(p),
++Call::Call(CallHandler *h, Skype *sk, CallID i) :
++	QObject(h),
+ 	skype(sk),
++	handler(h),
+ 	id(i),
+ 	status("UNKNOWN"),
+ 	writer(NULL),
+@@ -119,6 +120,13 @@ Call::Call(QObject *p, Skype *sk, CallID i) :
+ 		debug(QString("Call %1: cannot get partner display name").arg(id));
+ 		displayName = "Unnamed Caller";
+ 	}
++
++	// Skype does not properly send updates when the CONF_ID property
++	// changes.  since we need this information, check it now on all calls
++	handler->updateConfIDs();
++	// this call isn't yet in the list of calls, thus we need to
++	// explicitely check its CONF_ID
++	updateConfID();
+ }
+ 
+ Call::~Call() {
+@@ -134,6 +142,10 @@ Call::~Call() {
+ 	// QT takes care of deleting servers and sockets
+ }
+ 
++void Call::updateConfID() {
++	confID = skype->getObject(QString("CALL %1 CONF_ID").arg(id)).toLong();
++}
++
+ bool Call::okToDelete() const {
+ 	// this is used for checking whether past calls may now be deleted.
+ 	// when a past call hasn't been decided yet whether it should have been
+@@ -270,6 +282,11 @@ void Call::startRecording(bool force) {
+ 	if (isRecording)
+ 		return;
+ 
++	if (handler->isConferenceRecording(confID)) {
++		debug(QString("Call %1: call is part of a conference that is already being recorded").arg(id));
++		return;
++	}
++
+ 	if (force) {
+ 		emit showLegalInformation();
+ 	} else {
+@@ -589,6 +606,22 @@ CallHandler::~CallHandler() {
+ 	delete legalInformationDialog;
+ }
+ 
++void CallHandler::updateConfIDs() {
++	QList<Call *> list = calls.values();
++	for (int i = 0; i < list.size(); i++)
++		list.at(i)->updateConfID();
++}
++
++bool CallHandler::isConferenceRecording(CallID id) const {
++	QList<Call *> list = calls.values();
++	for (int i = 0; i < list.size(); i++) {
++		Call *c = list.at(i);
++		if (c->getConfID() == id && c->getIsRecording())
++			return true;
++	}
++	return false;
++}
++
+ void CallHandler::callCmd(const QStringList &args) {
+ 	CallID id = args.at(0).toInt();
+ 
+diff --git a/call.h b/call.h
+index cb8396d..b746f46 100644
+--- a/call.h
++++ b/call.h
+@@ -43,6 +43,8 @@ class QTcpServer;
+ class QTcpSocket;
+ class LegalInformationDialog;
+ 
++class CallHandler;
++
+ typedef int CallID;
+ 
+ class AutoSync {
+@@ -68,18 +70,21 @@ private:
+ class Call : public QObject {
+ 	Q_OBJECT
+ public:
+-	Call(QObject *, Skype *, CallID);
++	Call(CallHandler *, Skype *, CallID);
+ 	~Call();
+ 	void startRecording(bool = false);
+ 	void stopRecording(bool = true);
++	void updateConfID();
+ 	bool okToDelete() const;
+ 	void setStatus(const QString &);
+ 	QString getStatus() const { return status; }
+ 	bool statusDone() const;
+ 	bool statusActive() const;
+ 	CallID getID() const { return id; }
++	CallID getConfID() const { return confID; }
+ 	void removeFile();
+ 	void hideConfirmation(int);
++	bool getIsRecording() const { return isRecording; }
+ 
+ signals:
+ 	void startedCall(int, const QString &);
+@@ -99,10 +104,12 @@ private:
+ 
+ private:
+ 	Skype *skype;
++	CallHandler *handler;
+ 	CallID id;
+ 	QString status;
+ 	QString skypeName;
+ 	QString displayName;
++	CallID confID;
+ 	AudioFileWriter *writer;
+ 	bool isRecording;
+ 	int stereo;
+@@ -140,6 +147,8 @@ class CallHandler : public QObject {
+ public:
+ 	CallHandler(QObject *, Skype *);
+ 	~CallHandler();
++	void updateConfIDs();
++	bool isConferenceRecording(CallID) const;
+ 	void callCmd(const QStringList &);
+ 
+ signals:
+-- 
+1.6.5.GIT
+
-- 
cgit 1.4.1


From f8faea23f845e86c1076a37d92236e6ccfce6af1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 6 Apr 2013 01:22:18 +0200
Subject: emacs-cedet: update to version 1.1 to fix the build

---
 pkgs/applications/editors/emacs-modes/cedet/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/pkgs/applications/editors/emacs-modes/cedet/default.nix
index 46381dfc648d..779fc8a146e1 100644
--- a/pkgs/applications/editors/emacs-modes/cedet/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cedet/default.nix
@@ -1,14 +1,14 @@
-{ fetchurl, stdenv, emacs }:
+{ fetchurl, stdenv, emacs, python }:
 
 stdenv.mkDerivation rec {
-  name = "cedet-1.0pre6";
+  name = "cedet-1.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/cedet/${name}.tar.gz";
-    sha256 = "0pvd54rjlba12cxgqibm8v4i8x43r5c239z891lgcbafjvkzpdxb";
+    sha256 = "0p2bwlpwwa019axvgj09xkxbr53j0pq23d46s4la9jfhl47nbh22";
   };
 
-  buildInputs = [ emacs ];
+  buildInputs = [ emacs python ];
 
   doCheck = true;
   checkPhase = "make utest";
-- 
cgit 1.4.1


From 509ea2888aa6b25457c4904210d80e17e6d2e3a9 Mon Sep 17 00:00:00 2001
From: Cillian de Róiste <goibhniu@fsfe.org>
Date: Sat, 6 Apr 2013 01:41:53 +0200
Subject: PureData: Update to 0.44, add support for JACK and fix wrapper

---
 pkgs/applications/audio/puredata/default.nix | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix
index e2563b8fe06f..b1df008398db 100644
--- a/pkgs/applications/audio/puredata/default.nix
+++ b/pkgs/applications/audio/puredata/default.nix
@@ -1,24 +1,31 @@
-{ stdenv, fetchurl, alsaLib, autoconf, automake, fftw, gettext, glib,
-libX11, libtool, tcl, tk }:
+{ stdenv, fetchurl, alsaLib, autoconf, automake, fftw, gettext, glib
+, jackaudio, libX11, libtool, makeWrapper, pkgconfig, tcl, tk
+}:
 
 stdenv.mkDerivation  rec {
   name = "puredata-${version}";
-  version = "0.43-0";
+  version = "0.44-0";
 
   src = fetchurl {
     url = "mirror://sourceforge/pure-data/pd-${version}.src.tar.gz";
-    sha256 = "1qfq7x8vj12kr0cdrnbvmxfhc03flicc6vcc8bz6hwrrakwciyz2";
+    sha256 = "031bvqfnlpfx0y5n0l5rmslziqc6jgmk99x1prgh1rmhjhjdnijw";
   };
 
-  buildInputs = [ alsaLib autoconf automake fftw gettext glib libX11
-    libtool tcl tk ];
+  buildInputs = [
+    alsaLib autoconf automake fftw gettext glib jackaudio libX11
+    libtool makeWrapper pkgconfig tcl tk
+  ];
 
   preConfigure = ''
     ./autogen.sh
   '';
 
+  postInstall = ''
+    wrapProgram $out/bin/pd --prefix PATH : ${tk}/bin
+  '';
+
   meta = with stdenv.lib; {
-    description = ''Real-time graphical programming environment for
+    description = ''A real-time graphical programming environment for
                     audio, video, and graphical processing'';
     homepage = http://puredata.info;
     license = licenses.bsd3;
-- 
cgit 1.4.1


From a3a3c9c50218c7fc3ea912b10e8797bd4d10f10b Mon Sep 17 00:00:00 2001
From: Cillian de Róiste <goibhniu@fsfe.org>
Date: Sun, 7 Apr 2013 16:23:45 +0200
Subject: Update DISTRHO: audio effects and plugins

---
 pkgs/applications/audio/distrho/default.nix | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index 7a1d24844b6a..a409ba1f28b9 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -2,23 +2,19 @@
 , libxslt, lv2, pkgconfig, premake, xlibs }:
 
 let
-  rev = "7815b3545978e";
+  rev = "99efbf0b";
 in
 stdenv.mkDerivation rec {
   name = "distrho-${rev}";
 
   src = fetchgit {
-    url = "git://distrho.git.sf.net/gitroot/distrho/distrho";
+    url = "https://github.com/falkTX/DISTRHO.git";
     inherit rev;
-    sha256 = "2e260f16ee67b1166c39e2d55c8dd5593902c8b3d8d86485545ef83139e1e844";
+    sha256 = "ed26a6edca19ebb8260b3dc042f69c32162e1d91179fb9d22da42ec7131936f9";
   };
 
   patchPhase = ''
-    sed -e "s#xsltproc#${libxslt}/bin/xsltproc#" -i Makefile
-    sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile
-    sed -e "s#/etc/HybridReverb2#$out/etc/Hybridreverb2#" \
-      -i ports/hybridreverb2/source/SystemConfig.cpp
-    sed -e "s#/usr#$out#" -i ports/hybridreverb2/data/HybridReverb2.conf
+    sed -e "s#@./scripts#sh scripts#" -i Makefile
   '';
 
   buildInputs = [
@@ -31,9 +27,6 @@ stdenv.mkDerivation rec {
     sh ./scripts/premake-update.sh linux
     make standalone
     make lv2
-
-    # generate lv2 ttl
-    sh scripts/generate-ttl.sh
   '';
 
   installPhase = ''
@@ -41,12 +34,6 @@ stdenv.mkDerivation rec {
     cp bin/standalone/* $out/bin/
     mkdir -p $out/lib/lv2
     cp -a bin/lv2/* $out/lib/lv2/
-
-    # HybridReverb2 data
-    mkdir -p $out/etc/HybridReverb2
-    cp ports/hybridreverb2/data/HybridReverb2.conf $out/etc/HybridReverb2/
-    mkdir -p $out/share
-    cp -a ports/hybridreverb2/data/HybridReverb2 $out/share/
   '';
 
   meta = with stdenv.lib; {
@@ -55,8 +42,8 @@ stdenv.mkDerivation rec {
     longDescription = ''
       Includes:
       3BandEQ bitmangler drowaudio-distortion drowaudio-flanger
-      drowaudio-tremolo eqinox HybridReverb2 juce_pitcher sDelay
-      TAL-Filter TAL-NoiseMaker TAL-Reverb-2 TAL-Vocoder-2 ThePilgrim
+      drowaudio-tremolo eqinox juce_pitcher sDelay TAL-Filter
+      TAL-NoiseMaker TAL-Reverb-2 TAL-Vocoder-2 ThePilgrim
       Wolpertinger argotlunar capsaicin drowaudio-distortionshaper
       drowaudio-reverb drumsynth highlife JuceDemoPlugin PingPongPan
       TAL-Dub-3 TAL-Filter-2 TAL-Reverb TAL-Reverb-3 TheFunction vex
-- 
cgit 1.4.1


From bd8ccc7c2d5b85239e5769cd15901b51b4977eda Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 6 Apr 2013 01:38:19 +0200
Subject: flac: update download URL for build fix patch

---
 pkgs/applications/audio/flac/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index fa201d20c3fb..5dd993b0ef8c 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   patches =
     [ # Fix for building on GCC 4.3.
       (fetchurl {
-        url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch?rev=1.1";
+        url = "http://sourceforge.net/p/flac/patches/_discuss/thread/9d4c7504/d8ea/attachment/flac-1.2.1-gcc-4.3-includes.patch";
         sha256 = "1m6ql5vyjb2jlp5qiqp6w0drq1m6x6y3i1dnl5ywywl3zd36k0mr";
       })
     ];
-- 
cgit 1.4.1


From fd76305a9b81325bf044e9689574215d95e86f8c Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 7 Apr 2013 20:03:30 +0200
Subject: vlc: enable support for the opus codec

---
 pkgs/applications/video/vlc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 5529fbeff836..a7cce109fdfe 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -5,7 +5,7 @@
 , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg
 , mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image
 , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
-, libass, libva, libdvbpsi, libdc1394, libraw1394
+, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
 }:
 
 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
       libkate libtiger libv4l samba liboggz libass libdvbpsi libva
       xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
-      libdc1394 libraw1394
+      libdc1394 libraw1394 libopus
     ];
 
   nativeBuildInputs = [ pkgconfig ];
-- 
cgit 1.4.1


From dcff78f580fb487dbbd0b4fdd537babd6a3ac39f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 8 Apr 2013 05:58:23 +0200
Subject: taskwarrior: Update to version 2.2.0.

This update roughly includes the following changes:

 * Spanish es-ES translation
 * New configuration option: print.empty.columns
 * Much improved Asian character support
 * More virtual tags
 * Improved bash completion
 * Task modification time
 * Stats show blocked and blocking tasks
 * New 'blocking' report
 * Additional color rules
 * New helper commands for third-party tools
 * 'columns' command searchable
 * New date shortcuts 'socm' and 'eocm'
 * Improved push/pull messages

For a full list of changes, please head over to:

http://taskwarrior.org/projects/taskwarrior/wiki/Changelog

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/misc/taskwarrior/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index dae574804b4d..dc1fce1d64ca 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -1,13 +1,14 @@
 {stdenv, fetchurl, cmake}:
 
-stdenv.mkDerivation {
-  name = "taskwarrior-2.1.2";
+stdenv.mkDerivation rec {
+  name = "taskwarrior-${version}";
+  version = "2.2.0";
 
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = http://www.taskwarrior.org/download/task-2.1.2.tar.gz;
-    sha256 = "0diy72sgiyvfl6bdy7k3qwv3ijx2z1y477smkk6jsbbd9fsp2lfg";
+    url = "http://www.taskwarrior.org/download/task-${version}.tar.gz";
+    sha256 = "057fh50qp9bd5s08rw51iybpamn55v5nhn3s6ds89g76hp95vqir";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
cgit 1.4.1


From 75e5cbde79132b01fb28d936c166d92bd105152a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 8 Apr 2013 08:46:44 +0200
Subject: chromium: Update beta and dev channels.

beta: 26.0.1410.43 -> 27.0.1453.15 (builds fine and tested)
dev:  27.0.1448.0  -> 27.0.1453.12 (builds fine and tested)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/sources.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index 9e4c0cff5634..bbdbd4cfeb8a 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -1,14 +1,14 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "27.0.1448.0";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1448.0.tar.xz";
-    sha256 = "03sarp8drf9a6likk4m73lgk2i4nhqqri8ja9h8qiglqc4sf2hn0";
+    version = "27.0.1453.12";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.12.tar.xz";
+    sha256 = "1b2vkcynljl799m41aabdsj9k2plchiga6bi4ah3hc0mwyj0lyl7";
   };
   beta = {
-    version = "26.0.1410.43";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.43.tar.xz";
-    sha256 = "110x9cs88gqvqya71bqspx2s7ph6ca0als7sp5fbf911cj0iy0ii";
+    version = "27.0.1453.15";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.15.tar.xz";
+    sha256 = "19y9pbipi4y61avrsgb7y4b1xl8d29v34l403xdghk0d3z2rg65m";
   };
   stable = {
     version = "26.0.1410.43";
-- 
cgit 1.4.1


From 79d155f874e5445d3f1e08393cfb6a08fb766516 Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Mon, 8 Apr 2013 11:52:42 +0200
Subject: pinta: updating it. It works now.

---
 pkgs/applications/graphics/pinta/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix
index 349982bc24cb..b845abacf7ec 100644
--- a/pkgs/applications/graphics/pinta/default.nix
+++ b/pkgs/applications/graphics/pinta/default.nix
@@ -1,11 +1,12 @@
 {stdenv, fetchurl, mono, gtksharp, pkgconfig}:
 
 stdenv.mkDerivation {
-  name = "pinta-0.5";
+  name = "pinta-1.4";
 
   src = fetchurl {
-    url =  http://github.com/downloads/jpobst/Pinta/pinta-0.5.tar.gz; 
-    sha256 = "0qv95zswi488bkbck9b9yhmczj1sgqc96nzn4f5rwfqz516kilrl";
+    url = "https://github.com/PintaProject/pinta/tarball/3f7ccfa93d";
+    name = "pinta-1.4.tar.gz";
+    sha256 = "1kgb4gy5l6bd0akniwhiqqkvqayr5jgdsvn2pgg1038q9raafnpn";
   };
 
   buildInputs = [mono gtksharp pkgconfig];
-- 
cgit 1.4.1


From e0249ffcd0687a40dd3fa2d89a98b11ba0192b59 Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Mon, 8 Apr 2013 12:14:26 +0200
Subject: meld: update to 1.6.1

---
 pkgs/applications/version-management/meld/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 42650b3afb30..6e099cd56083 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -1,8 +1,8 @@
 {stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }:
 
 let
-  minor = "1.5";
-  version = "${minor}.2";
+  minor = "1.6";
+  version = "${minor}.1";
 in
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://ftp.gnome.org/pub/gnome/sources/meld/${minor}/meld-${version}.tar.xz";
-    sha256 = "05rbkqflbqnh2c4682d2fmidhwz2bvlggrhp1p7xbi3z8ci87pdx";
+    sha256 = "00rsff0yl5qwzh0igkdns6ry2xsbxad70avpqpkbd2bldi94v76y";
   };
 
   buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ];
-- 
cgit 1.4.1


From 1f82083c20b01b0039f67f03a351eae9a284019d Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 8 Apr 2013 18:21:55 +0200
Subject: darktable: Update to 1.2

---
 pkgs/applications/graphics/darktable/1.2rc1.nix  | 53 ------------------------
 pkgs/applications/graphics/darktable/default.nix |  6 +--
 pkgs/top-level/all-packages.nix                  |  4 --
 3 files changed, 3 insertions(+), 60 deletions(-)
 delete mode 100644 pkgs/applications/graphics/darktable/1.2rc1.nix

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/graphics/darktable/1.2rc1.nix b/pkgs/applications/graphics/darktable/1.2rc1.nix
deleted file mode 100644
index 906240d864f6..000000000000
--- a/pkgs/applications/graphics/darktable/1.2rc1.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, fetchurl
-, GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib
-, libgnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
-, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
-, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
-, openexr, pixman, pkgconfig, sqlite, bash, libxslt }:
-
-assert stdenv ? glibc;
-
-stdenv.mkDerivation rec {
-  version = "1.2rc1";
-  name = "darktable-${version}";
-
-  src = fetchurl {
-    url = "http://tinyurl.com/bmwdztq";
-    name = "${name}-${version}.tar.xz";
-    sha256 = "0l3gl49bmaljrrl4zfaivvj7apxa2jm934ylq24gcms3b2whv70m";
-  };
-
-  buildInputs =
-    [ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk
-      ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
-      libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
-      librsvg libtiff libxcb openexr pixman pkgconfig sqlite libxslt
-    ];
-
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo}/include/cairo"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ilmbase}/include/OpenEXR"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${openexr}/include/OpenEXR"
-
-    substituteInPlace tools/create_preferences.sh.in --replace '#!/usr/bin/env bash' '#!${bash}/bin/bash'
-  '';
-
-  cmakeFlags = [
-    "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include"
-    "-DPTHREAD_LIBRARY=${stdenv.glibc}/lib/libpthread.so"
-    "-DCMAKE_BUILD_TYPE=Release"
-    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
-    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include"
-  ];
-
-  meta = with stdenv.lib; {
-    description = "Virtual lighttable and darkroom for photographers";
-    homepage = http://darktable.sourceforge.net;
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index aa67406d0e79..91c91dc39250 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -8,12 +8,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "1.1.4";
+  version = "1.2";
   name = "darktable-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/darktable/darktable/1.1/darktable-${version}.tar.xz";
-    sha256 = "1bzcxh8zm0xxrpifkkksv9k4xagjrzlam00yja9v9cbjlvawfszv";
+    url = "mirror://sourceforge/darktable/darktable/1.2/darktable-${version}.tar.xz";
+    sha256 = "0l2lrly46nda7b2y4gskqqxaajia34g487bgjcpd5ysxbhmmhlnw";
   };
 
   buildInputs =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5feb863ecb1f..0e6acb7905bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6735,10 +6735,6 @@ let
     inherit (gnome) GConf libglade;
   };
 
-  darktable12 = callPackage ../applications/graphics/darktable/1.2rc1.nix {
-    inherit (gnome) GConf libglade;
-  };
-
   "dd-agent" = callPackage ../tools/networking/dd-agent { };
 
   dia = callPackage ../applications/graphics/dia {
-- 
cgit 1.4.1


From bfa358c76eba3a23ec6a289e72d7eab9ec3c0712 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Apr 2013 18:00:26 +0200
Subject: firefox: Update to 20.0

---
 .../networking/browsers/firefox/20.0.nix           | 176 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix                    |   9 +-
 pkgs/top-level/release.nix                         |   2 +-
 3 files changed, 185 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/firefox/20.0.nix

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/networking/browsers/firefox/20.0.nix b/pkgs/applications/networking/browsers/firefox/20.0.nix
new file mode 100644
index 000000000000..1480a300820c
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/20.0.nix
@@ -0,0 +1,176 @@
+{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
+, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
+, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
+, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
+
+, # If you want the resulting program to call itself "Firefox" instead
+  # of "Shiretoko" or whatever, enable this option.  However, those
+  # binaries may not be distributed without permission from the
+  # Mozilla Foundation, see
+  # http://www.mozilla.org/foundation/trademarks/.
+  enableOfficialBranding ? false
+}:
+
+assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
+
+rec {
+
+  firefoxVersion = "20.0";
+
+  xulVersion = "20.0"; # this attribute is used by other packages
+
+
+  src = fetchurl {
+    urls = [
+        # It is better to use this url for official releases, to take load off Mozilla's ftp server.
+        "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
+        # Fall back to this url for versions not available at releases.mozilla.org.
+        "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
+    ];
+    sha1 = "6d776c29da0be0d2a50abeb504d63b06b7861218";
+  };
+
+  commonConfigureFlags =
+    [ "--enable-optimize"
+      #"--enable-profiling"
+      "--disable-debug"
+      "--enable-strip"
+      # "--with-system-jpeg" # Too old in nixpkgs
+      "--with-system-zlib"
+      "--with-system-bz2"
+      "--with-system-nspr"
+      "--with-system-nss"
+      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
+      # "--enable-system-cairo" # <-- doesn't build
+      "--enable-system-sqlite"
+      "--disable-crashreporter"
+      "--disable-tests"
+      "--disable-necko-wifi" # maybe we want to enable this at some point
+      "--disable-installer"
+      "--disable-updater"
+    ];
+
+
+  xulrunner = stdenv.mkDerivation rec {
+    name = "xulrunner-${xulVersion}";
+
+    inherit src;
+
+    buildInputs =
+      [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
+        python dbus dbus_glib pango freetype fontconfig xlibs.libXi
+        xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
+        alsaLib nspr nss libnotify xlibs.pixman yasm mesa
+        xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
+        xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
+      ];
+
+    configureFlags =
+      [ "--enable-application=xulrunner"
+        "--disable-javaxpcom"
+      ] ++ commonConfigureFlags;
+
+    enableParallelBuilding = true;
+
+    preConfigure =
+      ''
+        export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
+
+        mkdir ../objdir
+        cd ../objdir
+        configureScript=../mozilla-release/configure
+      ''; # */
+
+    #installFlags = "SKIP_GRE_REGISTRATION=1";
+
+    postInstall = ''
+      # Fix run-mozilla.sh search
+      libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
+      echo libDir: $libDir
+      test -n "$libDir"
+      cd $out/bin
+      rm xulrunner
+
+      for i in $out/lib/$libDir/*; do
+          file $i;
+          if file $i | grep executable &>/dev/null; then
+              echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
+              chmod a+x "$out/bin/$(basename "$i")";
+          fi;
+      done
+      for i in $out/lib/$libDir/*.so; do
+          patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
+      done
+      for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do
+          wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir"
+      done
+      rm -f $out/bin/run-mozilla.sh
+    ''; # */
+
+    meta = {
+      description = "Mozilla Firefox XUL runner";
+      homepage = http://www.mozilla.com/en-US/firefox/;
+    };
+
+    passthru = { inherit gtk; version = xulVersion; };
+  };
+
+
+  firefox = stdenv.mkDerivation rec {
+    name = "firefox-${firefoxVersion}";
+
+    inherit src;
+
+    enableParallelBuilding = true;
+
+    buildInputs =
+      [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
+        dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
+        xlibs.pixman yasm mesa sqlite file unzip pysqlite
+      ];
+
+    propagatedBuildInputs = [xulrunner];
+
+    configureFlags =
+      [ "--enable-application=browser"
+        "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
+        "--enable-chrome-format=jar"
+        "--disable-elf-hack"
+      ]
+      ++ commonConfigureFlags
+      ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
+
+    makeFlags = [
+      "SYSTEM_LIBXUL=1"
+    ];
+
+    # Hack to work around make's idea of -lbz2 dependency
+    preConfigure =
+      ''
+        find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
+          stdenv.lib.concatStringsSep ":"
+            (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
+        }' ';'
+      '';
+
+    postInstall =
+      ''
+        ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
+        cd "$out/lib/"firefox-*
+        rm firefox
+        echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
+        chmod a+x firefox
+      ''; # */
+
+    meta = {
+      description = "Mozilla Firefox - the browser, reloaded";
+      homepage = http://www.mozilla.com/en-US/firefox/;
+      maintainers = [ stdenv.lib.maintainers.eelco ];
+    };
+
+    passthru = {
+      inherit gtk xulrunner nspr;
+      isFirefox3Like = true;
+    };
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e6acb7905bf..379c55982fad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7002,7 +7002,7 @@ let
 
   firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
 
-  firefoxPkgs = pkgs.firefox19Pkgs;
+  firefoxPkgs = pkgs.firefox20Pkgs;
 
   firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix {
     inherit (gnome) libIDL;
@@ -7023,6 +7023,13 @@ let
 
   firefox19Wrapper = lowPrio (wrapFirefox { browser = firefox19Pkgs.firefox; });
 
+  firefox20Pkgs = callPackage ../applications/networking/browsers/firefox/20.0.nix {
+    inherit (gnome) libIDL;
+    inherit (pythonPackages) pysqlite;
+  };
+
+  firefox20Wrapper = lowPrio (wrapFirefox { browser = firefox20Pkgs.firefox; });
+
   flac = callPackage ../applications/audio/flac { };
 
   flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 {
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index cca7dd5defdc..697c9b5f58d6 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -362,7 +362,7 @@ let
       };
 
       firefox36Pkgs.firefox = linux;
-      firefox19Pkgs.firefox = linux;
+      firefox20Pkgs.firefox = linux;
 
       gnome = {
         gnome_panel = linux;
-- 
cgit 1.4.1


From d8f98d1a8542bade5c342f0029ad6c58e65d4de2 Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Wed, 10 Apr 2013 15:12:02 +0200
Subject: Adding avxsynth.

To add it, I also add ffms and log4cpp.
---
 pkgs/applications/video/avxsynth/default.nix   | 26 ++++++++++++++++++++++++++
 pkgs/development/libraries/ffms/default.nix    | 20 ++++++++++++++++++++
 pkgs/development/libraries/log4cpp/default.nix | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix                |  6 ++++++
 4 files changed, 68 insertions(+)
 create mode 100644 pkgs/applications/video/avxsynth/default.nix
 create mode 100644 pkgs/development/libraries/ffms/default.nix
 create mode 100644 pkgs/development/libraries/log4cpp/default.nix

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix
new file mode 100644
index 000000000000..70dcad49c978
--- /dev/null
+++ b/pkgs/applications/video/avxsynth/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, ffmpeg, autoconf, automake, libtool, pkgconfig, log4cpp
+, pango, cairo, python, libjpeg, ffms
+, enableQt ? true, qt4}:
+
+stdenv.mkDerivation rec {
+  name = "avxsynth-4.0-e153e672bf";
+
+  src = fetchurl {
+    url = https://github.com/avxsynth/avxsynth/tarball/e153e672bf;
+    name = "${name}.tar.gz";
+    sha256 = "16l2ld8k1nfsms6jd9d9r4l247xxbncsak66w87icr20yzyhs14s";
+  };
+
+  buildInputs = [ ffmpeg autoconf automake libtool pkgconfig log4cpp pango cairo python
+    libjpeg ffms ]
+    ++ stdenv.lib.optional enableQt qt4;
+
+  preConfigure = "autoreconf -vfi";
+
+  meta = {
+    homepage = https://github.com/avxsynth/avxsynth/wiki;
+    license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix
new file mode 100644
index 000000000000..38371ec276d1
--- /dev/null
+++ b/pkgs/development/libraries/ffms/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, zlib, ffmpeg, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "ffms-2.17";
+  
+  src = fetchurl {
+    url = http://ffmpegsource.googlecode.com/files/ffms-2.17-src.tar.bz2;
+    sha256 = "0gb42hrwnldz3zjlk4llx85dvxysxlfrdf5yy3fay8r8k1vpl7wr";
+  };
+
+  NIX_CFLAGS_COMPILE = "-fPIC";
+
+  buildInputs = [ zlib ffmpeg pkgconfig ];
+
+  meta = {
+    homepage = http://code.google.com/p/ffmpegsource/;
+    description = "Libav/ffmpeg based source library for easy frame accurate access";
+    license = "MIT";
+  };
+}
diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix
new file mode 100644
index 000000000000..2b2553075580
--- /dev/null
+++ b/pkgs/development/libraries/log4cpp/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "log4cpp-1.1";
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/log4cpp/${name}.tar.gz";
+    sha256 = "1d386ws9v6f9bxma4dh5m6nzr4k2rv5q96xl5bp5synlmghd2ny2";
+  };
+
+  meta = {
+    homepage = http://log4cpp.sourceforge.net/;
+    description = "A logging framework for C++ patterned after Apache log4j";
+    license = "LGPLv2.1+";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 379c55982fad..3b385ffac2d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3657,6 +3657,8 @@ let
     vpxSupport = !stdenv.isMips;
   };
 
+  ffms = callPackage ../development/libraries/ffms { };
+
   fftw = callPackage ../development/libraries/fftw {
     singlePrecision = false;
   };
@@ -4576,6 +4578,8 @@ let
    guile = guile_1_8;
   };
 
+  log4cpp = callPackage ../development/libraries/log4cpp { };
+
   log4cxx = callPackage ../development/libraries/log4cxx { };
 
   log4cplus = callPackage ../development/libraries/log4cplus { };
@@ -6593,6 +6597,8 @@ let
     eigen = eigen2;
   };
 
+  avxsynth = callPackage ../applications/video/avxsynth { };
+
   awesome = callPackage ../applications/window-managers/awesome {
     lua = lua5;
     cairo = cairo.override { xcbSupport = true; };
-- 
cgit 1.4.1


From 57637d02da71166fe9f606343f87ea29ad157525 Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Wed, 10 Apr 2013 16:49:31 +0200
Subject: offrss: fixing crossbuilding, disabling podofo in that case

---
 pkgs/applications/networking/offrss/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix
index 5166e8795d57..fd1406127ad8 100644
--- a/pkgs/applications/networking/offrss/default.nix
+++ b/pkgs/applications/networking/offrss/default.nix
@@ -9,6 +9,10 @@ stdenv.mkDerivation {
   '';
 
   crossAttrs = {
+    propagatedBuildInputs = [ curl.crossDrv libmrss.crossDrv ];
+    preConfigure = ''
+      sed 's/^PDF/#PDF/' -i Makefile
+    '';
     makeFlags = "CC=${stdenv.cross.config}-gcc";
   };
 
-- 
cgit 1.4.1


From 744a215a45169c5a023fe4e32c7f41a02439dd46 Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Wed, 10 Apr 2013 18:26:28 +0200
Subject: qemu: update to 1.4.0

---
 pkgs/applications/virtualization/qemu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index fabe3fed47df..b1165b3535b9 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses, perl, pixman }:
 
 stdenv.mkDerivation rec {
-  name = "qemu-1.3.1";
+  name = "qemu-1.4.0";
 
   src = fetchurl {
     url = "http://wiki.qemu.org/download/${name}.tar.bz2";
-    sha256 = "1bqfrb5dlsxm8gxhkksz8qzi5fhj3xqhxyfwbqcphhcv1kpyfwip";
+    sha256 = "1a7d11vjs1p6i1ck2ff9annmkhpkbjl73hl9i1cbg3s0fznrfqh6";
   };
 
   buildInputs = [ python zlib pkgconfig glib SDL ncurses perl pixman ];
-- 
cgit 1.4.1


From 1c2565a8ef75b6513e361a4b974f2b64070f5b02 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 11 Apr 2013 14:42:32 -0400
Subject: Add hipchat messaging client

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../instant-messengers/hipchat/default.nix         | 63 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix                    |  2 +
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/hipchat/default.nix

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
new file mode 100644
index 000000000000..b202a0f09db8
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -0,0 +1,63 @@
+{ stdenv
+, fetchurl
+, libtool
+, libXext
+, libSM
+, libICE
+, libX11
+, libXft
+, libXau
+, libXdmcp
+, libXrender
+, freetype
+, fontconfig
+, openssl
+}:
+
+let
+  version = "1.94.407";
+
+  rpath = stdenv.lib.makeSearchPath "lib" [
+    stdenv.glibc
+    stdenv.gcc.gcc
+    libtool
+    libXext
+    libSM
+    libICE
+    libX11
+    libXft
+    libXau
+    libXdmcp
+    libXrender
+    freetype
+    fontconfig
+    openssl
+  ];
+
+  src = fetchurl {
+    url = "http://downloads.hipchat.com/linux/arch/hipchat-${version}-i686.pkg.tar.xz";
+    sha256 = "0kyjpa2ir066zqkvs1zmnx6kvl8v4jfl8h7bw110cgigwmiplk7k";
+  };
+in stdenv.mkDerivation {
+  name = "hipchat-${version}";
+
+  buildCommand = ''
+    tar xf ${src}
+    mkdir -p $out
+    mv opt/HipChat/lib $out
+    mv opt/HipChat/bin $out
+    mv usr/share $out
+    patchShebangs $out/bin
+    for file in $(find $out/lib -type f); do
+        patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $file || true
+        patchelf --set-rpath ${rpath}:$out/lib $file || true
+    done
+  '';
+
+  meta = {
+    description = "HipChat Desktop Client";
+    homepage = http://www.hipchat.com;
+    license = stdenv.lib.licenses.proprietary;
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b385ffac2d0..eee598dfeec9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7218,6 +7218,8 @@ let
 
   hexedit = callPackage ../applications/editors/hexedit { };
 
+  hipchat = callPackage_i686 ../applications/networking/instant-messengers/hipchat { };
+
   homebank = callPackage ../applications/office/homebank { };
 
   htmldoc = callPackage ../applications/misc/htmldoc {
-- 
cgit 1.4.1