From 0013355b19673aeabad6b5762c03cadab4f696ee Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Fri, 5 Apr 2013 09:36:45 +0200 Subject: [PATCH 01/21] gmpc: Add meta.platforms --- pkgs/applications/audio/gmpc/default.nix | 1 + 1 file changed, 1 insertion(+) 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; }; } From 48f534bce9a0f03fe644c2c31b357a7b695138f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 4 Apr 2013 12:50:09 +0200 Subject: [PATCH 02/21] 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(-) 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 From 410d1a073e291d4ef833558e8b740fc89bd44a53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 5 Apr 2013 10:42:51 +0200 Subject: [PATCH 03/21] qemu-kvm: fix USB passthrough with a patch I saw the same symptoms as https://bugs.launchpad.net/qemu/+bug/1033727 , and the patch there proposed fixes my case. --- pkgs/os-specific/linux/qemu-kvm/default.nix | 2 +- .../linux/qemu-kvm/fix-usb-passthrough.patch | 45 +++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/qemu-kvm/fix-usb-passthrough.patch diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix index 6c2c8d57fc50..eeaeacd46601 100644 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ b/pkgs/os-specific/linux/qemu-kvm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ncurses python glib libaio mesa texinfo perl ] ++ stdenv.lib.optionals spiceSupport [ spice_protocol spice ]; - patches = [ ./fix-librt-check.patch ]; + patches = [ ./fix-librt-check.patch ./fix-usb-passthrough.patch ]; postPatch = "patchShebangs .;" + stdenv.lib.optionalString spiceSupport '' diff --git a/pkgs/os-specific/linux/qemu-kvm/fix-usb-passthrough.patch b/pkgs/os-specific/linux/qemu-kvm/fix-usb-passthrough.patch new file mode 100644 index 000000000000..a73df310629d --- /dev/null +++ b/pkgs/os-specific/linux/qemu-kvm/fix-usb-passthrough.patch @@ -0,0 +1,45 @@ +https://bugs.launchpad.net/qemu/+bug/1033727 + +From: Hans de Goede +Date: Wed, 12 Sep 2012 13:08:40 +0000 (+0200) +Subject: uhci: Don't queue up packets after one with the SPD flag set +X-Git-Tag: v1.3.0-rc0~483^2 +X-Git-Url: http://git.qemu.org/?p=qemu.git;a=commitdiff_plain;h=72a04d0c178f01908d74539230d9de64ffc6da19 +Bug-Debian: http://bugs.debian.org/683983 + +uhci: Don't queue up packets after one with the SPD flag set + +Don't queue up packets after a packet with the SPD (short packet detect) +flag set. Since we won't know if the packet will actually be short until it +has completed, and if it is short we should stop the queue. + +This fixes a miniature photoframe emulating a USB cdrom with the windows +software for it not working. + +Signed-off-by: Hans de Goede +Signed-off-by: Gerd Hoffmann +--- + +diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c +index c7c8786..cdc8bc3 100644 +--- a/hw/usb/hcd-uhci.c ++++ b/hw/usb/hcd-uhci.c +@@ -1000,6 +1000,9 @@ static void uhci_fill_queue(UHCIState *s, UHCI_TD *td) + } + assert(ret == TD_RESULT_ASYNC_START); + assert(int_mask == 0); ++ if (ptd.ctrl & TD_CTRL_SPD) { ++ break; ++ } + plink = ptd.link; + } + } +@@ -1097,7 +1100,7 @@ static void uhci_process_frame(UHCIState *s) + + case TD_RESULT_ASYNC_START: + trace_usb_uhci_td_async(curr_qh & ~0xf, link & ~0xf); +- if (is_valid(td.link)) { ++ if (is_valid(td.link) && !(td.ctrl & TD_CTRL_SPD)) { + uhci_fill_queue(s, &td); + } + link = curr_qh ? qh.link : td.link; From 2d38aee71b55a0fa7c905a5dd2747392a905f93d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 5 Apr 2013 06:49:23 -0400 Subject: [PATCH 04/21] xpra: Use new ffmpeg attribute It still builds, but it's a pythonPackage so who knows if it works right. Was breaking the tarball, though. Signed-off-by: Shea Levy --- pkgs/tools/X11/xpra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 8427386fe860..e0881e5aa9b8 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, buildPythonPackage , python, cython, pkgconfig , xorg, gtk, glib, pango, cairo, gdk_pixbuf, pygtk, atk, pygobject, pycairo -, ffmpeg_1_1, x264, libvpx, pil, libwebp }: +, ffmpeg_1, x264, libvpx, pil, libwebp }: buildPythonPackage rec { name = "xpra-0.8.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { pango cairo gdk_pixbuf atk gtk glib - ffmpeg_1_1 libvpx x264 libwebp + ffmpeg_1 libvpx x264 libwebp ]; propagatedBuildInputs = [ From 2187716c537c16904e4b33ca1c1461aa8b664e1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 5 Apr 2013 12:50:19 +0200 Subject: [PATCH 05/21] 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 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); From 05e5f5d515b0766d3867b5eaf470a532b20e3c7f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 5 Apr 2013 06:59:16 -0400 Subject: [PATCH 06/21] Fix tarball libiconvOrLibc is null on ppc Signed-off-by: Shea Levy --- pkgs/applications/search/recoll/default.nix | 2 ++ 1 file changed, 2 insertions(+) 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}"; From fad10ddb82c6d7b7ba5c28a3cbd19e2d9a207b96 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 5 Apr 2013 07:16:05 -0400 Subject: [PATCH 07/21] postgresql-9.2.x: Build the world This builds the man pages as well as contributed program like pg_upgrade Signed-off-by: Shea Levy --- pkgs/servers/sql/postgresql/9.2.x.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 89de740b3032..1bf3de527a3e 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -14,13 +14,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - LC_ALL = "C"; + makeFlags = [ "world" ]; - postInstall = - '' - mkdir -p $out/share/man - cp -rvd doc/src/sgml/man1 $out/share/man - ''; + installTargets = [ "install-world" ]; + + LC_ALL = "C"; passthru = { inherit readline; From a32e208ded95b0b7e5e0ba72f014b3c9c7f3c953 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 5 Apr 2013 07:48:44 -0400 Subject: [PATCH 08/21] Set psqlSchema properly for postgres 9.2.x Signed-off-by: Shea Levy --- pkgs/servers/sql/postgresql/9.2.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 1bf3de527a3e..46a6aa0c032c 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { passthru = { inherit readline; - psqlSchema = "9.1"; + psqlSchema = "9.2"; }; meta = { From d5a036d63d6c03cfa4973ee6d6778f070dd702e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 5 Apr 2013 16:02:16 +0200 Subject: [PATCH 09/21] 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 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 { }; From ad5b5bcf0a7e0624bf2b50b41d872d52d013ccc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 5 Apr 2013 16:11:03 +0200 Subject: [PATCH 10/21] 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 --- .../instant-messengers/skype-call-recorder/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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]; }; From c7be8b8afb88a61c3bd55f751858838880535e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Fri, 5 Apr 2013 16:50:23 +0200 Subject: [PATCH 11/21] Update Radeon Firmware It was changed on 04.02 --- pkgs/os-specific/linux/firmware/radeon-r700/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/radeon-r700/default.nix b/pkgs/os-specific/linux/firmware/radeon-r700/default.nix index 09342f687e95..79b16b1dceaa 100644 --- a/pkgs/os-specific/linux/firmware/radeon-r700/default.nix +++ b/pkgs/os-specific/linux/firmware/radeon-r700/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://people.freedesktop.org/~agd5f/radeon_ucode/R700_rlc.bin"; - sha256 = "1lbgrlbhqijizg16z0g0qa6ggznpdy844cawnwdp1b0fkwhrbkga"; + sha256 = "1sbpq39cvjnpfp1iamhq9k9266jkaaywnm8d2pw95ayw56a77976"; }; unpackPhase = "true"; From 8a912c272df65f1c1fe20b8f64528de545c77a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Fri, 5 Apr 2013 17:12:36 +0200 Subject: [PATCH 12/21] libmspack: fix download url and update It is now hosted on http://www.cabextract.org.uk --- pkgs/development/libraries/libmspack/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index 1d34b07b2a4c..7a8b2d361438 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -1,9 +1,16 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "libmspack-0.0.20040308alpha"; + name = "libmspack-0.3alpha"; src = fetchurl { - url = http://www.kyz.uklinux.net/downloads/libmspack-0.0.20040308alpha.tar.gz; - md5 = "4d8e967649df0f6ade83df7da4b7511c"; + url = http://www.cabextract.org.uk/libmspack/libmspack-0.3alpha.tar.gz; + sha256 = "03rlzhvzd3qm7sb029gs14syq1z6xjmczvwb9kbz5sl20sjngidh"; }; + + meta = { + description = "A de/compression library for various Microsoft formats"; + homepage = http://www.cabextract.org.uk/libmspack; + license = "LGPL2"; + }; + } From 77b62dd985aae231cd9a4be65d3cda4a166f74cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 5 Apr 2013 17:53:09 +0200 Subject: [PATCH 13/21] 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 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 +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 list = calls.values(); ++ for (int i = 0; i < list.size(); i++) ++ list.at(i)->updateConfID(); ++} ++ ++bool CallHandler::isConferenceRecording(CallID id) const { ++ QList 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 + From 477c53cec0a59c5f2e454bb14fb6f2ef9b1bba66 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 5 Apr 2013 19:38:07 +0200 Subject: [PATCH 14/21] sudo: Fix building outside of a chroot --- pkgs/tools/security/sudo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 9206a5e44520..e361746c57b9 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { EOF makeFlags="install_uid=$(id -u) install_gid=$(id -g)" - installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc" + installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc timedir=$TMPDIR/dummy" ''; buildInputs = [ coreutils pam groff ]; From 18b65bfd0bb39594ad75c564f4ea26b869f4bb68 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 5 Apr 2013 14:54:23 -0400 Subject: [PATCH 15/21] Add pika pythonPackage For some reason tests don't run Signed-off-by: Shea Levy --- pkgs/top-level/python-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6dc8d0298217..e9bf9a3fabe1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2734,6 +2734,18 @@ pythonPackages = python.modules // rec { }; + pika = buildPythonPackage { + name = "pika-0.9.12"; + src = fetchurl { + url = https://pypi.python.org/packages/source/p/pika/pika-0.9.12.tar.gz; + md5 = "7174fc7cc5570314fa3cfaa729106482"; + }; + buildInputs = [ nose mock pyyaml ]; + + propagatedBuildInputs = [ unittest2 ]; + }; + + pillow = buildPythonPackage rec { name = "Pillow-1.7.8"; From 65c008f6532a3e29769f152f7c110ff200953861 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 5 Apr 2013 22:53:12 +0200 Subject: [PATCH 16/21] Adding d1x-rebirth, Descent 1 source port. --- pkgs/games/d1x-rebirth/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/games/d1x-rebirth/default.nix diff --git a/pkgs/games/d1x-rebirth/default.nix b/pkgs/games/d1x-rebirth/default.nix new file mode 100644 index 000000000000..471eca78cf1b --- /dev/null +++ b/pkgs/games/d1x-rebirth/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, scons, pkgconfig, SDL, mesa, physfs, SDL_mixer }: + +stdenv.mkDerivation rec { + name = "d1x-rebirth-0.57.3"; + src = fetchurl { + url = "http://www.dxx-rebirth.com/download/dxx/d1x-rebirth_v0.57.3-src.tar.gz"; + sha256 = "07dbjza5flsczdsas0adb5xhn13gmhlpixa8ycp8hjm20y9kw1za"; + }; + + buildInputs = [ scons pkgconfig SDL mesa physfs SDL_mixer ]; + + installPhase = '' + scons prefix=$out install + ''; + + meta = { + homepage = http://www.dxx-rebirth.com/; + description = "Source Port of the Descent 1 engine"; + license = "BSD"; # Parallax license, like BSD I think + 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 84adc0c75b5b..349d115fb5f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8224,6 +8224,8 @@ let dwarf_fortress = callPackage_i686 ../games/dwarf-fortress { }; + d1x_rebirth = callPackage ../games/d1x-rebirth { }; + eduke32 = callPackage ../games/eduke32 { stdenv = overrideGCC stdenv gcc47; }; From 04d41f95d00ea52d2ef85925b9289b170c4a464d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 5 Apr 2013 22:58:43 +0200 Subject: [PATCH 17/21] Adding d2x-rebirth, source port of the Descent 2 engine --- pkgs/games/d2x-rebirth/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/games/d2x-rebirth/default.nix diff --git a/pkgs/games/d2x-rebirth/default.nix b/pkgs/games/d2x-rebirth/default.nix new file mode 100644 index 000000000000..b52e29951983 --- /dev/null +++ b/pkgs/games/d2x-rebirth/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, scons, pkgconfig, SDL, mesa, physfs, SDL_mixer }: + +stdenv.mkDerivation rec { + name = "d2x-rebirth-0.57.3"; + src = fetchurl { + url = "http://www.dxx-rebirth.com/download/dxx/d2x-rebirth_v0.57.3-src.tar.gz"; + sha256 = "0yyandmxz12bbpnd746nddjlqh5i7dylwm006shixis3w3giz77c"; + }; + + buildInputs = [ scons pkgconfig SDL mesa physfs SDL_mixer ]; + + installPhase = '' + scons prefix=$out install + ''; + + meta = { + homepage = http://www.dxx-rebirth.com/; + description = "Source Port of the Descent 2 engine"; + license = "BSD"; # Parallax license, like BSD I think + 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 349d115fb5f9..4a6d5b9ab9b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8226,6 +8226,8 @@ let d1x_rebirth = callPackage ../games/d1x-rebirth { }; + d2x_rebirth = callPackage ../games/d2x-rebirth { }; + eduke32 = callPackage ../games/eduke32 { stdenv = overrideGCC stdenv gcc47; }; From 130c081966baef86c07becee8d1043207126e0fd Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sat, 6 Apr 2013 00:34:50 +0200 Subject: [PATCH 18/21] add thinkfan package --- pkgs/tools/system/thinkfan/default.nix | 29 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/system/thinkfan/default.nix diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix new file mode 100644 index 000000000000..47687ec76d78 --- /dev/null +++ b/pkgs/tools/system/thinkfan/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl }: + +let + + version = "0.8.1"; + +in + +stdenv.mkDerivation { + name = "thinkfan-${version}"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/thinkfan/thinkfan-${version}.tar.gz"; + sha256 = "04akla66r8k10x0jvmcpfi92hj2sppygcl7hhwn8n8zsvvf0yqxs"; + }; + + installPhase = '' + mkdir -p $out/bin + mv thinkfan $out/bin/ + ''; + + meta = { + description = ""; + license = stdenv.lib.licences.gpl3; + homePage = "http://thinkfan.sourceforge.net/"; + maintainers = with stdenv.lib.maintainers; [ iElectric ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a6d5b9ab9b7..6ee3afa97568 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9100,6 +9100,8 @@ let inherit texLive unzip; }; + thinkfan = callPackage ../tools/system/thinkfan { }; + vice = callPackage ../misc/emulators/vice { }; viewnior = callPackage ../applications/graphics/viewnior { }; From f8faea23f845e86c1076a37d92236e6ccfce6af1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 6 Apr 2013 01:22:18 +0200 Subject: [PATCH 19/21] 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(-) 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"; From 509ea2888aa6b25457c4904210d80e17e6d2e3a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 6 Apr 2013 01:41:53 +0200 Subject: [PATCH 20/21] 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(-) 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; From 41c6d26e16e646744187338629fe79a21a80726f Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sat, 6 Apr 2013 08:19:57 +0200 Subject: [PATCH 21/21] garden --- pkgs/tools/system/thinkfan/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix index 47687ec76d78..a13f500c34f8 100644 --- a/pkgs/tools/system/thinkfan/default.nix +++ b/pkgs/tools/system/thinkfan/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = ""; - license = stdenv.lib.licences.gpl3; + license = stdenv.lib.licenses.gpl3; homePage = "http://thinkfan.sourceforge.net/"; maintainers = with stdenv.lib.maintainers; [ iElectric ]; platforms = stdenv.lib.platforms.linux;