Commit graph

1179 commits

Author SHA1 Message Date
Thomas Bereknyei
b7a9e1a998 Add shellinabox 2013-12-11 03:52:30 -05:00
Vladimír Čunát
089da3ee5c Merge master into x-updates
Conflicts (simple):
	pkgs/top-level/all-packages.nix
2013-12-10 13:00:02 +01:00
Peter Simons
486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Evgeny Egorochkin
328d59eab6 add meta.repositories.git to several packages 2013-12-10 01:07:30 +02:00
Nixpkgs Monitor
6996067dcf apacheHttpd_2_4: update from 2.4.6 to 2.4.7 2013-12-09 10:49:00 +02:00
Nixpkgs Monitor
e523fdfc47 apacheHttpd: update from 2.2.25 to 2.2.26 2013-12-09 10:47:10 +02:00
Vladimír Čunát
6690c97569 Merge branch 'master' into x-updates
Conflicts (just different styles, same semantics):
	pkgs/development/libraries/libusb1/default.nix
2013-12-07 14:17:16 +01:00
Bjørn Forsman
ab98496d0b Revert "gpsd: update from 2.95 to 3.10"
This update broke gpsd because the download url changed and trying to
get version 3.10 from the old url returns an error document with a
timestamp resulting in new hashes on every build.

And more importantly, gpsd 3.10 switched to the scons build system, so
even if the download url was correct it will fail to build until the
expression is updated.

This reverts commit 3f1c26b825.
2013-12-06 19:03:43 +01:00
Peter Simons
c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Nixpkgs Monitor
3f1c26b825 gpsd: update from 2.95 to 3.10 2013-12-04 15:17:41 +02:00
Nixpkgs Monitor
7c19a2213f virtuoso: update from 6.1.6 to 6.1.7 2013-12-04 06:52:22 +02:00
Nixpkgs Monitor
3c51255820 mpd: update from 0.18.3 to 0.18.5 2013-12-04 06:19:08 +02:00
Nixpkgs Monitor
03b15f9409 mongodb: update from 2.4.5 to 2.4.8, potentially fixes CVE-2013-2132 2013-12-04 05:30:48 +02:00
Nixpkgs Monitor
e72352761c tomcat6: update from 6.0.32 to 6.0.37, potentially fixes CVE-2012-0022, CVE-2012-2733, CVE-2012-3544, CVE-2012-3546, CVE-2012-4431, CVE-2012-4534, CVE-2012-5568, CVE-2012-5885, CVE-2012-5886, CVE-2012-5887, CVE-2013-2067 2013-12-04 05:07:47 +02:00
Nixpkgs Monitor
b296f02449 squid: update from 3.1.15 to 3.1.23, potentially fixes CVE-2012-5643, CVE-2013-0189 2013-12-04 05:00:42 +02:00
Nixpkgs Monitor
22bd6c8efd varnish: update from 3.0.4 to 3.0.5, potentially fixes CVE-2013-4484 2013-12-04 04:57:26 +02:00
Nixpkgs Monitor
1fba241e7d polipo: update from 1.0.4 to 1.0.4.1 2013-12-04 03:41:12 +02:00
Cillian de Róiste
b7aaa7ab78 nagios-plugins: fix download URL (no longer available from sourceforge) 2013-12-03 11:28:27 +01:00
Vladimír Čunát
d09b722f77 Merge master into x-updates 2013-12-02 21:41:16 +01:00
Jason "Don" O'Conal
7f6b5a0472 dico: fix build 2013-11-29 00:10:23 +00:00
Michael Raskin
2f53f6c82d Fixing automatic update of Nginx 2013-11-25 10:59:39 +04:00
Michael Raskin
980c7929ab Updating Nginx to 1.4.4 2013-11-25 10:59:39 +04:00
zimbatm
fb596303cf Adds beanstalkd v1.9 2013-11-24 23:13:13 +00:00
Rok Garbas
a8d5881c3e varnish: update to 3.0.4 2013-11-23 15:36:20 +01:00
Vladimír Čunát
6e5c003f42 xorg xf86-video-nv: fix build via an upstream patch 2013-11-23 12:31:23 +01:00
Vladimír Čunát
b5fba47147 Merge branch master into x-updates
Conflicts (not used, deleted):
	pkgs/desktops/xfce/common.nix
2013-11-23 10:22:26 +01:00
Michael Raskin
5b97997aef Merge pull request #1234 from lovek323/mpd
mpd: update to latest version
2013-11-21 00:38:24 -08:00
Rok Garbas
174f5813ef nginx: rtmp module - commited to fast. now it works. 2013-11-18 17:04:30 +01:00
Rok Garbas
f73185d596 nginx: adding rtmp module 2013-11-18 16:02:33 +01:00
Bjørn Forsman
9c0e95663a lighttpd: update 1.4.32 -> 1.4.33
Changes in this version: http://www.lighttpd.net/2013/9/27/1-4-33/
2013-11-17 23:06:25 +01:00
Vladimír Čunát
68430cf3d7 Merge branch master into x-updates
Conflicts (trivial, minor update on master, major here):
	pkgs/development/libraries/mesa/default.nix
2013-11-16 20:32:44 +01:00
Bjørn Forsman
6c2ee56e4b samba: bump 3.6.18 -> 3.6.20 (security fixes)
3.6.20 is a security release in order to address CVE-2013-4475 (ACLs are
not checked on opening an alternate data stream on a file or directory)
and CVE-2013-4476 (Private key in key.pem world readable).

And 3.6.19 had some bug fixes:
http://www.samba.org/samba/history/samba-3.6.19.html
2013-11-12 20:29:45 +01:00
Moritz Ulrich
6937e0a99b yaws: Update to 1.98.
This fixes the build when compiled with Erlang 16B01 (default).

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-12 20:04:26 +01:00
Jason "Don" O'Conal
311a25648b mpd: update to latest version 2013-11-11 01:08:21 +00:00
Eelco Dolstra
10e31f6de7 Clean up the vsftpd module a bit 2013-11-07 16:38:57 +01:00
Michael Raskin
2b8cdc8434 Merge pull request #686 from ocharles/postgres92
Disable exec symlink resolution for PostgreSQL 9.2
2013-11-07 02:53:37 -08:00
Vladimír Čunát
feb778507f xorg-server: remove now-upstreamed patch
I'm sorry I completely forgot to test the previous commit.
Also remove some long unused patch.
2013-11-06 20:07:35 +01:00
Vladimír Čunát
834af9c905 xorg-server: bugfix update 1.14.3 -> .4, including CVE
CVE-2013-4396, otherwise a few fixes, see
http://lists.x.org/archives/xorg-announce/2013-November/002352.html
2013-11-05 23:13:31 +01:00
Eelco Dolstra
c88055e1a2 Set meta.hydraPlatforms instead of meta.platforms for some packages 2013-11-05 00:06:10 +01:00
Eelco Dolstra
a0e21fd1ca Mark more packages as broken 2013-11-04 21:11:00 +01:00
Eelco Dolstra
01087750ba Don't build some packages on some platforms 2013-11-04 21:11:00 +01:00
Eelco Dolstra
798ce14839 apache-httpd: Update to 2.4.6 2013-11-04 21:10:59 +01:00
Rok Garbas
6d059b2ee5 ejabberd: updated to 2.1.13 2013-11-02 01:46:30 +01:00
Rok Garbas
023d74049c varnish: adding version 2.1.x 2013-11-02 01:45:27 +01:00
Mathijs Kwik
f4903d890e Merge branch 'master' into x-updates 2013-11-01 08:35:16 +01:00
Mathijs Kwik
609f8dc04b Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/top-level/all-packages.nix
2013-11-01 08:31:54 +01:00
Carles Pagès
383bb29d23 Add qpid v0.24
It includes both the broker and the C++ client lib. I had to do some hacks to
prevent the installer from putting thins outside $out.

Close #1134.
2013-10-30 17:24:02 +02:00
Peter Simons
91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/top-level/all-packages.nix
2013-10-26 18:28:05 +02:00
aszlig
ab701322dc
zabbix20: Update to now upstream version 2.0.9.
This drops the patch for ZBX-7091, because it hase been fixed upstream.

Other upstream changes can be found at the following URL:

http://www.zabbix.com/rn2.0.9.php

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-10-23 17:16:18 +02:00
Peter Simons
3af6415ab8 mailman: add version 2.1.16 2013-10-21 15:02:35 +02:00
Jaka Hudoklin
5de7170aa5 nginx: Add optional patch for syslog support.
close #1055.
2013-10-20 22:51:27 +03:00
Domen Kožar
c1b9775821 Merge pull request #1090 from NixOS/munin-rework
munin: refactor package and add nixos service
2013-10-20 08:10:28 -07:00
Domen Kožar
9230ae6522 munin: refactor package and add nixos service 2013-10-20 15:08:07 +02:00
Peter Simons
6be8ad3392 Merge branch 'origin/master' into stdenv-updates.
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Domen Kožar
9e33bcc54d nginx: 1.4.1 -> 1.4.3 2013-10-17 23:36:21 +02:00
Eelco Dolstra
34d61c53c2 postgresql: Update to latest versions 2013-10-17 13:29:49 +02:00
Eelco Dolstra
de10c1b9be mysql: Update to 5.1.72 2013-10-17 13:25:45 +02:00
Eelco Dolstra
9255b5b81c mysql: Move all versions into the same directory 2013-10-17 13:25:13 +02:00
Eelco Dolstra
fc9b53c2bc mysql: Update to 5.5.34
CVE-2013-3839
2013-10-17 13:21:58 +02:00
Eelco Dolstra
55ec87a907 mysql: Remove ancient, unsupported versions 2013-10-17 13:20:50 +02:00
Eelco Dolstra
aeb3169b71 xorg-server: Fix a 20 year old security bug
CVE-2013-4396
2013-10-16 11:58:08 +02:00
Eelco Dolstra
df0d362f31 Fix some more Hydra evaluation errors 2013-10-08 11:07:14 +02:00
Bjørn Forsman
083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Eelco Dolstra
9db68de9e6 polkit, pulseaudio: Drop some Linux-specific dependencies 2013-10-06 00:21:28 +02:00
Vladimír Čunát
5bcdc3efd2 xorg server: major update 1.13.4 -> 1.14.3
- The 1.13 branch gets no updates since April,
  so I thought it's a good time to switch.
- Some xorg modules needed to be updated to build,
  but some don't have the update (probably all very obscure).
- Maybe it would be good to update the intel driver (or some others),
  I don't know.
2013-10-05 22:17:01 +02:00
Bjørn Forsman
28ac782583 Some description fixes
There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
2013-10-05 19:36:23 +02:00
Eelco Dolstra
e5ebb59e1d zabbix: Apply fix for a SQL injection bug
https://support.zabbix.com/browse/ZBX-7091

CVE-2013-5743
2013-10-04 13:52:49 +02:00
Peter Simons
ac5d5297dd Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-10-02 22:44:12 +02:00
Rickard Nilsson
4674d745e0 dovecot-pigeonhole: Update to 0.4.2 2013-10-02 18:51:31 +02:00
Rickard Nilsson
8c01614588 dovecot 2.2.x: Update to 2.2.6 2013-10-02 18:51:31 +02:00
Domen Kožar
43333ae57d munin: 2.0.14 -> 2.0.17 2013-09-29 22:02:45 +02:00
Domen Kožar
d1ab7ca2ec Merge pull request #1002 from DriesVanDaele/master
add the mpc (mpd cli client) package
2013-09-29 04:05:16 -07:00
aszlig
c9614d2d05
lighttpd: Allow to compile with magnet support.
This also adds pkgconfig to the dependency list so we don't need to
specify the path to OpenSSL anymore, because we need pkgconfig in order
to correctly find Lua anyway.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-09-27 15:23:29 +02:00
Dries Van Daele
f93daff6a3 remove some whitelines 2013-09-23 21:16:14 +02:00
Dries Van Daele
6b5cbfb310 add the mpc (mpd cli client) package 2013-09-23 20:54:20 +02:00
Peter Simons
9407832de4 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/gettext/default.nix
2013-09-23 10:59:44 +02:00
Domen Kožar
4adad8d7c0 Merge pull request #1001 from DriesVanDaele/master
update libmpdclient to version 2.8
2013-09-22 10:26:44 -07:00
Dries Van Daele
bbcf67bd22 update libmpdclient to version 2.8 2013-09-22 16:47:17 +02:00
Malcolm Matalka
7aacc46f10 Pin 1.3.1 to R15B03, riak does not work with R16 2013-09-17 20:41:06 +02:00
Shea Levy
59bd1ba586 Add virtuoso 7
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-09-17 14:28:26 -04:00
Lluís Batlle i Rossell
9dcca4e3f5 Adding bird-1.3.11 2013-09-15 11:39:24 +02:00
Mathijs Kwik
2f428bbb46 Merge remote-tracking branch 'official/master' into stdenv-updates 2013-09-11 10:56:47 +02:00
Vladimír Čunát
aa8e8303e1 Merge branch 'x-updates' into master 2013-09-11 08:37:03 +02:00
Vladimír Čunát
bb6b42385d Merge PR #901: adding Storm
vcunat edit: use symlink instead of hardlink (failed for me with a
cross-device error), minor whitespace cleanup
2013-09-10 16:18:31 +02:00
Peter Simons
3d2caf1180 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-08 22:54:35 +02:00
Vladimír Čunát
c1ed13dad0 Merge branch 'master' into x-updates 2013-09-08 12:04:20 +02:00
Jason \"Don\" O'Conal
834cd6c886 beret: Fix build on darwin (close #923) 2013-09-08 10:32:25 +02:00
Vladimír Čunát
b1be46e932 Merge branch 'master' into x-updates 2013-09-07 16:19:46 +02:00
Bjørn Forsman
618fc386d7 samba: provide libnss_{wins,winbind}.so.2 symlinks for nsswitch
Glibc >= 2.1 looks for libnss_<name>.so.2 files (see man nsswitch.conf),
so provide that.
2013-09-07 15:06:55 +02:00
Danny Wilson
2ff0b8dc14 I henceforth will maintain as my Github username. 2013-09-02 18:48:29 +02:00
Vladimír Čunát
74488e2b58 Merge branch 'x-updates' into stdenv-updates
Conflicts (simple):
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/mesa/default.nix
2013-09-02 15:44:57 +02:00
Danny Wilson
c4b1bbc1c8 Improved Storm package.
- Add config to defaults.yaml, to allow topologies to include their own storm.yaml.
- Symlink extra jars in lib/ since it's nearly impossible to add a classpath to Storm's config.
- Include native jzmq library in java.library.path
- Use package default args.
2013-09-02 12:20:24 +02:00
Danny Wilson
d6a812332c Make Storm conf and log path configurable via symlinks.
- The bin/storm script makes too many assumptions about file locations and java classpath that I couldn't figure out a better way.

Fix jzmq build on NixOS: java source was treated as ASCII.
2013-09-02 12:20:16 +02:00
Danny Wilson
04a232f28b Add storm package. 2013-09-02 12:20:06 +02:00
Marc Weber
cf762c8f58 firebirdSuper settings
document why its better to not use --with-system-icu

See patch for nixos adding firebird service

Signed-off-by: Marc Weber <marco-oweber@gmx.de>
2013-08-31 23:05:32 +03:00
Peter Simons
98fcc2f746 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-08-30 10:45:11 +02:00
Vladimír Čunát
646eaa23a1 xorg.xmodmap: fix build via a Gentoo patch 2013-08-29 15:19:06 +02:00
Evgeny Egorochkin
ec36d1ebb1 Merge pull request #875 from offlinehacker/pkgs.elasticsearch/update
elasticsearch: update to 0.90.3
2013-08-28 15:02:06 -07:00
Vladimír Čunát
2fda1165da Merge branch 'master' into x-updates 2013-08-28 10:37:41 +02:00
Jaka Hudoklin
c202356049 elasticsearch: update to 0.90.3 2013-08-27 20:39:33 +02:00
Peter Simons
9ac8ea937c Merge branch 'origin/master' into stdenv-updates. 2013-08-26 12:21:23 +02:00
Bjørn Forsman
378f94f5da samba: install libnss_{wins,winbind}.so
This is the first step to get WINS/NetBIOS name lookup with nsswitch.
2013-08-25 18:41:35 +02:00
Vladimír Čunát
c1e62e7e91 Merge branch 'master' into x-updates 2013-08-22 19:29:09 +02:00
aszlig
8938a2ac9e
zabbix20: Update to new upstream version 2.0.8.
Upstream changes for version 2.0.7:

http://www.zabbix.com/rn2.0.7.php

Upstream changes for version 2.0.8:

http://www.zabbix.com/rn2.0.8.php

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-22 05:45:21 +02:00
Rickard Nilsson
310268f36d diod: New package, a 9P server implementation for Linux 2013-08-20 17:24:30 +02:00
Bjørn Forsman
d6b4ed9e3c samba: 3.6.8 -> 3.6.18
Release notes (left column): http://www.samba.org/samba/history/

The GNU/Hurd patch doesn't apply anymore so I dropped it.
2013-08-17 16:57:34 +02:00
Peter Simons
0d7118814b Merge branch 'origin/master' into stdenv. 2013-08-17 10:00:16 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Peter Simons
76244ac2e2 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
2013-08-16 22:51:13 +02:00
Eelco Dolstra
898a33bef2 zabbix: Update to 1.8.17 2013-08-12 14:22:16 +02:00
Vladimír Čunát
daf9c75ef4 xorg: bugfix updates of some libs
Now using stable release of libXi, instead of the git version we had due
to security stuff.
2013-08-03 15:38:46 +02:00
Vladimír Čunát
625f40151b Merge branch 'master' into x-updates
Conflicts (a little tricky, I did some cleanup of interacting changes):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/tools/package-management/nixops/default.nix
	pkgs/top-level/all-packages.nix
2013-08-02 18:30:53 +02:00
Peter Simons
522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates.
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
2013-07-30 11:29:30 +02:00
aszlig
b42eb45429
thttpd: New package, version 2.25b.
We already have mini_httpd, but IMHO it is *too* minimal as in not very
flexible in configuration (for example, I haven't found any runtime
configuration for disabling logging), so that's why I decided to add
thttpd, which serves quite well as an ad-hoc HTTPd.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-07-30 05:59:59 +02:00
Peter Simons
516377c0b6 bind: update to 9.9.3-p2 to fix CVE-2013-4854 2013-07-28 13:50:11 +02:00
James Cook
b5553b7cec luit: fix build with newer gcc (close #734) 2013-07-27 19:56:22 +02:00
James Cook
d8dd23e285 luit: configure --disable-selective-werror
Compiling luit failed with "implicit declaration of function
'posix_openpt'".  Following suggestion at
https://bugs.freedesktop.org/show_bug.cgi?id=47792 to fix it.
2013-07-27 19:56:19 +02:00
Bjørn Forsman
480f27b218 apcupsd: use /run/nologin (instead of /etc/nologin) to prevent logins
This is what systemd uses, see "man systemd-user-sessions.service".
2013-07-21 20:58:26 +02:00
Bjørn Forsman
1d59e54ebc apcupsd: fix hostname command patching
The source has HOSTNAME=`hostname` (capture output of hostname command)
but currently it is replaced with HOSTNAME="/path/to/hostname" (which is
just a plain string). Fix it by substituting with
HOSTNAME=`/path/to/hostname`.
2013-07-20 21:44:01 +02:00
Rickard Nilsson
582e9a94e6 opensmtpd: Update to 201307151923p1 2013-07-19 13:07:42 +02:00
Shea Levy
0c3b84c850 mongodb 2.4.5
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-07-18 15:05:49 -04:00
Bjørn Forsman
dcd3dad3d9 apcupsd: fix download url 2013-07-17 21:10:56 +02:00
Bjørn Forsman
074898e0db apcupsd: new package
apcupsd is a daemon for controlling APC UPSes.
2013-07-17 20:22:59 +02:00
Eelco Dolstra
ca0936f17f apache-httpd: Update to 2.2.25
CVE-2013-1896, CVE-2013-1862.
2013-07-17 12:59:29 +02:00
Bjørn Forsman
8e3a92e306 libxcb: enable XKB extension
SDDM, a display manager that I'm trying to package, depends on this.
2013-07-16 19:25:43 +02:00
Rickard Nilsson
56c5f33845 New package: dovecot_pigeonhole, a sieve plugin for dovecot 2013-07-15 15:15:35 +02:00
Rickard Nilsson
0dc36983e9 New package: opensmtpd, an SMTP server from the OpenBSD project. 2013-07-15 15:05:03 +02:00
Rickard Nilsson
93ff42ae9c dovecot: Add version 2.2.4 as attribute dovecot22
I also added a patch that makes dovecot search for
plugins in /var/lib/dovecot/modules. This way, you
can add plugins from several packages without running
into circular dependencies. The module dir needs to
be populated before the dovecot service is started,
for example. This is currently not done in NixOS, so
you need to implement your own service in order to
get the plugins working.

The module patch has not been added to the old 2.1.x
package.
2013-07-15 14:55:00 +02:00
Evgeny Egorochkin
b084b29d26 Even more mirror:// fixes 2013-07-14 04:17:07 +03:00
Evgeny Egorochkin
14d4740ba7 firebird: fix version to match tarball 2013-07-14 02:08:49 +03:00
Jason \"Don\" O'Conal
5c8a44fd18 mpd: fix build on darwin
* disable systemd
* disable alsaLib
* disable ffado
* compile with gccApple
* disable libmad
2013-07-12 16:26:46 +02:00
Rob Vermaas
096f422545 Add memcached to the channel 2013-07-12 14:57:32 +02:00
Michael Raskin
1800db96d7 Update nginx 2013-07-11 10:28:52 +04:00
Domen Kozar
f2ee089784 nginx: 1.2.8 -> 1.2.9 (CVE-2013-2070) 2013-07-09 15:42:14 +02:00
aszlig
1182929a0b
zabbix20: Migrate XMPP support over to minmay.
This should fix support for TLS and in addition, we now _only_ depend on one
library rather than OpenSSL *and* GnuTLS as we no longer need iksemel.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-07-08 14:27:43 +02:00
Jason \"Don\" O'Conal
ccb7715de8 apacheHttpd_2_4: fix build on darwin 2013-07-07 13:46:43 +02:00
Domen Kožar
26e9afaa28 Merge pull request #658 from aristidb/master
Pulseaudio 4.0 (and sbc 1.1)
2013-06-29 07:57:18 -07:00
Lluís Batlle i Rossell
7c74edc9bc sipwitch: update to 1.6.1 to fix build 2013-06-29 15:30:05 +02:00
Oliver Charles
912a825d1e Disable exec symlink resolution for PostgreSQL 9.2
When building PostgreSQL with plugins under NixOS, NixOS will create a
postgresql-and-plugins directory which symlinks PostgreSQL and all the plugins
into a single directory. Unfortunately, the plugins will not actually be usable
by PostgreSQL because it will still try and locate them in the original
PostgreSQL share directory, not postgresql-and-plugins.

In this commit, I have patched resolve_symlinks to always return success, which
matches the behavior if HAVE_READLINK is false (so presumably invalid paths are
never passed to this function).
2013-06-27 14:09:39 +01:00
Vladimír Čunát
45f7b9c319 virtualbox: make guest additions use driver according to xserver version 2013-06-23 14:16:21 +02:00
Aristid Breitkreuz
dbda1a2989 libcap needs to be a propagated build input for pulseaudio 2013-06-22 22:59:55 +02:00
Aristid Breitkreuz
ad06d4df18 update pulseaudio to 4.0 and sbc to 1.1 2013-06-22 17:25:47 +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
Jason "Don" O'Conal
f4d648ed5c shishi: fix compilation on darwin 2013-06-20 09:08:09 +10:00
Evgeny Egorochkin
0e57725261 Merge pull request #633 from lovek323/httpd
apacheHttpd: fix build on darwin
2013-06-17 22:38:29 -07:00
Jason "Don" O'Conal
85f2674e22 apacheHttpd: minor modifications to meta attrs
* add myself as a maintainer
* use reference to `stdenv.lib.licenses.asl20` rather than literal
  string
2013-06-16 12:10:19 +10:00
Michael Raskin
81b7f5fe63 Merge remote-tracking branch 'upstream/master' into x-updates 2013-06-15 17:15:32 +04:00
aszlig
ea87598a71
zabbix20: Update to version 2.0.6.
Release notes for this version and 2.0.5:

http://www.zabbix.com/rn2.0.6.php
http://www.zabbix.com/rn2.0.5.php

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-14 17:50:35 +02:00
Eelco Dolstra
935a054de9 libXrender, libXvMC: Update 2013-06-14 14:53:36 +02:00
Jason "Don" O'Conal
2735e9c8d6 apacheHttpd: fix build on darwin
* remove the gcc_s library from NIX_LDFLAGS (not available on darwin)
2013-06-14 18:16:37 +10:00