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