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