Commit Graph

842 Commits

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