Commit graph

27537 commits

Author SHA1 Message Date
Vladimír Čunát
45f7b9c319 virtualbox: make guest additions use driver according to xserver version 2013-06-23 14:16:21 +02:00
Bjørn Forsman
43c9ab900b virtualbox-guestadditions: fix xorg incompatibility
A recent X update broke VirtualBox guest additions (vboxvideo driver version
mismatch, desktop won't start). This fixes it.

Here is the error log:

 (II) "glx" will be loaded by default.
 (II) LoadModule: "glx"
 (II) Loading /nix/store/kzvmnjlps51q4piqmwr7zbmxcg2z9vgk-xorg-server-1.13.4/lib/xorg/modules/extensions/libglx.so
 (II) Module glx: vendor="X.Org Foundation"
 	compiled for 1.13.4, module version = 1.0.0
 	ABI class: X.Org Server Extension, version 7.0
 (==) AIGLX enabled
 Loading extension GLX
 (II) LoadModule: "vboxvideo"
 (II) Loading /nix/store/4kbxi00h8xsmfgbws2qqh674lcfp03h6-VirtualBox-GuestAdditions-4.2.14-3.2.46/lib/xorg/modules/drivers/vboxvideo_drv.so
 (II) Module vboxvideo: vendor="Oracle Corporation"
 	compiled for 10.12.0, module version = 1.0.1
 	Module class: X.Org Video Driver
 	ABI class: X.Org Video Driver, version 12.0
 (EE) module ABI major version (12) doesn't match the server's version (13)
 (II) UnloadModule: "vboxvideo"
 (II) Unloading vboxvideo
 (EE) Failed to load module "vboxvideo" (module requirement mismatch, 0)
 (II) LoadModule: "vboxmouse"
 (WW) Warning, couldn't open module vboxmouse
 (II) UnloadModule: "vboxmouse"
 (II) Unloading vboxmouse
 (EE) Failed to load module "vboxmouse" (module does not exist, 0)
 (EE) No drivers available.

Fatal server error:
 no screens found
2013-06-23 13:06:03 +02:00
Song Wenwu
48e1e1cae6 add smplayer 0.8.5 2013-06-23 17:48:21 +08:00
Peter Simons
0205496d80 Merge pull request #667 from bjornfor/remake
remake: bump from version 3.81+dbg-0.2 to 3.82+dbg-0.6
2013-06-23 01:25:25 -07:00
Song Wenwu
c74b3e26f7 kmplayer: update to 0.11.3d 2013-06-23 14:53:18 +08:00
Domen Kozar
2c8acd9cec oiio: 1.1.8 -> 1.1.12 2013-06-23 00:11:50 +02:00
Aristid Breitkreuz
dbda1a2989 libcap needs to be a propagated build input for pulseaudio 2013-06-22 22:59:55 +02:00
Bjørn Forsman
860161dcb7 remake: bump from version 3.81+dbg-0.2 to 3.82+dbg-0.6
This version needs readline. And the license is GPLv3. Also, add
meta.platforms and meta.maintainers attributes.
2013-06-22 21:09:43 +02:00
Aristid Breitkreuz
ad06d4df18 update pulseaudio to 4.0 and sbc to 1.1 2013-06-22 17:25:47 +02:00
Peter Simons
01bc9204e0 git-annex: fix installation of git-annex-shell 2013-06-22 15:41:37 +02:00
Peter Simons
819dbd2539 haskell-hledger-irr: add version 0.1.1.2 2013-06-22 15:41:37 +02:00
Domen Kožar
7a4b10a51c Merge pull request #665 from offlinehacker/memtest_fix
memtest86: udpate to 4.1.0, fix download url
2013-06-22 05:23:11 -07:00
Domen Kožar
b1b70a02d9 Merge pull request #666 from offlinehacker/python_supervisor
Add supervisor, a system for controlling process state under UNIX
2013-06-22 05:22:54 -07:00
Jaka Hudoklin
2f4d1a5656 memtest86: udpate to 4.1.0, fix download url 2013-06-22 14:11:47 +02:00
Jaka Hudoklin
7b924a9ac4 Add supervisor, a system for controlling process state under UNIX 2013-06-22 14:10:10 +02:00
Peter Simons
933f77f10d Merge pull request #662 from rnons/yesod-bin
yesod-bin: as of yesod 1.2, binaries are kept in yesod-bin.
2013-06-22 05:09:35 -07:00
Evgeny Egorochkin
09e6ae577b Python: add DETERMINISTIC_BUILD env var. If set, python doesn't write timestamps to pyc files. Tested by
building argparse, compiling from cli, compiling using py_compile.
2013-06-22 09:45:01 +03:00
Shea Levy
a3bf1ca3b1 Linux 3.9.7
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-21 17:21:03 -04:00
Domen Kozar
dbe9bf7e59 networkmanagerapplet: 0.9.8.0 -> 0.9.8.2
Upgraded because some icons weren't displaying. Also adds new
dependency libsecret.
2013-06-21 19:59:20 +02:00
Evgeny Egorochkin
a0ba1a20e9 Add a stdenv version which tries harder to make builds repeatable. 2013-06-21 18:22:07 +03:00
Evgeny Egorochkin
76fbbb73c6 Make most of Ruby Gem builds repeatable 2013-06-21 18:22:07 +03:00
rnons
f84119331c yesod-bin: as of yesod 1.2, binaries are kept in yesod-bin. 2013-06-21 22:55:37 +08:00
aszlig
467608f614
synergy: Only pass cryptopp on Linux platforms.
The second failure, and the last one I'm going to try today:

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

On the bright side there is at least the fact that version 1.4.10 has failed on
Darwin already, so I guess we don't have a lot of Mac users using Synergy.

Latest (failed) build of 1.4.10:

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

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 13:46:22 +02:00
aszlig
cfd284443e
synergy: Use bundled crypto++ on non-Linux archs.
Seems that crypto++ in nixpkgs doesn't build on Darwin, so let's use bundled
crypto++ until the version in nixpkgs works well.

This refers to the following build:

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

Hopefully, this will fix it on Mac OS X, because I don't have a Darwin machine
for testing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 13:21:43 +02:00
aszlig
467962b185
synergy: Take over maintenance.
I'm heavily using synergy for daily work, so I'm most probably going to watch
out for changes/improvements/bugs :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:18:21 +02:00
aszlig
60ba4485b1
zabbix2: Add optional XMPP support using iksemel.
This uses recurseForDerivations directly after using callPackage magic to ensure
that the input attributes can be overriden *and* nix-env shows the package as in
recurseIntoAttrs.

The reason for making this optional is because there probably is only a minority
of people who want to use XMPP and we don't want to introduce an additional
dependency for the majority, do we?

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:56 +02:00
aszlig
f974573a5e
iksemel: Add new package with version 1.4.
This library is used by Zabbix in order to send XMPP alerts/notifications.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:55 +02:00
aszlig
b0601f6d6f
chromium: Update all channels to latest versions.
Chromium 28.0.1500.52 finally is stable, so the release channels are now:

stable: 28.0.1500.52 (builds fine, tested)
beta:   28.0.1500.52 (same as stable)
dev:    29.0.1541.2  (patch rebased, builds fine, tested)

The user namespace patch doesn't apply for version 29, so I had to rebase it
against the current trunk (revision 207742).

And as version 27 is outdated, we no longer need to distinguish versions for
patching the hardcoded gcc path in core/core.gypi.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:55 +02:00
aszlig
1709571b3f
ninja: Update to v1.3.4 and drop unzip dependency.
Version 1.2.0 is way too old in order to build the latest chromium (29) version,
so let's get it up to date (especially because no other package is referencing
ninja, so it should be non-critical).

The dependency on unzip is not needed here, because GitHub also provides
archives in tar.gz format.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:55 +02:00
aszlig
8b425e2ae3
chromium: Mark beta and dev versions lowPrio.
I'm still wondering why noone has reported this, but I found out about this
while trying to introduce someone to NixOS, eventually wondering why it is going
to install version 29 when using "nix-env -i chromium".

So, in hope that everyone out there using the package is using the attribute,
let's make _stable_ the default here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:54 +02:00
aszlig
e0ea957d64
php53: Don't use bundled version of libgd.
This fixes a copy & paste error I made in 486e918, which resulted in PHP being
built with the bundled version of GD instead of the one we have in nixpkgs.

Thanks to @peti for noticing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:54 +02:00
aszlig
9a37a306b8
synergy: Enable unit tests.
Integration tests don't seem to work right now, so let's see if we can figure
out a way to enable them later. But at least running unit tests is better than
not running any tests :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:54 +02:00
aszlig
d9e0c355a0
synergy: Add support for Xinput2.
This is needed in order to support devices such as gamepads or tablets.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:53 +02:00
aszlig
ea4afb73d8
synergy: Add support for XrandR.
Nowadays, multiple monitor setups are quite common, so I suppose we'd want
support for that. Especially because users might get confused if synergy is
unable to pick the right screen resolution and thus cause edges to be cut off
from the available pointing area.

The postPatch hook is to force cmake into thinking that we have XRRNotifyEvent,
which we _do_ have with the xrandr version shipped in nixpkgs. Automatic
detection from CMakeLists.txt fails here because it tries to search for the
symbol within the libX11 store path.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:53 +02:00
aszlig
57dee2a27e
synergy: Update to new upstream version 1.4.12.
This brings in support for encryption and thus requires the crypto++ library as
an additional dependency. Unfortunately the upstream integration isn't quite the
way we'd like it to be, so we need to add a small patch to ignore the bundled
version and use the package from nixpkgs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:53 +02:00
Lluís Batlle i Rossell
1b8548fc72 Updating umurmur to 0.2.13
Now opus works.
2013-06-21 12:16:15 +02:00
Lluís Batlle i Rossell
34cf9baaa6 Update mumble to 1.2.4
Now it should have opus. The source code of opus comes with mumble.
2013-06-21 11:10:41 +02:00
Domen Kožar
9177be20b6 Merge pull request #660 from lovek323/vim-coffee-script
vim-coffee-script: add expression
2013-06-20 23:21:47 -07:00
Domen Kožar
5a0902456e Merge pull request #648 from lovek323/vim
vim_configurable: fix python on darwin
2013-06-20 23:19:51 -07:00
Jason "Don" O'Conal
d195372eba php53-xdebug: add expression 2013-06-21 15:12:21 +10:00
Jason "Don" O'Conal
60fd718856 vim-coffee-script: add expression 2013-06-21 15:11:07 +10:00
Lluís Batlle i Rossell
b38308553b Adding cjdns.
The executable runs; I haven't tried to run a node.
2013-06-20 20:53:37 +02:00
Vladimír Čunát
2cfbe7b292 wpa_supplicant: update 1.1 -> 2.0
It works fine for me, GUI as well.
2013-06-20 19:13:29 +02:00
Lluís Batlle i Rossell
3b67955fcf skype: update from 4.1.0.20 to 4.2.0.11 2013-06-20 17:13:46 +02:00
Shea Levy
97b95d60d8 Chromedriver: update to 2.0
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-20 09:21:25 -04:00
Vladimír Čunát
87fca9cf72 audacious: update 3.2.2 -> 3.3.4, now needs gtk3
Also build on Linux platforms.
Seems to work fine for me.
2013-06-20 14:24:19 +02:00
Domen Kozar
ebd26e2d67 tarman: 1.0 -> 1.0.1 2013-06-20 13:43:32 +02:00
Peter Simons
8c2b28b4a6 haskell-mongoDB: update to version 1.4.1 2013-06-20 12:37:54 +02:00
Peter Simons
b2b6c81d4c haskell-ghc-heap-view: update to version 0.5.1 2013-06-20 12:37:54 +02:00
Peter Simons
513d717d47 Merge pull request #654 from lovek323/sup
sup: update to latest version
2013-06-20 03:09:46 -07:00