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
Michael Raskin
19530856ed
Merge remote-tracking branch 'upstream/master' into x-updates
...
Conflicts:
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/gtk+/2.x.nix
pkgs/misc/ghostscript/default.nix
pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
Malcolm Matalka
ebaf0c01d3
Fixes rebar shebang, also fixes source of leveldb zip to be the canonical one from github
2013-06-13 14:45:41 +02:00
Michael Raskin
1a45886454
Merge branch 'master' into x-updates
2013-06-11 15:46:10 +04:00
Peter Simons
2e618df532
bind: avoid build impurity by explicitly enabling/disabling features
...
The BIND configure script finds extra dependencies in /usr/include and /usr/lib,
and activates additional features if it does. This may cause the build to fail
on systems that cannot use a chroot environment. Actively disabling those
additional features prevents this issue from occurring.
2013-06-10 15:38:00 +02:00
Michael Raskin
8271de6727
Merge remote-tracking branch 'upstream/master' into x-updates
...
Conflicts:
pkgs/misc/emulators/wine/default.nix
2013-06-10 10:04:46 +04:00
Evgeny Egorochkin
604652f1da
riak: this is really strange. Lets hope this hash difference isn't malicious :(
2013-06-10 08:19:18 +03:00
Evgeny Egorochkin
cdc21b40bd
Fix typo :(
2013-06-10 08:11:10 +03:00
Evgeny Egorochkin
009aa85060
Merge pull request #587 from orbitz/add-riak-1.3.1
...
Add Riak 1.3.1
2013-06-09 19:53:44 -07:00
Vladimír Čunát
7db886fdb9
Merge remote-tracking branch 'hydra/master' into x-updates
...
Conflicts (taken from @7c6f434c):
pkgs/development/libraries/libgphoto2/default.nix
2013-06-08 15:41:39 +00:00
Vladimír Čunát
ba6c764a51
xorg: intel driver bugfix update
2013-06-08 15:40:39 +00:00
Peter Simons
bfa846cd6e
bind: update to 9.9.3-P1 to fix CVE-2013-3919
2013-06-07 13:27:12 +02:00
Evgeny Egorochkin
9c6f7cc9c1
Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions.
2013-06-07 03:15:45 +03:00
Vladimír Čunát
619b024600
X security updates
...
http://www.x.org/wiki/Development/Security/Advisory-2013-05-23
Three libs not released yet and without commit activity for around two
weeks, so I took the current master heads.
2013-06-05 21:24:19 +02:00
Vladimír Čunát
7af694700c
Merge branch 'master' into x-updates
...
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
2013-06-05 12:59:47 +02:00
Malcolm Matalka
1a282dcae6
Fix up the description a bit
2013-06-04 17:17:54 +02:00
Malcolm Matalka
992f5b8d26
Add Riak 1.3.1
...
This modifies how the `riak` and `riak-admin` scripts work such that one has to specify environment variables for where the data, log, and etc directories live.
2013-06-04 04:12:06 +02:00
Sander van der Burg
4efc39eadd
mysql-connector-java: Updated to 5.1.25
2013-06-02 23:40:18 +02:00
Vladimír Čunát
25471803e4
Merge master into x-updates
2013-05-29 23:25:26 +02:00
Vladimír Čunát
b770365574
ReRevert Merge x-updates into master
...
This reverts commit ec3965d8d0
.
Conflicts (taken x-updates):
pkgs/development/libraries/libgcrypt/default.nix
pkgs/development/libraries/libgpg-error/default.nix
pkgs/development/libraries/poppler/default.nix
2013-05-29 23:25:02 +02:00
Vladimír Čunát
466ce40f0f
xorg.xf86videointel: regression-fix update
...
http://lists.freedesktop.org/archives/intel-gfx/2013-May/028277.html
2013-05-27 20:43:02 +02:00
Vladimír Čunát
e7b61ea77d
xorg.xf86videointel: fix bad hash (from #556 )
2013-05-27 12:24:04 +02:00
Vladimír Čunát
ce456ab779
Merge pull request #556 from jcumming/x-updates.130523
...
update Intel Graphics Stack Release
2013-05-27 02:33:48 -07:00
Zef Hemel
8ca0c05859
Upgraded Redis version
2013-05-27 11:28:00 +02:00
Jack Cummings
fc8f474a9c
fix url and hash for intel x driver
2013-05-24 11:56:48 -07:00
Jack Cummings
800c467592
xf86-video-intel-2.21.7
2013-05-24 09:50:49 -07:00
Jack Cummings
253ee6f6a3
update to 2013Q1 Intel Graphics Stack Release
...
This changeset updates to all of the versions in
https://01.org/linuxgraphics/downloads/2013/2013q1-intel-graphics-stack-release
(but does not regression from newer version).
I tried generating 'servers/x11/xorg/default.nix' with the perl script,
but unrelated packges changed, so I just manually updated the file.
2013-05-23 16:25:21 -07:00
Vladimír Čunát
e3ff0f116f
vmware driver: depend on mesa_drivers to find libxatracker
2013-05-23 22:52:46 +02:00
Rob Vermaas
d5f7976aef
Fix maintainers attribute
2013-05-21 09:20:00 +02:00
Bjørn Forsman
05bb66ce20
Add myself as maintainer for several packages
...
And set missing meta.platforms for the packages I've added earlier.
2013-05-20 20:28:15 +02:00
Bjørn Forsman
1578fd3c1f
munin: add missing dependencies
...
* Add needed dependencies:
coreutils, python, ruby, java and several Perl modules (Time::HiRes
1.9.724 is no longer available, bump to 1.9725)
* Use sha256 instead of md5 (more secure)
* Wrap munin perl scripts so they find their dependencies at runtime
* Rework meta description attributes.
FIXME/TODO: munin is still not usable; it tries to write log files and
web graphs to its installation path.
2013-05-20 19:10:44 +02:00
Domen Kozar
c9bae2bcbe
munin: add the package, WIP
2013-05-20 11:18:40 +02:00
Petr Rockai
b5451c73b6
dictd-wiktionary: Let dictd serve an offline copy of wiktionary.
...
@vcunat: add -O to python, as it takes lots of time to process
2013-05-18 13:24:30 +02:00
Petr Rockai
c7fbe02429
dictd-wordnet: Make wordnet available via local dictd.
2013-05-18 13:24:30 +02:00
Eelco Dolstra
2ce0e5ef4b
mysql: Update to 5.1.69
2013-05-14 11:47:23 +02:00
Eelco Dolstra
602be839a4
mysql: Update to 5.5.31
...
CVE-2013-1502, CVE-2013-1511, CVE-2013-1532, CVE-2013-1544,
CVE-2013-2375, CVE-2013-2376, CVE-2013-2389, CVE-2013-2391,
CVE-2013-2392, maybe others.
2013-05-14 11:47:22 +02:00
Mathijs Kwik
3d5121233d
mongodb: upgrade to 2.4.3 and use system libraries
2013-05-12 22:46:42 +02:00
Vladimír Čunát
ec3965d8d0
Revert Merge x-updates into master due to mesa bloat
...
See #490 discussion.
This reverts commit 1278859d31
, reversing
changes made to 0c020c98f9
.
Conflicts:
pkgs/desktops/xfce/core/xfce4-session.nix (take master)
pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát
1278859d31
Merge branch 'master' into x-updates
...
Conflicts (just splitting version from name):
pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
Eelco Dolstra
cd6da089a6
nginx: Update to 1.2.8
2013-05-07 17:33:51 +02:00
Shea Levy
e39ddf321c
nginx: Don't fetch the full WebDAV extension unless needed
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-05 15:48:07 -04:00
Russell O'Connor
9808445598
Add optional third party support for fullWebDAV.
...
This follows the directions fom http://wiki.nginx.org/HttpDavModule .
2013-05-05 15:19:03 -04:00
Shea Levy
b8c2fc71b3
jboss: Update to 7.1.1.Final
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-01 11:22:37 -04:00
Vladimír Čunát
8fc5fb6ecc
Merge branch 'master' into x-updates
2013-05-01 08:14:15 +02:00
Evgeny Egorochkin
f912d96147
Virtuoso: upgrade to 6.1.6
2013-04-30 12:01:02 +03:00
Vladimír Čunát
0b416310fc
xorg-server: clear the bogus font paths
2013-04-25 16:57:36 +02:00
Vladimír Čunát
bde20f3e88
Merge branch 'master' into x-updates
...
Conflicts (just taken x-updates):
pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
Pascal Wittmann
b6e7d86525
Lighttpd: Enable SSL
...
With this patch support for SSL is compiled into lighttpd.
IMO encryption is in most use cases important, therefore SSL support should be build in. This would simplify the setup of a standard web application a lot.
SSL support of lighttpd is documented at
http://redmine.lighttpd.net/projects/1/wiki/Docs_SSL
2013-04-23 14:30:57 +03:00
Evgeny Egorochkin
5084f47e47
Add a working mirror for xcb-util-renderutil
2013-04-21 05:31:31 +03:00
Shea Levy
da84bc4a89
rabbitmq-server: Put files in $HOME by default
...
Before, files were put in /var, requiring the server to be run as a
privileged user even when just testing locally. This can be overridden
by setting the SYS_PREFIX env variable, or on a more coarse-grained
basis in /etc/rabbitmq/rabbitmq-env.conf
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-19 10:46:31 -04:00
Vladimír Čunát
c859a46712
xorg: update xorgserver to 1.13.4, and more
...
- update some modules to work with the newer server
- fix many other modules via overrides
- huge cleanup in overrides via better propagation
and pixman include flattening
- URLs of XCB stuff have been moved
2013-04-18 21:33:17 +02:00
Vladimír Čunát
7716b78fc7
pixman: use pixman_cairo for xorg, flatten its includes
2013-04-18 21:31:56 +02:00
Vladimír Čunát
a40e825474
xorg-server: fix CVE-1940
...
http://lists.x.org/archives/xorg-devel/2013-April/036014.html
It's a low-priority issue, but it should cause almost no rebuilds.
2013-04-18 12:50:26 +02:00
Lluís Batlle i Rossell
5e6c0de6c9
silc-server: Nicer fetchurl src.
2013-04-12 21:39:07 +02:00
Lluís Batlle i Rossell
cdd57eb434
Adding silc-server.
2013-04-12 21:39:06 +02:00
Eelco Dolstra
4adad458e7
Remove the "proprietary" license
...
We already had "unfree".
2013-04-12 14:37:50 +02:00
Peter Simons
ce5b1fd053
squid: build without -Werror to fix build on GCC 4.8.x
2013-04-07 23:33:19 +02:00
Shea Levy
a32e208ded
Set psqlSchema properly for postgres 9.2.x
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-05 07:48:44 -04:00
Shea Levy
fad10ddb82
postgresql-9.2.x: Build the world
...
This builds the man pages as well as contributed program like pg_upgrade
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-05 07:16:05 -04:00
Eelco Dolstra
071987601a
postgresql: Update to latest versions
...
CVE-2013-1899, CVE-2013-1900, CVE-2013-1901.
2013-04-04 15:45:48 +02:00
Shea Levy
63291bcc9f
Merge branch 'lighttpd' of git://github.com/bjornfor/nixpkgs into upstream-master
...
Still builds, trivial update, contains a security fix.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-01 13:06:03 -04:00
Bjørn Forsman
238c26cea9
lighttpd: fix build warnings
...
The build complains about missing "file" and "which" commands, so add them as
build inputs.
"file" is used by the autotools configure script to tweak what -m flag
(if any) to pass to the linker when it asks it for shared library
support.
Here is an example of -m values for GNU ld:
Supported emulations:
elf_x86_64
elf32_x86_64
elf_i386
i386linux
elf_l1om
elf_k1om
"which" is used in the build phase to look for svnversion and git, to build a
version stamp. Since we build from a release tarball (and don't pass svn or git
as inputs either), this check fails and falls back to the version number in the
tarball.
There is one build warning left, but I think this is normal on NixOS:
/tmp/nix-build-lighttpd-1.4.32.drv-0/lighttpd-1.4.32/libtool: line 1085: ldconfig: command not found
2013-04-01 15:28:35 +02:00
Bjørn Forsman
c3190ef1d8
lighttpd: bump to version 1.4.32
...
One important denial of service (in 1.4.31) fix: CVE-2012-5533[1].
NOTE: There are some errors about missing commands during the build, but
I'm pretty sure they were there before. And the result seems to be
working anyway...
* /usr/bin/file: No such file or directory
* /bin/sh: line 2: which: command not found
* /tmp/nix-build-lighttpd-1.4.32.drv-0/lighttpd-1.4.32/libtool: line 1085: ldconfig: command not found
[1] http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-5533
2013-04-01 14:12:03 +02:00
Peter Simons
e655ac24d2
bind: add meta.license attribute
2013-04-01 11:46:14 +02:00
Peter Simons
d95c79bad7
bind: update to version 9.9.2-P2 to fix CVE 2010-4051 /2010-4052
2013-04-01 11:46:13 +02:00
Rok Garbas
98ba667094
adding varnish
2013-04-01 01:24:56 +02:00
Lluís Batlle i Rossell
fead3aed65
prayer: update to 1.3.5
2013-03-30 22:45:45 +01:00
Jaka Hudoklin
83afbf45ca
Add xf86videodummy and xf86inputvoid to xorg overrides (pixman fix)
2013-03-30 11:52:44 +01:00
Peter Simons
171425c8a0
mini-httpd: update to version 1.4
2013-03-28 13:56:22 +01:00
Eelco Dolstra
8a42c8b94e
httpd: Update to 2.2.24
2013-03-28 13:13:36 +01:00
Mathijs Kwik
b1200f1a28
mongodb: upgrade to 2.4.0
2013-03-25 08:08:46 +01:00
Shea Levy
4fa4ab3a6e
Partially revert my recent kernelPackages changes
...
First, pass in `self' again so that overriding works properly (thanks
for pointing that out, @edolstra)
Second, instead of having linuxPackages*.kernel mean something different
inside the set and out, add a new attribute linuxPackages*.kernelDev,
which for the generic kernel is simply linuxPackages*.kernel but for the
manual-config kernel is the `dev' output (which has the build tree,
source tree, etc.)
The second change required trivial modifications in a bunch of
expressions, I verified that all of the linuxPackages* sets defined in
all-packages.nix have the same drv paths before and after the change.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-24 07:45:00 -04:00
Peter Simons
72e4be65cc
mini-httpd: update to version 1.3
2013-03-21 11:01:16 +01:00
Shea Levy
fc3994074e
Merge branch 'fixVmwareFix' of git://github.com/Davorak/nixpkgs
...
The original fix modified a generated file instead of the
manually-maintained overrides file. Checked by inspection.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 18:19:02 -05:00
Eelco Dolstra
674c51af3c
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-03-07 19:33:52 +01:00
Rob Vermaas
03519851bc
Add elasticsearch 0.20.5
2013-03-07 12:36:29 +01:00
Rob Vermaas
415b292afc
Update rabbitmq to version 3.0.3
2013-03-07 12:34:45 +01:00
aszlig
7d273f07ea
oracle-xe: Add new package, version 11.2.0.
...
This is the Oracle Database which they give out for free, therefore it's called
Express Edition.
Well, I pretty much packaged this in vain as I finally found out that i don't
need that Oracle Database stuff at all. And my original purpose was to do SQL
query/constraint testing.
So before I'm going to throw this away (forever, oh no!), maybe someone else
might have a use case for this.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-07 10:24:18 +01:00
Sander van der Burg
31c198a40e
xf86-video-intel: bump to 2.20.19
2013-03-05 10:18:05 +01:00
Vladimír Čunát
26af997d41
Merge branch 'master' into stdenv-updates
...
Conflicts (simple):
pkgs/applications/networking/browsers/chromium/default.nix
pkgs/development/libraries/libsoup/default.nix
pkgs/os-specific/linux/kernel/manual-config.nix
pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
Patrick Wheeler
8cdfd46d96
Fix xf86vmware fix
...
Moved xf86vmware fix into the overrides.nix file where and not in the
generated default.nix.
2013-03-02 01:08:33 +01:00
Shea Levy
0de3ba4e4e
Merge pull request #338 from Davorak/master
...
Fix xorg-server on vmware - was: Fix to make xlibs.xf86videovmware build
2013-03-01 06:13:14 -08:00
Vladimír Čunát
d6b2f17743
rabbitmq_server: fix via update
...
I haven't tried it, but at least it builds now :-)
2013-02-28 11:14:56 +01:00
Eelco Dolstra
f2f860bd29
httpd: Update to 2.4.4
...
CVE-2012-3499, CVE-2012-4558
2013-02-27 14:43:00 +01:00
Patrick John Wheeler
d5ec021cdb
Making xlibs.xf86videovmware build
2013-02-27 06:44:41 +01:00
Peter Simons
5f32207dfc
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-02-24 19:27:08 +01:00
Vladimír Čunát
80ccdf1a23
net_snmp: fix build and a minor update
2013-02-23 19:15:14 +01:00
Vladimír Čunát
5e1bfa8053
firebird: update and fix, hopefully works
...
but it depends on #334
2013-02-23 17:22:45 +01:00
Vladimír Čunát
4601e6734a
dico: minor update, but still bad: wants "gets"
2013-02-23 14:51:40 +01:00
Shea Levy
8e5331a499
Merge branch 'mediatomb.130215' of https://github.com/jcumming/nixpkgs
...
Didn't build before, builds now.
2013-02-22 15:39:49 -05:00
Shea Levy
acd4299e75
Merge branch 'master' into stdenv-updates
...
Conflicts:
pkgs/applications/networking/browsers/chromium/default.nix
pkgs/top-level/all-packages.nix
Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
2013-02-21 11:13:30 -05:00
Cillian de Róiste
23bff22fc1
Add yaws, an Erlang HTTP server
2013-02-20 22:34:55 +01:00
Jack Cummings
2d61716061
compile fix: <stddef.h> needed for size_t
2013-02-15 18:01:37 -08:00
Eelco Dolstra
2aa6f262cb
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-02-15 13:36:34 +01:00
Peter Simons
8fa1ce00f2
petidomo: update to version 4.3
2013-02-11 14:38:02 +01:00
Shea Levy
9299b2ed3e
Fix petidomo license meta attribute
2013-02-10 11:02:27 -05:00
Peter Simons
f1b54f8ee2
mini-httpd: update to version 1.2
2013-02-09 22:50:50 +01:00
Peter Simons
361b2facee
petidomo: add version 4.2
2013-02-09 20:27:44 +01:00
Eelco Dolstra
4515ba0e48
postgresql: Update to latest versions
...
CVE-2013-0255
2013-02-07 16:37:12 +01:00
Eelco Dolstra
4172cbee05
shishi: Fix build
...
http://hydra.nixos.org/build/3884001
2013-01-28 17:19:01 +01:00
Lluís Batlle i Rossell
3b26ba7019
Merge remote-tracking branch 'central/master' into stdenv-updates
...
Conflicts:
pkgs/os-specific/linux/alsa-utils/default.nix
2013-01-27 11:32:12 +01:00
Rob Vermaas
362f37a292
Update zabbix2 to 2.0.4
2013-01-24 11:51:57 +01:00
Eelco Dolstra
0a47a28f1d
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-01-22 23:23:53 +01:00
Shea Levy
79dac66415
Whoops, tcl and which aren't needed
2013-01-21 18:30:11 -05:00
Shea Levy
5cbd865ce6
Redis 2.6.9
2013-01-21 18:27:34 -05:00
Rickard Nilsson
1886d1db6a
Merge remote-tracking branch 'upstream/master' into stdenv-updates
2013-01-20 16:53:21 +01:00
Rickard Nilsson
bc331e230e
mpd: Update to 0.17.3
...
Additionally, turn on a lot more features in mpd by
adding dependencies. Can be controlled by xxxSupport flags,
as before. By default, everything is enabled.
2013-01-18 12:01:14 +01:00
Eelco Dolstra
5bb548d2e4
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-01-17 14:19:14 +01:00
Eelco Dolstra
7fd42a8380
Get rid of the "sf" alias for "sourceforge"
2013-01-14 12:00:32 +01:00
Peter Simons
b33ad366a1
Merge branch 'master' into stdenv-updates.
2013-01-11 15:46:10 +01:00
Eelco Dolstra
1e9e2cb2bb
samba, imagemagick: Add missing meta info
2013-01-06 22:31:16 +01:00
Peter Simons
9e9cd7b529
Merge branch 'master' into stdenv-updates.
2013-01-04 21:00:53 +01:00
Lluís Batlle i Rossell
2169b0ab2e
vsftpd: fixing build in x86_64/i686
...
It was building fine in the sheevaplug though.
2013-01-03 19:52:14 +01:00
Lluis Batlle
451974f679
vsftpd: update to 3.0.2
...
And updated url. The old didn't work.
2012-12-29 12:22:50 +01:00
Lluís Batlle i Rossell
b58780c43d
Merge remote-tracking branch 'eelco/master' into stdenv-updates
...
Conflicts:
pkgs/development/compilers/gcc/4.7/default.nix
Trivial solution.
2012-12-28 23:28:16 +01:00
Eelco Dolstra
ab3eeabfed
Rename buildNativeInputs -> nativeBuildInputs
...
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Michael Raskin
356bd22822
Merge pull request #212 from washort/redis
...
add missing patch for redis on OSX
2012-12-27 05:32:55 -08:00
Eelco Dolstra
bbffdd4702
postgresql: Add version 9.2
2012-12-19 13:51:28 +01:00
aszlig
bf3d3dd19b
xinit: Fix logpath and dependencies for startx.
...
It seems that (almost?) all NixOS users start X using the services module,
because startx seems to be broken for quite some while. And it hit me while
getting to NixOS for the first time as well, so I then decided to just use the
service module.
As I'm working with multiple X servers, writing wrappers in ~/nixpkgs/config.nix
became tedious and so I decided to fix it, hopefully without breaking anything.
The fix consists of:
* Provide a default location for the Xorg log (~/.xorg.log - hope that's okay)
* Expose xauth through xinit to ensure purity and "unexpected behaviour", also
known as "simply not working", because xauth isn't in the user's environment.
* Actually provide the X binary so it doesn't have to be passed to startx every
time.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:19 +01:00
Eelco Dolstra
88dcdc9bed
postgresql: Update to latest versions
2012-12-11 14:08:41 +01:00
Allen Short
eb8884711c
add missing patch for redis on OSX
2012-12-10 07:48:03 -08:00
Michael Raskin
0ee1e2ad41
Comment out reference to nonexistent patch so that Hydra doesn't fail at evaluation
2012-12-08 15:30:28 +04:00
aszlig
a9edaf10ed
Merge pull request #207 from washort/mysql55
...
And sorry to @washort for bugging him too much with the syntax.
2012-12-07 18:48:40 +01:00
Allen Short
c6bf1f87f7
better syntax thanks to aszlig
2012-12-07 09:41:03 -08:00
Allen Short
b90b8f222b
only depend on perl on OSX
2012-12-07 09:31:10 -08:00
Allen Short
c47e911177
fixes for redis on OSX
2012-12-07 09:23:53 -08:00
Allen Short
843b9f332e
fixes for mysql on OSX 10.8
2012-12-05 15:43:34 -08:00
Michael Raskin
f54b40f80e
4store: fix build
2012-12-04 17:09:31 +04:00
Michael Raskin
d7bbb34d64
Update CouchDB
2012-12-04 10:17:06 +04:00
Michael Raskin
46c57d105c
Update 4store
2012-12-04 10:16:41 +04:00
Rob Vermaas
70f9071adf
Add zabbix 2.0.3
2012-12-02 15:28:08 +01:00
Rob Vermaas
cf68e76f14
Update memcached to 1.4.15
2012-12-01 21:09:55 +01:00
Eelco Dolstra
59e979177d
Remove duplicate tcp-wrappers package
2012-11-29 15:26:13 +01:00
Eelco Dolstra
72684fb42f
Remove support for the obsolete powerpc-darwin and i686-darwin platforms
2012-11-29 14:10:49 +01:00
Eelco Dolstra
5553546c21
Remove a bunch of unreferenced files
...
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Michael Raskin
1b15008952
Merge pull request #153 from jcumming/icecast
...
- icecast-2.3.3, libshout-2.3.1
2012-11-21 21:30:28 -08:00
Lluís Batlle i Rossell
38153d9105
xf86 video openchrome: fixing the build, changing overrides.
2012-11-18 22:19:00 +01:00
Alexander Foremny
58d68427c6
Fix xf86-video-sis
2012-11-18 20:16:54 +01:00
David Guibert
6c943d3758
update pulseaudio to 2.1
...
Systemd support has also been added because pulseaudio needs it to
be useable with the systemd branch of nixos.
2012-11-15 07:41:11 +01:00
Michael Raskin
426b75c0a4
Fix unneeded /bin/sh reference
2012-11-10 15:03:40 +04:00
Eelco Dolstra
b40c41b7e3
zabbix: Update to 1.8.15
2012-10-26 16:23:30 +02:00
James Cook
01d749f0aa
Rolled back xf86-video-ati to 6.14.4.
...
6.14.6 requires a newer version of libdrm, which in turn requires a newer
version of mesa. I cheated and edited the generated default.nix file instead of
re-generating it, since generate-expr-from-tarballs.pl complained of a collision
between two tarballs providing different versions of xorg-server.
2012-10-26 14:03:07 +02:00
Jack Cummings
ccfb056255
shoutcast support for mpd
2012-10-24 18:15:48 -07:00
Michael Raskin
47d3d58ec6
Fix xwd build
2012-10-19 13:50:02 +04:00
Michael Raskin
0e930058ae
Update TigerVNC to SVN checkout that at least builds..
2012-10-18 20:49:22 +04:00
Eelco Dolstra
f7436a9141
Merge remote-tracking branch 'origin/master' into x-updates
2012-10-17 12:07:03 -04:00
aszlig
0b592ce677
apache-httpd/2.4: Add modules for NixOS service.
...
The NixOS service module loads those modules by default. So we need to build
them here as well.
I'm not really sure why these modules are included by default, because (except
from maybe CGI) they obviously are only usable in very rare cases. Am I wrong?
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-17 15:56:08 +02:00
aszlig
2f3dcb9dd2
apache-httpd/2.4: Fix libxml2 support.
...
The reason because the configure script is unnable to find libxml2 is because it
is searching for a header file in `libxml/*.h`. Obviously this cases an error,
because it's actually in `${libxml2}/include/libxml2/libxml/*.h`, so let's add
the parent directory to --with-libxml2 and remove the comment from buildInputs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-17 15:56:07 +02:00
Michael Raskin
cdd51e2730
Update Squid 3.2 to the latest 3.2.2 version
2012-10-17 16:44:26 +04:00
Michael Raskin
8eec7bf2f6
Updating BIND to freshest version 9.9.2
2012-10-17 16:27:38 +04:00
Eelco Dolstra
31212a0a95
Fix font-cursor-misc build
2012-10-15 13:14:12 -04:00
Peter Simons
87c5696996
pkgs/servers/x11/xorg/overrides.nix: correctly patch path to mkfontscale into mkfontdir wrapper script
2012-10-15 19:06:59 +02:00
Eelco Dolstra
80fa05f1f5
xf86-video-intel: Update to 2.20.10
2012-10-15 12:09:28 -04:00
Eelco Dolstra
3b968053d4
Fix font-schumacher-misc build
...
http://hydra.nixos.org/build/3157818
2012-10-15 11:52:11 -04:00
Jack Cummings
5ded1fb645
- icecast-2.3.3, libshout-2.3.1
2012-10-14 23:48:46 -07:00
Peter Simons
70334f04ee
pkgs/servers/x11/xorg/overrides.nix: xinput needs libXrender to build
2012-10-14 20:28:00 +02:00
Peter Simons
f77a2f460a
Merge branch 'master' into x-updates.
2012-10-12 15:24:24 +02:00
Ludovic Courtès
018068d7c5
samba: fix cross-compilation
2012-10-11 12:02:46 +02:00
Peter Simons
6ff829f19d
Merge branch 'master' into x-updates
2012-10-10 18:46:48 +02:00
Eelco Dolstra
34ff91d602
nginx: Update to 1.2.4
2012-10-09 14:20:44 -04:00
Eelco Dolstra
156e1f1e1f
Add psqlodbc for iodbc
2012-10-09 14:02:09 -04:00
Sander van der Burg
4ef6aa3a6c
Bumped MySQL java connector version to 5.1.22
...
Merge branch 'master' of github.com:NixOS/nixpkgs
2012-10-09 16:41:30 +02:00
Sander van der Burg
da52aeefad
Bump MySQL java connector version to 5.1.22
2012-10-09 16:41:01 +02:00
Mathijs Kwik
da8b2dfcc7
samba: upgrade to 3.6.8
2012-10-09 16:05:24 +02:00
Eelco Dolstra
90d9f8ec18
Update xcb-proto and libxcb
2012-10-08 15:15:05 -04:00
Eelco Dolstra
41e9f7cfed
Merge remote-tracking branch 'origin/master' into x-updates
2012-10-08 13:48:30 -04:00
Peter Simons
0826608328
spamassassin: don't pass 'IOSocketInet6'
...
Adding that package as a build input makes SpamAssassin print "function
re-defined" warnings at run-time.
2012-10-07 18:55:41 +02:00
Eelco Dolstra
c1719a5835
Merge remote-tracking branch 'origin/master' into x-updates
2012-10-05 17:57:45 -04:00
Eelco Dolstra
925aeb98d5
PostgreSQL updates
2012-10-04 11:26:19 -04:00
aszlig
1de3682f98
mysql55: Enable parallel building.
...
In order to extend the lifes of keyboards, monitors, mice and other hardware in
range of impatient people, this should shorten build times a bit on multicore
systems. And of course keeps blood pressure at low rates so cholerics may live
longer. Whether the latter is good or bad is up to the readers choice and
imagination.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-04 08:35:03 +02:00
aszlig
d4c56cef43
mysql55: Update to version 5.5.28.
...
The current build fails because the URL at inria.fr is no longer accessible. And
5.5.23 is quite old, so let's update it.
With this update we also provide three URLs to fetchurl, just to make sure that
we have enough sources, should one URL become inaccessible again.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-04 08:35:02 +02:00
Eelco Dolstra
31f89ba349
Merge remote-tracking branch 'origin/master' into x-updates
2012-10-03 14:43:10 -04:00
Eelco Dolstra
9bc8e1250b
xinetd: Update to 2.3.15
...
Fixes CVE-2012-0862.
2012-10-02 11:52:37 -04:00
Eelco Dolstra
3cf0b00b5a
bind: Update to 9.7.6-P3
...
Fixes CVE-2012-4244.
2012-10-02 11:48:54 -04:00
Eelco Dolstra
f75dddde80
apache-httpd: Update to 2.2.23
...
Fixes CVE-2012-0883, CVE-2012-2687.
2012-10-02 11:45:54 -04:00
Eelco Dolstra
b78256fbd7
Merge remote-tracking branch 'origin/master' into x-updates
2012-10-01 11:43:43 -04:00
Eelco Dolstra
281fa6f85a
Revert "xorg-server: Boldly update to 1.13.0"
...
This reverts commit 2f2426a02f89458451de0570ee6f0bf1442a3619.
xf86-video-intel requires a newer version of libdrm, which in turn
breaks mesa. So stick to 1.12.4 until this gets sorted out.
2012-09-28 17:44:38 -04:00
Eelco Dolstra
1b807c2acd
xorg-server: Boldly update to 1.13.0
2012-09-28 17:44:38 -04:00
Eelco Dolstra
4a6a87eedc
Fix builds depending on libXft
2012-09-27 12:38:48 -04:00
Peter Simons
dfaab992c2
spamassassin: enable more plugins and provide gpg for sa-update
2012-09-27 15:29:01 +02:00
Peter Simons
74c0850efd
spamassassin: site-wide rules are in $out/share/spamassassin; user-rules in /etc/spamassassin
2012-09-27 15:28:14 +02:00
Peter Simons
a596022d80
apache-httpd: update to version 2.4.3
2012-09-27 13:46:50 +02:00
Lluís Batlle i Rossell
27bd526654
freeswitch: updating to stable 1.2.3
...
I'll avoid using the git version; I'm less sure if it's better than the
released stable.
2012-09-26 22:55:56 +02:00
Eelco Dolstra
2fed9dfbc5
Some X.org updates (include xorg-server to 1.12.4)
2012-09-26 16:11:26 -04:00
Eelco Dolstra
d5758c99a3
Merge remote-tracking branch 'origin/master' into x-updates
...
Conflicts:
pkgs/misc/maven/maven-1.0.nix
pkgs/os-specific/linux/xf86-input-wacom/default.nix
2012-09-26 14:51:51 -04:00
Peter Simons
f2b6eee34e
dovecot: cosmetic
2012-09-25 12:51:41 +02:00
Michael Raskin
def0189ccd
Add support for authentication via user list in MySQL to restund
2012-09-25 10:47:00 +04:00
Michael Raskin
1527b10016
Adding restund
2012-09-25 10:34:45 +04:00
Peter Simons
f1bfc3055d
dovecot: drop obsolete versions 1.0.3 and 1.1.1
2012-09-24 10:03:10 -04:00
Peter Simons
4f099c9880
popa3d: enable standalone mode
2012-09-19 01:38:07 +02:00
Peter Simons
d23aef5432
popa3d: customize for use on NixOS
2012-09-19 01:27:00 +02:00
Peter Simons
7ba33d813e
popa3d: add version 1.0.2
2012-09-19 01:16:01 +02:00
Eelco Dolstra
f590586775
xorg-server: Enable the SECURITY extension
...
This allows "ssh -X" to do the right thing.
2012-09-18 17:10:36 -04:00
Peter Simons
aa2d8d1e02
dovecot: rename file for version 1.0.3 to improve consistency
2012-09-18 15:08:28 +02:00
Mathijs Kwik
ad628ab557
mongodb: fix build on i686, restrict platforms to linux
...
mongodb is supposed to work on most unixes but its build system is
quite picky and fragile.
As it hasn't worked for non-linux platforms on NixOS yet, this change
won't affect anyone and will remove the illusion that other platforms
are currently supported.
2012-09-09 17:25:59 +02:00
Mathijs Kwik
071d685dda
mongodb: upgrade to 2.2.0
2012-09-09 13:04:14 +02:00
Lluís Batlle i Rossell
449230335d
sipwitch: update to 1.2.4
2012-09-04 09:59:26 +02:00
Peter Simons
d7470b6c68
postfix: update to version 2.8.12
2012-08-28 15:18:17 +02:00
Peter Simons
85350ca2d4
postfix: clean-up install phase
...
Passing install_root=$out isn't a good idea because the install script is going
to pre-pend that prefix to all other paths even though these have the $out
prefix already. The resulting installation is a mess. Instead, we use the
"fake" install prefix "out" and then move all files and directories into the
right place afterward.
2012-08-28 15:17:06 +02:00
Peter Simons
40fe2d03b5
postfix: re-use $name in src URL
2012-08-28 15:14:59 +02:00
Peter Simons
919b357255
postfix: add meta section
2012-08-28 15:14:59 +02:00
Peter Simons
b920bd538a
postfix: strip trailing whitespace
2012-08-28 15:14:59 +02:00
Eelco Dolstra
bc8b1376da
postgresql-jdbc: Update to 9.1-902
2012-08-27 14:02:39 -04:00
Eelco Dolstra
606e6acd6f
postgresql: Update to latest versions
...
Fixes CVE-2012-3488, CVE-2012-3489.
2012-08-21 08:42:44 -04:00
Eelco Dolstra
b8be9b54f3
samba: Update to 3.6.7
2012-08-17 16:09:13 -04:00
Peter Simons
a143bb79e2
spamassassin: disable taint mode, without it we cannot configure the PERL5LIB search path
2012-08-03 13:21:29 +02:00
Rob Vermaas
eb29e0449b
Add mod_evasive
2012-07-31 15:51:31 +02:00
Rickard Nilsson
bb2cff55ae
dovecot_2: Enable LDAP support.
2012-07-30 18:58:54 +02:00
Shea Levy
912440dae8
dovecot2: Bump to 2.1.8
2012-07-24 18:34:19 -04:00
Shea Levy
5315a0bb6d
xf86-input-keyboard: Needs pixman
2012-07-15 22:56:49 -04:00
Shea Levy
27339f2ad8
xf86-input-mouse: Needs pixman
2012-07-15 22:55:12 -04:00
Shea Levy
4f01e68ff8
xf86-input-synaptics: Needs mtdev and pixman
2012-07-15 22:53:43 -04:00
Shea Levy
d382822803
xf86-video-ati: Needs pixman
2012-07-15 22:48:28 -04:00
Shea Levy
ccceaba50a
xf86-video-cirrus: Needs pixman
2012-07-15 22:47:27 -04:00
Shea Levy
08e7a18a2c
xf86-video-nv: Needs pixman
2012-07-15 22:45:57 -04:00
Shea Levy
c95e6d5dc4
xf86-video-vesa: Need pixman
2012-07-15 22:44:11 -04:00
Shea Levy
a55bcacbe2
xorg-video-unichrome: Update git url, fix build with new xorg
2012-07-15 22:40:52 -04:00
Shea Levy
f0b7c9813b
xorg.ev: Needs libXrender
2012-07-15 03:36:48 -04:00
Shea Levy
65ac9694c7
xorg: evdev and fbdev need pixman
2012-07-14 16:26:22 -04:00
Shea Levy
fdf6f17a1b
x11: Some fonts need mkfontscale
...
There may be others, these are just the ones that needed it for my configuration to build
2012-07-14 16:16:31 -04:00
Shea Levy
d6d6b623c9
xorgserver: Update xkbcomp-path patch
...
_XkbDupString was migrated to Xstrdup
2012-07-14 15:13:08 -04:00
Shea Levy
13c5b75b80
xorgserver: Add needed deps
2012-07-14 15:07:36 -04:00
Shea Levy
bb469d5e25
xorgserver: Update dir path patch
2012-07-14 15:03:36 -04:00
Shea Levy
71e0a3fb93
x.org: Update to 7.7
2012-07-14 14:33:58 -04:00
Shea Levy
c514ee974a
Merge remote-tracking branch 'upstream/master' into x-updates
...
mountall conflict was trivial
Conflicts:
pkgs/os-specific/linux/mountall/default.nix
2012-07-14 14:24:27 -04:00
Eelco Dolstra
b00c839f4b
Add ElasticMQ, a message queue service
2012-07-09 15:26:07 -04:00
Peter Simons
9c5f897465
SpamAssassin: add version 3.3.2
2012-07-08 00:32:37 +02:00
Peter Simons
b98782f339
apache-httpd-2.4: build MPMs as DSOs so that the desired one can be selected at run-time
2012-07-07 09:09:05 +02:00
Peter Simons
32449b5ae6
apache-httpd-2.4: replace use of tabs with blanks
2012-07-07 08:57:53 +02:00
Peter Simons
ea1d479afb
apache-httpd-2.4: ensure that libgcc_s can be found at run-time
2012-07-07 08:57:28 +02:00
Peter Simons
c870b80512
apache: add version 2.4
2012-07-07 08:47:19 +02:00
Eelco Dolstra
714f100970
httpd: Support building with another multi-processing module
2012-07-06 14:25:40 -04:00
Lluís Batlle i Rossell
808e50c7cf
freeswitch: Updating to the latest master. This fixes the build.
...
They say that 'master' is the best stable code to use.
2012-07-02 22:17:38 +02:00
Eelco Dolstra
7925441bab
net-snmp: Moved to pkgs/servers/monitoring
2012-06-21 15:22:17 -04:00
Yury G. Kudryashov
4638c52fb6
dovecot-2.1.7
...
svn path=/nixpkgs/trunk/; revision=34490
2012-06-13 07:09:03 +00:00
Mathijs Kwik
51ec873c8d
mongodb: upgraded to 2.0.6
...
svn path=/nixpkgs/trunk/; revision=34470
2012-06-11 17:41:14 +00:00
Eelco Dolstra
36667965f9
* Updated bind to 9.7.6-P1, which includes a fix for CVE-2012-1667.
...
svn path=/nixpkgs/trunk/; revision=34370
2012-06-06 15:51:48 +00:00
Eelco Dolstra
73a1d5e27f
* PostgreSQL updates.
...
svn path=/nixpkgs/trunk/; revision=34361
2012-06-05 15:24:16 +00:00
Mathijs Kwik
71c3057406
mongodb: upgraded to 2.0.5
...
svn path=/nixpkgs/trunk/; revision=34267
2012-05-29 07:43:58 +00:00
Eelco Dolstra
932d5bee54
* X.org 7.7 RC1. Note that xorg-server doesn't build yet.
...
svn path=/nixpkgs/branches/x-updates/; revision=34147
2012-05-16 22:06:27 +00:00