Commit graph

937 commits

Author SHA1 Message Date
Vladimír Čunát
52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra
8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Eelco Dolstra
8f3d2b740b wine: Update to 1.7.23 2014-08-04 01:09:01 +02:00
Michael Raskin
750a5f4e0c Update Wine-unstable 2014-08-03 22:29:41 +04:00
Bjørn Forsman
62d0a320b3 Revert "Remove obsolete jackaudio version 1."
This reverts commit bdb77826d9.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-31 12:52:29 +02:00
Peter Simons
bdb77826d9 Remove obsolete jackaudio version 1. 2014-07-28 20:32:52 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
f64d84698e Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
Eelco Dolstra
50f548771e Fix broken use of builtins.currentSystem
Packages should never use builtins.currentSystem.
2014-07-28 11:28:35 +02:00
Joachim Schiele
d46c61b863 Merge pull request #3321 from qknight/snes9x-gtk
added snes9x-gtk with pulseaudio support
2014-07-27 21:38:25 +02:00
Joachim Schiele
de1ae606db snes9x-gtk: added changes requested by offlinehacker 2014-07-27 21:37:52 +02:00
Rok Garbas
0953235369 vimPlugins.YouCompleteMe: updated to latest 2014-07-24 12:43:43 +02:00
Bjørn Forsman
6b4df6fee8 jack1: update to version 0.124.1
The current source archive (v0.121.3) is no longer available, forcing an
upgrade. Also, jack1 grew new dependencies: Berkley DB and libuuid.
2014-07-23 20:22:15 +02:00
Bjørn Forsman
f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2'
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-23 20:22:14 +02:00
Joachim Schiele
743e3df3b8 made changes requested by pSub 2014-07-23 14:03:48 +02:00
Eelco Dolstra
4f7289eec9 Don't use ensureDir 2014-07-22 11:01:32 +02:00
Eelco Dolstra
7f410ef923 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Joachim Schiele
9d8a804047 added snes9x-gtk with pulseaudio support 2014-07-20 10:39:42 +02:00
Paul Colomiets
f12633c628 my-env: Support for running command directly by load-env-xxx script
First I don't think there is a reason to run shell as a child of
load-env-xxx script and not to just exec into it.

Also it's often useful to just run a command inside the environment
load-env-xxx command --args

Closes #3254
2014-07-16 23:09:49 +02:00
Pascal Wittmann
0aa6a9876f Merge pull request #3244 from ehmry/xscreensaver
xscreensaver: update from 5.26 to 5.29
2014-07-15 20:00:41 +02:00
Paul Colomiets
8d9ff87c14 Add several vim plugins
Added are:
* ctrlp
* vim-a
* colorsamplerpack
* yankring
2014-07-15 14:59:15 +02:00
Paul Colomiets
496d12958e Add automatic plugin activation for vim 2014-07-15 14:59:15 +02:00
Emery Hemingway
f4a518e1e4 xscreensaver: update from 5.26 to 5.29 2014-07-11 11:37:47 -04:00
Eelco Dolstra
95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Michael Raskin
b243ef6bef maven: update from 3.0.4 to 3.1.1, potentially fixes CVE-2013-0253 2014-07-04 21:45:30 +04:00
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Paul Colomiets
6f946bbb2a Add NIX_MYENV_NAME environment variable in myEnvFun 2014-06-29 15:45:20 +03:00
Eelco Dolstra
429bdef9bd winetricks: Update to 1199 2014-06-25 00:51:41 +02:00
Bjørn Forsman
d3ae8086c4 maven: add meta attributes (description, homepage, license) 2014-06-22 22:13:33 +02:00
Bjørn Forsman
24f3fb6788 maven: cosmetic changes in expression
Replace hard tabs with space. Add some whitespace between lines.
2014-06-22 22:12:54 +02:00
Vladimír Čunát
9757785295 Merge recent master 2014-06-15 17:55:35 +02:00
Michael Raskin
6bbd163df4 Update Wine unstable version 2014-06-14 00:23:11 +04:00
Vladimír Čunát
de12094b0e Merge recent master 2014-06-12 09:15:11 +02:00
Bjørn Forsman
68a6c0e3e9 lilypond: unbreak build by adding t1utils to buildInputs
lilypond needs the 't1asm' tool from t1utils to build. t1asm used to be
provided by texlive-core, but does no more  (since texlive-core-2014
update).
2014-06-11 21:17:50 +02:00
Peter Simons
66da23b011 lilypond: cosmetic changes 2014-06-11 11:00:35 +02:00
Vladimír Čunát
f2352f7ecf Merge recent master 2014-06-10 20:14:08 +02:00
Vladimír Čunát
5a98b9f514 Merge recent master into p/stdenv
Merged just before the pypi update, as it seems to cause problems on Hydra.
2014-06-09 19:07:31 +02:00
Sterling Stein
a0efad6861 fceux: Add package for a NES emulator. 2014-06-07 15:08:57 -07:00
Mateusz Kowalczyk
6c3cc8bb95 PPSSPP: add platforms 2014-06-07 22:28:56 +02:00
Austin Seipp
9087dcb9ea Merge pull request #2785 from Fuuzetsu/ppsspp
PPSSPP: 0.9.8
2014-06-03 20:32:51 -05:00
Vladimír Čunát
872860e6de Merge #1187 into p/stdenv
Tested building firefox, kdelibs, evince on x86_64-linux.
2014-05-29 22:16:07 +02:00
Mateusz Kowalczyk
82a30be74a xboxdrv: 0.8.5 2014-05-29 04:22:34 +02:00
Mateusz Kowalczyk
59f98d0d8c PPSSPP: 0.9.8 2014-05-28 23:05:01 +02:00
Michael Raskin
bc292a5882 Updating Wine unstable to 1.7.19 2014-05-28 01:33:28 +04:00
Michael Raskin
80cc011f77 Merge pull request #2617 from ttuegel/hplip
hplip: update and fix scanning
2014-05-27 02:31:27 -07:00
Matej Cotman
116ab5f0c1 seafile: update client, ccnet, libsearpc and shared 2014-05-24 03:36:10 +02:00
Luca Bruno
d05e832b14 vlock: add meta and take maintainership 2014-05-21 16:12:33 +02:00
Thomas Tuegel
8ffd6af27e hplip: don't use udev rules to change device owner 2014-05-20 16:43:59 -05:00