Commit Graph

4899 Commits

Author SHA1 Message Date
Lluís Batlle i Rossell
9216b0598c Adding skype4pidgin. It crashes. 2013-04-16 14:53:59 +02:00
Lluís Batlle i Rossell
e60cb1713f pidgin: update to 2.10.7 2013-04-15 22:02:35 +02:00
Lluís Batlle i Rossell
37b1937704 pidgin-otr: update to 4.0.0 2013-04-15 21:35:26 +02:00
Bjørn Forsman
07a71f7a1a eclipse: add Eclipse IDE for C/C++ Developers 4.2
If you upgrade from 3.7 you might get errors like these:

In the Package Explorer:
 Could not create the view: org.eclipse.jdt.ui

And some other stuff in the Error Log; "Unable to resolve plug-in [...]"

The solution is to delete your eclipse workspace (or just the hidden
setting files in there, if you have important user data).
2013-04-15 21:26:59 +02:00
Michael Raskin
2974309fbd Merge pull request #461 from orbitz/bitlbee-3.2
Upgrade bitlbee to 3.2
2013-04-14 23:02:39 -07:00
Peter Simons
0911fe7f3c haskell-github-backup: update to version 1.20130414 2013-04-14 23:06:17 +02:00
Peter Simons
7a69341994 git-annex: drop obsolete dependency on testpack 2013-04-14 21:19:09 +02:00
Lluís Batlle i Rossell
50f3625f70 irssi-otr: updating to a fork more up to date 2013-04-13 18:27:47 +02:00
Lluís Batlle i Rossell
5f2a1806e5 Adding irssi-otr. 2013-04-13 17:17:47 +02:00
Lluís Batlle i Rossell
4837874840 gnunet: update to 0.9.5a (minor bugfixes) 2013-04-13 17:17:16 +02:00
Lluís Batlle i Rossell
9069b8152b freenet: adding a missing jar in the classpath
It was crashing while running, without it.
2013-04-13 15:24:28 +02:00
Lluís Batlle i Rossell
49d4d308d4 Adding freenet
I don't build freenet_ext or bcprov, I just take the jar.
Freenet irc people told me that freenet_ext barely changes and it's a hell to build.
2013-04-13 15:01:46 +02:00
Vladimír Čunát
17ae1617dc Merge branch 'master' into x-updates
Conflicts (systemd version is split on x-updates):
	pkgs/os-specific/linux/systemd/default.nix
2013-04-13 12:21:31 +02:00
aszlig
a3fce096af
chromium: Update all channels to latest versions.
stable:   26.0.1410.43              -> 26.0.1410.63 (builds fine, tested)
beta/dev: 27.0.1453.15/27.0.1453.12 -> 27.0.1453.47 (builds fine, tested)

This should bring beta and dev in par, as dev was older than the beta version.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-04-13 10:31:36 +02:00
aszlig
26431c19cb
virtualbox+guest: Update to new upstream v4.2.12.
All patch files dropped because they're fixed in this release. For a full list
of fixes that come with this maintenance release, please refer to:

https://www.virtualbox.org/wiki/Changelog

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-04-13 10:31:36 +02:00
Lluís Batlle i Rossell
dc50bd550a Adding fish (blowfish over irc) for irssi. 2013-04-13 01:35:16 +02:00
Lluís Batlle i Rossell
7b6a4238b1 silc-client: the irssi plugin segfaults on join, with current irssi.
I fix and make it build the standalone client.
2013-04-13 00:24:55 +02:00
Peter Simons
0b4e664a24 git-annex: update to version 4.20130405 2013-04-13 00:13:22 +02:00
Lluís Batlle i Rossell
2080202a34 silc_client: more url problems
It was harder to test, after nix-prefetch-url. Damn it.
2013-04-12 23:48:29 +02:00
Lluís Batlle i Rossell
a0bbfe59dd silc_client: error in url
I should test better before push.
2013-04-12 23:44:29 +02:00
Lluís Batlle i Rossell
acf2979d9c silc_client: Missing file 2013-04-12 23:41:09 +02:00
Lluís Batlle i Rossell
aaf0a34f2a Adding silc-client as irssi plugin
Alone, with its own irssi, doesn't build.
2013-04-12 21:39:07 +02:00
Peter Simons
84ff838780 emacs-prolog-mode: update to version 1.25 2013-04-12 21:33:37 +02:00
Eelco Dolstra
4adad458e7 Remove the "proprietary" license
We already had "unfree".
2013-04-12 14:37:50 +02:00
Mathijs Kwik
ca392fb8a9 vlc: upgrade to 2.0.6 2013-04-12 11:40:33 +02:00
Malcolm Matalka
254b4a8a6c Upgrade bitlbee to 3.2 2013-04-12 07:39:58 +02:00
Vladimír Čunát
8249695b61 Merge branch 'master' into x-updates
Needed that to fix the tarball.
2013-04-11 23:31:33 +02:00
Shea Levy
1c2565a8ef Add hipchat messaging client
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-11 14:42:32 -04:00
Vladimír Čunát
7c86a69b2a geany: fix build via a minor update 2013-04-11 19:28:21 +02:00
Lluís Batlle i Rossell
744a215a45 qemu: update to 1.4.0 2013-04-10 18:26:42 +02:00
Lluís Batlle i Rossell
57637d02da offrss: fixing crossbuilding, disabling podofo in that case 2013-04-10 18:26:42 +02:00
Lluís Batlle i Rossell
d8f98d1a85 Adding avxsynth.
To add it, I also add ffms and log4cpp.
2013-04-10 15:12:37 +02:00
Eelco Dolstra
bfa358c76e firefox: Update to 20.0 2013-04-09 18:00:26 +02:00
Rickard Nilsson
1f82083c20 darktable: Update to 1.2 2013-04-08 18:22:15 +02:00
Lluís Batlle i Rossell
e0249ffcd0 meld: update to 1.6.1 2013-04-08 12:14:26 +02:00
Lluís Batlle i Rossell
79d155f874 pinta: updating it. It works now. 2013-04-08 11:53:08 +02:00
aszlig
75e5cbde79
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>
2013-04-08 08:51:46 +02:00
aszlig
dcff78f580
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>
2013-04-08 08:51:46 +02:00
Mathijs Kwik
fd76305a9b vlc: enable support for the opus codec 2013-04-08 08:38:10 +02:00
Peter Simons
022f120a2c Merge branch 'master' into stdenv-updates. 2013-04-07 23:37:12 +02:00
Peter Simons
bd8ccc7c2d flac: update download URL for build fix patch 2013-04-07 23:33:19 +02:00
Cillian de Róiste
a3a3c9c502 Update DISTRHO: audio effects and plugins 2013-04-07 16:24:01 +02:00
Peter Simons
c7dee1a5a5 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-04-06 10:33:50 +02:00
Cillian de Róiste
509ea2888a PureData: Update to 0.44, add support for JACK and fix wrapper 2013-04-06 01:42:10 +02:00
Peter Simons
f8faea23f8 emacs-cedet: update to version 1.1 to fix the build 2013-04-06 01:24:46 +02:00
Lluís Batlle i Rossell
77b62dd985 skype-call-recorder: I forgot another patch. grmbl 2013-04-05 17:53:35 +02:00
Lluís Batlle i Rossell
ad5b5bcf0a skype-call-recorder: fix expression and improve conferences
I missed a semicolon; I also add an upstream patch about
improving the hosted conferences support:
abd67f1d44
2013-04-05 16:11:03 +02:00
Lluís Batlle i Rossell
d5a036d63d Adding Skype Call Recorder. 2013-04-05 16:03:25 +02:00
Shea Levy
05e5f5d515 Fix tarball
libiconvOrLibc is null on ppc

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-05 06:59:16 -04:00
Lluís Batlle i Rossell
2187716c53 dwm: adding a patch I missed in a recent commit 2013-04-05 12:50:42 +02:00
Peter Simons
9f4d510b6b Merge branch 'master' into stdenv-updates. 2013-04-05 11:23:38 +02:00
Lluís Batlle i Rossell
48f534bce9 mplayer2: add reference to libXxf86vm
Otherwise, playing h264 with vdpau complains about not able to sync to vsync.
2013-04-05 10:45:03 +02:00
Rickard Nilsson
0013355b19 gmpc: Add meta.platforms 2013-04-05 09:37:02 +02:00
Peter Simons
47e93cd27e 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.
2013-04-05 08:56:40 +02:00
Cillian de Róiste
742d198def Add mid2key: a tool which maps midi notes to keystrokes 2013-04-05 01:25:34 +02:00
Mathijs Kwik
ecc136b172 aangifte2012: preload library which seems needed
The last step "gegevens verzenden" will segfault otherwise.
2013-04-05 00:34:14 +02:00
Lluís Batlle i Rossell
5aacc33406 dwm: fix SDL games with fullscreen
It worked quite bad when the game resolution was different than the
current.
2013-04-04 23:32:53 +02:00
Lluís Batlle i Rossell
d0d4e66652 ffmpeg: update to 1.2 (and patching mplayer2)
Simple patch required by mplayer2 to build with ffmpeg 1.2.
2013-04-04 23:07:23 +02:00
Vladimír Čunát
eb2e46aab2 Merge branch 'master' into x-updates
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
2013-04-04 21:43:40 +02:00
Rickard Nilsson
e31ffe6fb0 gmpc 11.8.16: New package, a GTK MPD (Music Player Daemon) client 2013-04-04 17:42:17 +02:00
Rickard Nilsson
7dbec8267c normalize 0.7.7: New package, an audio file normalizer 2013-04-04 17:07:09 +02:00
Peter Simons
62e37492b9 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-04-04 00:51:30 +02:00
Moritz Ulrich
f49becb7a6 Merge branch 'master' into dropbox-py
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>

Conflicts:
	pkgs/top-level/all-packages.nix
2013-04-04 00:18:48 +02:00
Alexander Tsamutali
e42014eb5a conkeror: Update to 1.0pre-20130401. 2013-04-03 22:48:17 +04:00
Vladimír Čunát
a89ca06293 Merge pull request #439 from jcumming/recoll.130401
recoll: add 1.18.1
2013-04-03 08:22:33 -07:00
Rickard Nilsson
c544639554 darktable: Add 1.2-RC1 as darktable12 2013-04-02 15:53:57 +02:00
Rickard Nilsson
19deeadae0 mopidy: Update to 0.12.0 2013-04-02 15:53:57 +02:00
Lluís Batlle i Rossell
3bdb2ecea4 cinepaint: making it run (missing rpath) 2013-04-02 14:29:01 +02:00
Jack Cummings
ed6ae95e1a fix recoll filters, enable inotify support. 2013-04-01 22:59:22 -07:00
Michael Raskin
4fbd7b0abb Chromium: automatic update picked lite version; maybe non-lite will work 2013-04-02 09:01:54 +04:00
Jack Cummings
7bc828366f recoll-1.18.1 2013-04-01 15:42:41 -07:00
viric
7c56d001b2 Merge pull request #427 from mpashton/mpa
Upgrade kicad to stable 20130325
2013-04-01 11:05:51 -07:00
Peter Simons
f3a16d0dd5 update meta.maintainers section 2013-04-01 18:44:33 +02:00
Domen Kožar
e5d3d4712a Merge pull request #436 from bjornfor/tig
tig: enable bash completion
2013-04-01 09:42:51 -07:00
Bjørn Forsman
e21c53c211 tig: enable bash completion
Copy the bash completion script that comes with tig to
$out/etc/bash_completion.d/.

Note: to enable bash completion in NixOS, set
environment.enableBashCompletion = true;
2013-04-01 18:37:52 +02:00
Domen Kozar
16672fc8b1 xbmc: add pulse support, lame, avahi, libdvdcss 2013-04-01 17:13:00 +02:00
Peter Simons
64f600a010 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-04-01 13:39:57 +02:00
Moritz Ulrich
72a724c0d2 New: yeganesh, a small wrapper around dmenu.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-04-01 12:13:01 +02:00
Peter Simons
8b3fd09c00 Merge pull request #433 from jcumming/rawtherapee.130331
rawtherapee-4.0.10
2013-04-01 02:42:32 -07:00
Peter Simons
f7b0e161b0 Merge pull request #432 from jcumming/shntool.130322
shntool-3.0.10
2013-04-01 02:39:46 -07:00
Michael Raskin
d418a2aaac Chromium: automatic update to the latest 2013-04-01 10:08:11 +04:00
Jack Cummings
1993c18546 missing semicolon. 2013-03-31 22:09:17 -07:00
Jack Cummings
4a9c724377 shntool metadata: license, maintainer, platform 2013-03-31 21:45:40 -07:00
Jack Cummings
437419a124 rawtherapee-4.0.10 . Add a 'float' option to fftw, as this version of rawtherapee requires it. 2013-03-31 21:33:21 -07:00
Michael Ashton
7b01680d87 kicad: upgrade to stable version 20130325, libraries to r220
- changed to require wxWidgets 2.9 -- seems to satisfy requirement for
libgtkprint, even with gtk2
2013-03-31 19:17:02 -07:00
Lluís Batlle i Rossell
55f14cc7f3 lame: update from 3.98.4 to 3.99.5 2013-03-30 18:10:38 +01:00
Lluís Batlle i Rossell
a76a9f783e Adding omxplayer, for the raspberrypi. 2013-03-29 21:54:29 +01:00
Domen Kozar
eff57f3b9e ncmpcpp: set platforms 2013-03-29 18:38:12 +01:00
Rok Garbas
6c890824bd fixed typo from previous commit 2013-03-29 18:28:11 +01:00
Rok Garbas
a9c7252a3e i3status and i3lock should have same platform as i3wm 2013-03-29 17:38:59 +01:00
Peter Simons
c0904ba327 Merge pull request #420 from ocharles/lightdm
lightdm: Add lightdm and lightdm-gtk-greeter
2013-03-29 08:19:26 -07:00
Oliver Charles
255f402bdd lightdm: Add lightdm and lightdm-gtk-greeter 2013-03-29 15:37:28 +01:00
Domen Kozar
67ce79f5e4 set platforms for i3wm 2013-03-29 13:27:04 +01:00
Domen Kožar
c2b44a8da0 Merge pull request #418 from bjornfor/pitz
pitz: new package
2013-03-28 09:39:53 -07:00
Bjørn Forsman
4b1042cf02 pitz: new package
pitz is a distributed bug tracker, inspired by ditz. Homepage:
http://pitz.tplus1.com/

pitz has a command line interface, pitz-<command>, and a webapp,
pitz-webapp.

TODO: pitz has a pitz-shell utility that depends on ipython, but when I
enabled it it raised an exception. I think it depends on an old IPython
version:

  from IPython.Shell import IPShellEmbed
  ImportError: No module named Shell

A broken pitz-shell doesn't affect the rest of the command line
interface nor the webapp, so it is not critical to have it working.

There are not many distributed bug trackers out there, so I hope that
adding pitz to nixpkgs may inspire people to support pitz (or similar
software).
2013-03-28 17:25:42 +01:00
Domen Kozar
65057975c8 xbmc: bump to 12.1 2013-03-28 17:21:20 +01:00
Peter Simons
fdbe2878f0 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-03-28 14:02:56 +01:00
Domen Kozar
229616de83 set platforms and correct license to synergy 2013-03-28 13:24:37 +01:00
Vladimír Čunát
7d7407f75f Merge pull request #408 from maggesi/hol_light_updates
hol_light: update to rev 157
2013-03-28 05:04:17 -07:00
Cillian de Róiste
0caed13c85 Merge: use Python 3.3 as the default version of Python3 2013-03-28 01:13:37 +01:00
Cillian de Róiste
49b23b29dd Blender: Tidy up, sort inputs, remove unused OPENJPEG option 2013-03-28 01:00:22 +01:00
Cillian de Róiste
ca2a39757c Blender: enable extra features in the Video Sequence Editor
FFMPEG support allows a greater variety of export and import options.
SNDFILE support allows WAV and other sound file formats to be used.
JACK support allows blender to be used with XJadeo, Ardour or any other JACK away audio editor.
2013-03-28 00:52:08 +01:00
Cillian de Róiste
043d21b69d Add OpenColorIO support to OpenImageIO and tidy up 2013-03-28 00:46:23 +01:00
Cillian de Róiste
67a1becfdc OpenImageIO Tidy Up: moved to applications/graphics
oiio includes CLI tools for manipulating graphics
2013-03-27 23:29:17 +01:00
Cillian de Róiste
64bc336f50 Blender 2.66 WIP 2013-03-27 22:25:33 +01:00
Moritz Ulrich
f071e856d3 Fix platform note in dropbox-cli
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-03-27 20:56:46 +01:00
Moritz Ulrich
ff953e211e New package: dropbox-cli
dropbox-cli, part of dropbox-nautilus is a small self-contained python
script to control the dropbox daemon.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-03-27 20:12:58 +01:00
Rickard Nilsson
608fe14130 darktable: Update to 1.1.4 2013-03-27 16:16:58 +01:00
aszlig
d5c8419823
chromium: Update all channels to latest versions.
stable: 25.0.1364.152 -> 26.0.1410.43 (builds fine, tested)
beta:   26.0.1410.28  -> 26.0.1410.43 (builds fine, tested)
dev:    26.0.1410.28  -> 27.0.1448.0  (build fixed and tested)

For version 27, this introduces a new dependency on libXtst and removes the
patch for siginfo_t and the pulseaudio array bounds error.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-27 00:26:56 +01:00
aszlig
432e0f869c
chromium: Remove patch for CLONE_DETACHED.
This patch was introduced before (7e5109a) the stdenv-updates merge and is no
longer needed, as the current C library doesn't use this flag anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-27 00:26:56 +01:00
aszlig
adfc5939a7
chromium: Fix updater for version 26 and newer.
The updater was actually getting the -lite version, which our expression won't
build with, except if we switch some bundled dependencies to those in nixpkgs.

Of course the problem with fetching version 27 was me being stupid and using a
case statement in the updater, as if there won't be any version after 26 ;-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-27 00:26:55 +01:00
Sander van der Burg
d4642465ab dropbox: add x86 support 2013-03-26 16:39:03 +01:00
Lluís Batlle i Rossell
70ae131f62 gimp: update from 2.8.2 to 2.8.4 2013-03-26 15:39:37 +01:00
Cillian de Róiste
67a1c3df94 LinuxSampler: fix the build by disabling a check for a bug
Without the --disable-nptl-bug-check configure option LinuxSampler
refuses to build. It seems to be a long standing bug. Despite this, I
have used LinuxSampler for over a week now and it seems OK.
2013-03-25 21:52:38 +01:00
cillianderoiste
bc52258874 Merge pull request #410 from pcapriotti/bitcoin
Update bitcoin-qt to 0.8.1
2013-03-25 08:15:33 -07:00
Paolo Capriotti
1ff424afaf Update bitcoin-qt to 0.8.1 2013-03-25 13:50:32 +00:00
Peter Simons
0823aea0a6 Merge branch 'master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/libxslt/default.nix

Commit 1764ea2b0a introduced changes to libxslt
in an awkward way to avoid re-builds on Linux. This patch has been simplified
during this merge.
2013-03-25 13:43:45 +01:00
Peter Simons
ab98d72fad git: fix build on FreeBSD
Our hard-linking code depended on md5sum, which FreeBSD doesn't have in its
system environment. To avoid that impure dependency, the hard-linking is now
done with the 'hardlink' utility from Nixpkgs.
2013-03-25 12:47:39 +01:00
Peter Simons
b08ba87b36 rsync: add meta.license attribute 2013-03-25 12:44:22 +01:00
Peter Simons
58211c125a Merge pull request #407 from maggesi/proofgeneral_updates
Update ProofGeneral to version 4.2
2013-03-25 03:33:21 -07:00
Marco Maggesi
fa2d85fded Update HOL Light to rev 157 2013-03-25 10:56:57 +01:00
Florian Friesdorf
9f7aef51ea Revert "chromium-25.0.1364.172, 26.0.1410.40, 27.0.1448.0"
This reverts commit 6617f5ca9e.

The old situation was definitely better. Sorry for waiting so long for
the revert.
2013-03-25 07:17:20 +01:00
Jack Cummings
94a3a5e00a shntool-3.0.10 2013-03-24 22:08:09 -07:00
Marco Maggesi
7b35dcdc62 ProofGeneral: remove dead code (compatibility with emacs 23). 2013-03-24 23:43:18 +01:00
Florian Friesdorf
c93aebb87e get iptraf to compile 2013-03-24 14:44:10 +01:00
Shea Levy
4fa4ab3a6e Partially revert my recent kernelPackages changes
First, pass in `self' again so that overriding works properly (thanks
for pointing that out, @edolstra)

Second, instead of having linuxPackages*.kernel mean something different
inside the set and out, add a new attribute linuxPackages*.kernelDev,
which for the generic kernel is simply linuxPackages*.kernel but for the
manual-config kernel is the `dev' output (which has the build tree,
source tree, etc.)

The second change required trivial modifications in a bunch of
expressions, I verified that all of the linuxPackages* sets defined in
all-packages.nix have the same drv paths before and after the change.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-24 07:45:00 -04:00
Florian Friesdorf
6617f5ca9e chromium-25.0.1364.172, 26.0.1410.40, 27.0.1448.0
26.0.1410.28 was broken for me
2013-03-23 18:20:38 +01:00
Peter Simons
6fc2cccfe6 Add myself as a maintainer to all Haskell packages (re-)generated by hackage4nix. 2013-03-23 15:58:14 +01:00
Lluís Batlle i Rossell
4144141c7b Fixing the teamviewer evaluation and builds.
Now tested even the tarball, before committing.
2013-03-22 16:16:37 +01:00
Rok Garbas
f7ddf2fc4a Merge pull request #398 from the-kenny/dunst
dunst, a lightweight notification daemon
2013-03-22 05:17:02 -07:00
Moritz Ulrich
c4ffd2cac9 dunst: Add meta.platforms.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-03-22 13:00:49 +01:00
Lluís Batlle i Rossell
fb7b910aa3 Fixing tarball (missed assertion) 2013-03-22 12:55:01 +01:00
Peter Simons
7df21af242 wxmaxima: don't try to build this package on FreeBSD 2013-03-22 12:53:07 +01:00
Lluís Batlle i Rossell
d716731cf4 teamviewer: adding a work-in-progress lowprio version 8.
It requires root running a daemon, just to use the client. Suspicious.
2013-03-22 12:41:16 +01:00
Lluís Batlle i Rossell
6f64c0c6d6 teamviewer: fixing broken wine reference 2013-03-22 12:17:05 +01:00
Lluís Batlle i Rossell
930ace150b Adding teamviewer client for linux (www.teamviewer.com)
In fact it uses wine.
2013-03-22 12:10:50 +01:00
Peter Simons
73c610e1d6 git: update to version 1.8.2 2013-03-22 02:11:38 +01:00
Mathijs Kwik
208a35558e emacs-w3m: upgrade to current cvs 2013-03-22 00:00:06 +01:00
Mathijs Kwik
b73b3c9d62 htmlize: upgrade to 1.47 2013-03-22 00:00:06 +01:00
Mathijs Kwik
8b39202106 add dutch tax application for 2012 2013-03-22 00:00:04 +01:00
Michael Raskin
8e5dc9b5df Fix K3D gtlglext handling 2013-03-21 13:45:12 +04:00
Peter Simons
22fb1ad99e Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-03-21 09:23:54 +01:00
Vladimír Čunát
d210a4a8fa goldendict: fix build with gcc47 2013-03-21 00:08:24 +01:00
viric
9dc4ec57a1 Merge pull request #397 from modulistic/master
i3 improvements
2013-03-20 13:52:32 -07:00
Moritz Ulrich
c2d3d24349 Add dunst, a lightweight notification daemon.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-03-20 21:35:13 +01:00
Lluís Batlle i Rossell
0d23e54588 opus-tools: update 2013-03-20 20:28:39 +01:00
Peter Simons
d28d3f37a8 topgit: fix build on FreeBSD
The BSD unices have a version of install(1) that doesn't support the -D flag. Grr.
2013-03-20 11:43:43 +01:00
Peter Simons
7ee8641410 haskell-xmonad-contrib: update to version 0.11.1 2013-03-20 10:44:54 +01:00
Peter Simons
51e64392ea git-annex: update to version 4.20130314 2013-03-20 10:15:06 +01:00
Peter Simons
a1a7448e5b topgit: update to version 0.9 2013-03-20 09:50:06 +01:00
modulistic
ae9b33ac51 i3 window manager: version bump from 4.5 to 4.5.1 2013-03-20 00:14:22 +01:00
modulistic
f976962d7b i3 window manager: enable Pango support for antialiased fonts 2013-03-20 00:13:44 +01:00
Marco Maggesi
cd3caeaf8f Update ProofGeneral to version 4.2 2013-03-19 14:49:45 +01:00
Peter Simons
4fcb4a1ca1 gv: update to version 3.7.4 2013-03-18 11:36:16 +01:00
Lluís Batlle i Rossell
470a015950 transmission: nicer about disabling gtk 2013-03-17 22:30:42 +01:00
Lluís Batlle i Rossell
51528e61d9 transmission: update to 2.77, but leave the old 2.60 for its gtk client
The gtk client in 2.61 and above require a gtk3 we don't have in nixpkgs yet.
2013-03-17 22:27:55 +01:00
Rok Garbas
464fd741cd notmuch: update to 0.15.2 2013-03-17 15:13:53 +01:00
Rok Garbas
16f6c3b752 i3: update to 4.5 also updating i3status to 2.7 2013-03-17 14:45:37 +01:00
Danny Wilson
d007a78ccb Merge remote-tracking branch 'origin/stdenv-updates' into illumos
Conflicts:
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/mpc/default.nix
	pkgs/development/libraries/mpfr/default.nix
	pkgs/development/libraries/ppl/default.nix
	pkgs/tools/misc/coreutils/default.nix
2013-03-17 13:22:24 +01:00
Vladimír Čunát
b1eeae8cac Merge branch 'master' into x-updates
Conflicts (easy):
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/pango/default.nix
2013-03-17 11:28:28 +01:00
Vladimír Čunát
192bdc79ae Merge pull request #380 from oxij/random-updates
cmus: update to 2.5.0
2013-03-16 11:40:06 -07:00
Vladimír Čunát
d898a207b9 Merge pull request #375 from ierton/viewnior
viewnior: Add viewnior, GTK image viewer program
2013-03-16 11:33:53 -07:00
Cillian de Róiste
1f000ba427 Merge branch 'master' of github.com:NixOS/nixpkgs 2013-03-16 16:33:43 +01:00
Cillian de Róiste
2b07e1bf4c Ardour3: update to the release of Ardour 3.0
A tarball is only available to subscribers or people who pay
to download it on the site. This project is GPL licensed but
users are strongly encouraged to support it financially
2013-03-16 16:33:16 +01:00
Lluis Batlle
8d76cf51bb elinks: allow building without guile
Guile doesn't build on armv5tel now (failing an important test),
so better if I can disable it for elinks.
2013-03-16 13:39:30 +01:00
Eelco Dolstra
098190c9dd firefox: Update to 19.0.2 2013-03-15 14:31:25 +01:00
Vladimír Čunát
9ac8a16277 vimprobable2, surf: fix the settings-schemas problem
Note that they still segfault.
2013-03-14 16:01:53 +01:00
Sander van der Burg
23c78e41db git: Adding -lgcc_s on darwin causes the build to fail, so we disable it for that platform 2013-03-14 14:57:40 +01:00
Jan Malakhovski
33379ae58a cmus: update to 2.5.0
This version builds with current ffmpeg.
CUE support is nice too.
2013-03-14 13:50:29 +00:00
Peter Simons
ea804dfb1a Merge pull request #376 from pcapriotti/master
Fix bip build
2013-03-13 02:55:00 -07:00
Rob Vermaas
784d2b2d16 Update to latest spotify 2013-03-12 22:13:29 +01:00
Rob Vermaas
b512e3e934 Initial try to update spotify to version 0.8.4.103. Still need to get rid
of LD_LIBRARY_PATH wrapper, and properly patchelf any libs in the spotify
prefix.
2013-03-12 22:13:29 +01:00
Sergey Mironov
c52bd0c8d8 viewnior: Add viewnior, GTK image viewer program 2013-03-12 23:45:50 +04:00
Paolo Capriotti
03e6a6f85f Add patch to fix build for bip. 2013-03-12 18:23:55 +00:00
Domen Kozar
acf4697a5f upgrade xbmc to 12.0 2013-03-12 01:35:16 +01:00
Shea Levy
931df3e91d Merge branch 'xbmc-hydra' of git://github.com/iElectric/nixpkgs
Trivial meta information update.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-11 14:25:23 -04:00
Peter Simons
5186e75c4f emacs: update to version 24.3
The builder.sh script used to call "make bootstrap" before running the build.
This build step, however, removes all kinds of generated files normally
included in the distributions -- such as the 'configure' script. If that target
is run, then new version of Emacs require Autoconf and Automake to compile.
Since the benefit of running "make bootstrap" is unclean to me, I chose to
remove that build step instead. As far as I can tell, the Emacs binary that
results from this build works fine.
2013-03-11 19:18:31 +01:00
Domen Kozar
65a4f741fd Set platform and maintainer for xbmc pkg 2013-03-11 18:12:46 +01:00
Rok Garbas
859c7dfae8 msmtp: Update to 1.4.30, added optional libraries as dependency and point to correct license 2013-03-10 21:17:17 +01:00
Carles Pagès
6c949148b6 Merge remote-tracking branch 'upstream/x-updates' into wayland
Conflicts:
	pkgs/development/libraries/mesa/default.nix
	pkgs/top-level/all-packages.nix
2013-03-10 18:19:49 +01:00
Peter Simons
4c9ebb62d4 git: link binaries with libgcc_s.so to ensure pthread_cancel() works 2013-03-09 23:57:57 +01:00
Vladimír Čunát
86639d9bb9 Merge branch 'master' into x-updates
Conflicts (taken master versions):
	pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
	pkgs/desktops/xfce/applications/gigolo.nix
	pkgs/desktops/xfce/applications/mousepad.nix
	pkgs/desktops/xfce/applications/ristretto.nix
	pkgs/desktops/xfce/applications/terminal.nix
	pkgs/desktops/xfce/applications/xfce4-mixer.nix
	pkgs/desktops/xfce/applications/xfce4-notifyd.nix
	pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
	pkgs/desktops/xfce/art/xfce4-icon-theme.nix
	pkgs/desktops/xfce/core/exo.nix
	pkgs/desktops/xfce/core/garcon.nix
	pkgs/desktops/xfce/core/gtk-xfce-engine.nix
	pkgs/desktops/xfce/core/libxfce4ui.nix
	pkgs/desktops/xfce/core/libxfce4util.nix
	pkgs/desktops/xfce/core/libxfcegui4.nix
	pkgs/desktops/xfce/core/thunar-volman.nix
	pkgs/desktops/xfce/core/thunar.nix
	pkgs/desktops/xfce/core/tumbler.nix
	pkgs/desktops/xfce/core/xfce4-appfinder.nix
	pkgs/desktops/xfce/core/xfce4-panel.nix
	pkgs/desktops/xfce/core/xfce4-power-manager.nix
	pkgs/desktops/xfce/core/xfce4-session.nix
	pkgs/desktops/xfce/core/xfce4-settings.nix
	pkgs/desktops/xfce/core/xfconf.nix
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/desktops/xfce/core/xfwm4.nix
	pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
	pkgs/development/libraries/webkit/default.nix
	pkgs/top-level/all-packages.nix
2013-03-09 17:55:37 +01:00
Александр Цамутали
a39f05f46a applications/audio/jack-rack: New nixpkg. 2013-03-09 18:03:12 +04:00
Александр Цамутали
241f94f59f applications/audio/caps: New nixpkg. 2013-03-09 17:54:59 +04:00
Vladimír Čunát
cf3ff172cd panotools: disabling tests due to strange failures 2013-03-09 13:16:41 +01:00
Michael Raskin
d5288c7e3a TPTP had a bugfix without version change 2013-03-09 14:24:45 +04:00
Shea Levy
e07a7e6156 Merge branch 'master' of git://github.com/fignuts/nixpkgs
This updates mysql-workbench. Didn't compile before, compiles now.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:01:04 -05:00
Shea Levy
e13c058fd2 Merge branch 'makemkv.130223.0' of git://github.com/jcumming/nixpkgs
This adds the proprietary makemkv package to convert dvd and blu-ray
videos to mkv.

I've tested that it builds, nothing more.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 17:26:53 -05:00
Peter Simons
d96af07c9f xmobar: patch to support <freeratio> variable in memory monitor 2013-03-08 13:37:58 +01:00
Eelco Dolstra
674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
aszlig
5ae408b618
chromium: Update all channels to latest versions.
This updates all release channels to the latest versions:

stable: 25.0.1364.97 -> 25.0.1364.152 (builds fine, untested)
beta:   26.0.1410.12 -> 26.0.1410.28  (builds fine, tested)
dev:    26.0.1410.12 -> 26.0.1410.28  (builds fine, tested)

Still, we should have version 27 already for the dev channel, so we might look
about where to find the newest tarball.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-07 10:24:18 +01:00
Cillian de Róiste
43e8e7763b Add MyPaint: A graphics application for digital painters 2013-03-06 23:08:30 +01:00
Carles Pagès
728116ec3e weston: don't depend on pixman explicitly.
Weston depends on cairo and pixman, but cairo uses a special version of pixman.
In the previous commit I solved a linking problem by specifying the same pixman
version for weston, but it's easier to rely on cairo propagating it. Thanks
viric for the tip!
2013-03-06 22:59:59 +01:00
Cillian de Róiste
151901ac21 drumkv1: add description 2013-03-06 22:26:08 +01:00
Andrew Morsillo
7d4d40e82b Update mysql workbench version 2013-03-06 20:08:30 +01:00
Cillian de Róiste
6254091950 Add rncbc's Vee One suite: sampler, synth and drum kit 2013-03-06 01:06:16 +01:00
Mathijs Kwik
45aea0bf52 mkvtoolnix: upgrade to 6.1.0 2013-03-04 22:40:22 +01:00
Rickard Nilsson
4d181e526e mopidy: Add some more dependencies needed for the HTTP frontend 2013-03-03 20:53:48 +01:00
Cillian de Róiste
266e283faf Add jack_oscrolloscope: a waveform viewer for JACK 2013-03-03 17:43:15 +01:00
Vladimír Čunát
e6143c35e2 Merge pull request #344 from ierton/zathura-improve
zathura: fix manpages, include .desktop icon
2013-03-03 05:21:03 -08:00
Vladimír Čunát
bd6165645a Merge pull request #341 from bjornfor/transmission-version-bump
transmission: bump from 2.52 to 2.60
2013-03-03 05:18:54 -08:00
Carles Pagès
8de5d77e3c Merge branch 'master' into wayland
Conflicts:
	pkgs/top-level/all-packages.nix
2013-03-03 11:58:28 +01:00
Vladimír Čunát
d7abc31f5a fix the last master merge, sorry for the problems
Now I carefully re-merged all the conflicts and tested some builds.
Hopefully it's all OK now.
2013-03-02 22:34:37 +01:00
Vladimír Čunát
d9a2b1f520 ardour(2): fix and minor update.
- use fetchurl from Gentoo mirror instead of failing SVN fetch
- minor version update
- use system libraries as much as possible
- fix building
2013-03-02 21:17:30 +01:00
Peter Simons
4f697db7dd haskell-github-backup: update to version 1.20120314 2013-03-02 17:07:43 +01:00
Vladimír Čunát
da71b6d579 rekonq: update
Note it won't build with kde 4.7 and newer versions even require 4.9
which we don't have yet (4.10 is the current upstream).
2013-03-02 14:44:51 +01:00
Vladimír Čunát
26af997d41 Merge branch 'master' into stdenv-updates
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
Vladimír Čunát
70ac286bf8 Merge pull request #346 from ierton/mplayer-fix-icon
mplayer: install desktop icon when X11 is enabled
2013-03-02 01:22:44 -08:00
Vladimír Čunát
c8b940072d koffice, kbluetooth: remove from hydra 2013-03-02 09:21:11 +01:00
Lluís Batlle i Rossell
089fd0a769 fvwm: updating license to gplv2+
I looked at some src, and it mentions "or later".
2013-03-01 20:38:23 +01:00
viric
5097ff2b1a Merge pull request #347 from iyzsong/fvwm
add fvwm-2.6.5
2013-03-01 11:30:17 -08:00
Jordi
cf8d64b458 New wraper for surf 2013-03-01 19:53:42 +01:00
Jordi
0d6f6e6d37 Wraper with glib_network 2013-03-01 19:31:00 +01:00
Eelco Dolstra
56d197ab0b firefox: Update to 19.0.1
And use --with-system-nss again.
2013-03-01 13:52:10 +01:00
Jack Cummings
58a9875789 missing semicolon, found after push.. 2013-03-01 01:26:19 -08:00
aszlig
113b15f3a8
virtualbox: Update tarball sha256sum of v4.2.8.
Outrageous! They fixed the tarball by including the missing file.
Well, at least we now don't have that much cruft laying around and can remove
that rather long patch.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-01 10:14:44 +01:00
aszlig
fc088ae732 virtualbox: Fix build with kernel 3.9.0.
This patch is cherry-picked from VirtualBox Subversion, revision 44867.

It's rather small and only is in effect if kernel version is >= 3.9.0, so it
won't break existing kernels, so I'm adding it here despite we usually only care
about the latest stable upstream (kernel) versions.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-01 09:42:38 +01:00
aszlig
1029ca5767 virtualbox: Support UIDGID_STRICT_TYPE_CHECKS.
This adds a patch to support CONFIG_UIDGID_STRICT_TYPE_CHECKS being activated in
the kernel config (selected by CONFIG_USER_NS for example).

When this kernel option is enabled, current->cred->uid is a structure rather
than a simple integer type (uid_t and gid_t), so we need to check for that and
also pass the current user namespace where needed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-01 09:42:38 +01:00
aszlig
f26b5fb730 virtualbox+guest: Update to version 4.2.8.
The tarball for this version is missing the file VRDEVideoIn.h, which is added
through the missing_files_4.2.8.patch and extracted from Subversion, revision
44528.

Upstream changelog(s) can be found at the usual place:

https://www.virtualbox.org/wiki/Changelog

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-01 09:42:38 +01:00
Song Wenwu
f5bd4f720a add fvwm-2.6.5 2013-03-01 13:48:33 +08:00
Cillian de Róiste
bb5f60fec1 Add Jalv: an LV2 host for Jack
This allows LV2 audio plugins to be connected to Jack applications
2013-03-01 01:33:08 +01:00
Sergey Mironov
bd49c22ea1 mplayer: install desktop icon when X11 is enabled 2013-03-01 00:20:52 +04:00
Danny Wilson
ecba7e947e Update Git to 1.8.1.3 and fix build on Illumos. 2013-02-28 20:04:06 +01:00
Vladimír Čunát
4cf8fa5f8a centerim: fix from debian 2013-02-28 15:11:03 +01:00
Vladimír Čunát
a606eab76e tangogps: fix bad includes 2013-02-28 14:07:50 +01:00
Peter Simons
329b33c59c git-annex: clean up build expression 2013-02-28 13:04:15 +01:00
Peter Simons
e23be1b2ef git-annex: update to version 4.20130227 2013-02-28 11:31:44 +01:00
Sergey Mironov
061627feed zathura: fix man pages; include .desktop icon 2013-02-28 12:08:36 +04:00
Sergey Mironov
7cd4a5b0a1 zathura: set myself as a maintainer
Conflicts:
	pkgs/applications/misc/zathura/default.nix
2013-02-28 12:07:46 +04:00
aszlig
4f4dc40099
flashplayer-11: Add missing rpath to libnss.
This was missing in the previous update as well, and no one seemed to notice it,
including myself? Anyway, it's now fixed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 01:24:41 +01:00
aszlig
3423ea9e7b
chromium: Remove version 24 specific stuff.
This gets rid of the patch for newer pulseaudio library versions.

In addition, we now have protobuf and pciutils in default dependencies, as those
are required (or better: optional, but recommended and thus activated by the
default gyp options) by versions >= 25.

Also, we now no longer depend on libpng, but I'm not dropping this, as we want
to get back to libpng from nixpkgs again 'real soon'.

The stack-protector flag is now disabled by default accross all versions, and
probably didn't hurt back in version 24, but at least we're now no longer add it
dependant on a particular version.

And those pesky post/onlyXX version booleans are now pre/postXX, to ensure
better clarity.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 01:16:50 +01:00
aszlig
b3c3579172
chromium: Update stable channel to v25.0.1364.97.
So, after searching for days in the wrong spot, eventually discovering that
postPatch isn't run on Hydra, we're now set to move forward to version 25, YAY!

Build has been tested locally (not that this would mean anything for Hydra, as
we've seen) and the output has been actively used for browsing by me :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 01:16:50 +01:00
aszlig
3254c0ac29
chromium: Add /dev/null to patches list.
This is needed in order to ensure that the postPatch hook is executed, which is
not when the patches list is empty.

It is fixed by 82f94df719 in stdenv-updates.
So as soon as the branch gets merged, we can get rid of this hack as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 01:16:50 +01:00
aszlig
80af8871de
flashplayer-11: Update to version 11.2.202.273.
This version contains another set of security fixes, details are described here:

http://www.adobe.com/support/security/bulletins/apsb13-08.html

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 01:16:49 +01:00
aszlig
28eff71465
Revert "chromium: Force -fno-stack-protector..."
This reverts commit b7cbb4da11.

The main reason behind this - apart from looking ugly - is that it didn't really
solve anything, see:

http://hydra.nixos.org/build/4198299

So, we need a different and less hacky approach...

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 01:16:49 +01:00
aszlig
0a43ce41de
chromium: Update dev and beta channels.
So, chromium 25 is now stable, so we really need to get the build fixed on Hydra
as soon as possible. And let's hope without nasty workarounds.

This commits updates dev and beta channels to version 26.0.1410.12, because
version 27.0.1423.0 seems to be unavailable right now. Build is running
successfully on my machine, and the browser works as well on the sites I usually
visit.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 01:16:49 +01:00
Eelco Dolstra
5509f3beec wireshark: Update to 1.8.5
CVE-2013-1582, CVE-2013-1586, CVE-2013-1588, CVE-2013-1590
2013-02-27 15:07:28 +01:00
Bjørn Forsman
586a93178e transmission: bump from 2.52 to 2.60
2.60 is the newest of the gtk2-compatible versions. (Transmission >=
2.61 requires gtk3.)

* Add inotify as input to not have transmission-daemon poll the torrent
  auto-load directory.
* Add file as input to fix a small build time issue (non-fatal).
* Remove unneeded gtk configure flags (support is auto-detected).
* icon-theme.cache is only generated when building with gtk, so use
  rm -f to not error out when building without gtk.
* Use gtk ? null instead of gtkClient flag because it is simpler.

Build and runtime tested with and without gtk support.
2013-02-27 13:45:41 +01:00
Peter Simons
80dc8df25d haskell-github-backup: update to version 1.20120314 2013-02-27 12:00:52 +01:00
Rickard Nilsson
566d5d3fb5 Add mopidy, a music server supporting spotify and the mpd protocol 2013-02-26 19:42:57 +01:00
Lluís Batlle i Rossell
a5192222e9 surf: updating to 0.6
it didn't work since the libsoup update, and now it doesn't work either.
Let's see after fixing libsoup.
2013-02-25 21:08:16 +01:00
Lluís Batlle i Rossell
e431ec94ad Making vimprobable2 use the default nixos ca bundle by default 2013-02-25 20:56:49 +01:00
Peter Simons
8f1c029e33 haskell-github-backup: add version 1.20120627 2013-02-25 15:25:54 +01:00
Peter Simons
8f1756e2d4 git: update to version 1.8.1.3 2013-02-25 02:12:42 +01:00
Peter Simons
1420012eca darcs: disable test suite to avoid 127 exit code 2013-02-25 00:37:11 +01:00
Peter Simons
a30df95691 Re-generate all Haskell packages with the latest version of cabal2nix.
This change brings support for building and running the regressions test suites.
2013-02-25 00:32:40 +01:00
Peter Simons
dd9ff9adb7 darcs: disable test suite to avoid 127 exit code 2013-02-25 00:03:34 +01:00
Peter Simons
7165babaf1 Re-generate all Haskell packages with the latest version of cabal2nix.
This change brings support for building and running the regressions test suites.
2013-02-24 22:09:07 +01:00
Peter Simons
5f32207dfc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
Vladimír Čunát
7421ee673c qucs: minor update and fix for new gcc 2013-02-24 15:11:19 +01:00