Austin Seipp
a8b59789d0
nagios-plugins: 2.0 -> 2.0.3
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 01:59:02 -05:00
Austin Seipp
53adb67395
nagios: 4.0.7 -> 4.0.8
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 01:58:50 -05:00
Austin Seipp
db2a37514d
mariadb: 10.0.11 -> 10.0.13
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 01:48:42 -05:00
Austin Seipp
47c443bede
nixpkgs: openresty 1.7.4.1rc1
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 00:38:49 -05:00
John Wiegley
8b13100710
Merge pull request #3658 from cstrahan/xquartz-cleanup
...
Remove old comment, and delete confusing LaunchDaemon
2014-08-18 16:17:23 -05:00
Vladimír Čunát
99b0271712
pulseaudio: fix CVE-2014-3970 by upstream patch
2014-08-18 17:56:26 +02:00
Charles Strahan
6f2bd70fd0
Remove old comment, and delete confusing LaunchDaemon
2014-08-18 11:36:34 -04:00
Austin Seipp
ec42370aee
nginx: 1.6.0 -> 1.6.1
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-17 06:35:40 -05:00
Jaka Hudoklin
953643bb0f
elasticsearch: fix darwin, needs getopt
2014-08-16 12:55:23 +02:00
Daniel P. Wright
7f9eba573d
Add taskserver package ( close #3269 )
2014-08-15 00:28:41 +02:00
John Wiegley
06a324f7dc
Merge pull request #3101 from cstrahan/xquartz
...
Use XQuartz on Darwin
2014-08-14 16:33:46 -05:00
Vladimír Čunát
78118328b5
virtuoso7: disable i686-linux, as it's unsupported
2014-08-14 18:16:48 +02:00
Vladimír Čunát
b2a7b213be
consul*: fix evaluation
...
CC #2955 .
2014-08-14 14:36:34 +02:00
Vladimír Čunát
0cc668bc1a
Merge master into PR
...
Conflicts:
pkgs/top-level/all-packages.nix
2014-08-14 14:27:54 +02:00
Charles Strahan
5ea8497933
get xorg/x11 working on Darwin
2014-08-12 20:40:57 -04:00
Vladimír Čunát
52d9c93abe
Merge 'staging' into master
2014-08-08 20:13:23 +02:00
Rickard Nilsson
629f7d055a
mpd: Update from 0.18.11 to 0.18.12
2014-08-08 19:14:35 +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
9226fbf56a
Merge remote-tracking branch 'origin/master' into staging.
2014-08-08 09:51:01 +02:00
Rob Vermaas
9092499154
Merge pull request #3470 from tailhook/beanstalkd_1.10
...
beanstalkd: upgrade to v1.10
2014-08-06 17:03:54 +02:00
William A. Kennington III
ede3e60a3c
unifi: Add wkennington as a maintainer
2014-08-05 21:48:19 -05:00
William A. Kennington III
0652ee16e4
unifi: Add derivation
2014-08-05 16:18:41 -05:00
Paul Colomiets
d2d4b8477f
beanstalkd: upgrade to v1.10
2014-08-05 15:56:02 +03:00
Patrick Mahoney
b947cde3a5
bind: Expand to all unix platforms.
2014-08-04 15:09:07 -05: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
Vladimír Čunát
6295a3ca36
Merge recent master into x-updates
...
Hydra: ?compare=1142825
Conflicts (easy):
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-08-02 05:08:07 +02:00
Vladimír Čunát
91b53aaebc
xorg.libXext: minor update
2014-08-02 04:43:19 +02: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
Eelco Dolstra
e4e5502966
postgresql: Update to 9.0.18, 9.1.14, 9.2.9, 9.3.5
2014-07-30 18:13:51 +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
Domen Kožar
c8cd4275a3
openfire: get rid of builderDefs
2014-07-27 13:54:37 +02:00
Domen Kožar
a219db3cb2
fix tarball job
2014-07-27 13:36:25 +02:00
Evgeny Egorochkin
8024d6ee3c
RabbitMQ server: bump to 3.3.4
2014-07-26 14:33:53 +03:00
Jaka Hudoklin
b459a93533
Merge pull request #3364 from joelteon/mysql-ps
...
On Darwin, add /bin/ps to path during MySQL build
2014-07-26 02:34:10 +02:00
Jaka Hudoklin
b035be7b44
Merge pull request #3292 from offlinehacker/elasticsearch_plugins
...
elasticsearch: add support for plugins
2014-07-26 02:23:46 +02:00
William Roe
845d24d86c
Update Serf to 0.6.3
2014-07-25 16:51:54 +01:00
Jaka Hudoklin
7eb4d306fb
elasticsearch: add support for plugins
2014-07-25 17:28:59 +02:00
Joel Taylor
cafb12647f
add ps to path for build
2014-07-24 14:19:16 -07:00
Marc Weber
ba154ec9d4
apache 2_4 update, fixes some CVE's
...
See http://www.apache.org/dist/httpd/Announcement2.4.html It compiles,
didn't run it. I guess minor update doesn't cause much trouble even
though there are some new features
2014-07-24 18:10:10 +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
Vladimír Čunát
b9045a7d96
Merge branch 'x-updates' into staging
...
...in preparation for a merge to master
2014-07-22 22:28:39 +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
Vladimír Čunát
9b02635faa
Merge recent master into x-updates
...
Hydra: ?compare=1138350
Conflicts:
nixos/modules/services/x11/desktop-managers/default.nix
Two imports were added independently on the same line.
I split it as well, as it was very long now.
2014-07-21 12:05:57 +02:00
Vladimír Čunát
f456abacb7
xorg.libXi: bugfix update
2014-07-20 08:38:06 +02:00
Pascal Wittmann
fc7fc7ce43
mpd: use pulseaudio in buildInputs if pulseaudioSupport is true not if zipSupport is true
2014-07-18 16:56:06 +02:00
Bjørn Forsman
f2d5fe86bd
munin: simplify setting of PERL5PATH
...
Use lib.makePerlPath instead of manually duplicating
"/lib/perl5/site_perl" all over.
2014-07-18 12:37:36 +02:00
Vladimír Čunát
16e35532e4
Merge recent master into x-updates
2014-07-17 19:30:56 +02:00