Commit graph

823 commits

Author SHA1 Message Date
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