Commit Graph

4947 Commits

Author SHA1 Message Date
Domen Kožar
2e212d5c58 Merge pull request #671 from bjornfor/virtualbox
virtualbox-guestadditions: fix xorg incompatibility
2013-06-23 08:10:33 -07:00
Vladimír Čunát
6c86398ff3 virtualbox: minor update, lock versions with guest-additions
I saw no reason to use requireFile, it seems normally downloadable.
2013-06-23 16:14:31 +02:00
Song Wenwu
4cad420d5c smplayer: add platform and set license to stdenv.lib.licenses.gpl3Plus 2013-06-23 21:26:43 +08:00
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
Domen Kozar
2c8acd9cec oiio: 1.1.8 -> 1.1.12 2013-06-23 00:11:50 +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
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
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
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
5a0902456e Merge pull request #648 from lovek323/vim
vim_configurable: fix python on darwin
2013-06-20 23:19:51 -07: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
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
Peter Simons
513d717d47 Merge pull request #654 from lovek323/sup
sup: update to latest version
2013-06-20 03:09:46 -07:00
Jason "Don" O'Conal
cf2b5daa15 sup: update to latest version 2013-06-20 10:09:15 +10:00
Jason "Don" O'Conal
657ef3959b irssi: fix build on darwin
* use `gccApple` (so we can cope with `-no-cpp-precompile`)
* add `libintlOrEmpty`
2013-06-20 09:25:54 +10:00
Lluís Batlle i Rossell
4c6a981070 Adding 'weka'. 2013-06-19 16:19:06 +02:00
Evgeny Egorochkin
6b4eaf71fe Merge pull request #636 from craff/glsurf
Glsurf (3D drawing of implicit surfaces and curves)
2013-06-18 22:34:08 -07:00
Christophe Raffalli
102216f8c9 Drop useless dependencies in glsurf 2013-06-19 05:03:42 +02:00
Evgeny Egorochkin
e77a7d21dc Fix attr name to match version 2013-06-19 05:15:05 +03:00
Jason "Don" O'Conal
719b488b10 vim_configurable: fix python on darwin
* was not linking to the correct python library on darwin (using the OS
  X framework, which is not what we want)
2013-06-19 12:06:55 +10:00
Vladimír Čunát
f0417726d1 Merge pull request #533 from MarcWeber/submit/eclipses
eclipse: add latest stable eclipse (sdk), fix 3.7 urls, introducing more...
2013-06-18 14:20:10 -07:00
Domen Kozar
1a23f715f4 tig: built for linux 2013-06-18 22:42:12 +02:00
Vladimír Čunát
2058d95eb4 non-Linux platforms: extend to some important pkgs 2013-06-18 22:03:35 +02:00
Peter Simons
d815e5eba2 gnucash: fix build (by removing the obsolete potfiles patch) 2013-06-18 13:11:03 +02:00
Peter Simons
e006c2fd49 celestia: fix compilation and linking after x-updates merge 2013-06-18 13:11:03 +02:00
Domen Kozar
cd1b531867 gnucash: add me as maintainer 2013-06-18 13:04:05 +02:00
Peter Simons
efac6d8e73 celestia: help the package find the gtk related libraries 2013-06-18 12:44:24 +02:00
Peter Simons
3e241c3f83 celestia: add patch to support libpng 1.6 2013-06-18 12:44:24 +02:00
Peter Simons
e6c48a73f8 celestia: update hashes for the downloaded patches 2013-06-18 12:44:23 +02:00
Evgeny Egorochkin
88eff1efac Merge pull request #619 from lovek323/sdcv
sdcv: add expression
2013-06-17 16:29:53 -07:00
Vladimír Čunát
6bcf790d05 Merge branch 'master' into x-updates 2013-06-17 22:08:16 +02:00
Domen Kožar
25777d2aca Merge pull request #637 from the-kenny/fix-dropbox-cli
Fix dropbox cli
2013-06-17 08:54:40 -07:00
Jaka Hudoklin
4d76f87c13 Add cgminer: gpu, fpga and asic crypto currencies mining application 2013-06-16 21:51:27 +00:00
Moritz Ulrich
edaca7bdf0 Add myself as a maintainer of dropbox-cli.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-06-16 23:40:43 +02:00
Moritz Ulrich
1570336325 Fix dropbox-cli.
Dropbox doesn't version the CLI. This broke the download. This patch
also fixes the `dropbox-cli start' command.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-06-16 23:38:33 +02:00
Christophe Raffalli
cb980d97d7 added glsurf package 2013-06-16 22:33:47 +02:00
Vladimír Čunát
c72ed04892 Merge 'master' and 'stdenv-fixes' into x-updates
Final stabilization phase before merging into master.

Conflicts (glibc-2.13):
	pkgs/top-level/all-packages.nix
2013-06-16 10:13:51 +02:00
Domen Kožar
0d15be335c Merge pull request #629 from lovek323/vim_configurable
vim_configurable: improvements
2013-06-15 10:36:51 -07:00
Peter Simons
38d22b4851 ess: add Emacs Speaks Statistics mode 2013-06-15 17:13:37 +02:00
Michael Raskin
81b7f5fe63 Merge remote-tracking branch 'upstream/master' into x-updates 2013-06-15 17:15:32 +04:00