Vladimír Čunát
bf414c9d4f
Merge 'staging' into closure-size
...
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes
Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
Eelco Dolstra
b1ec8e6c64
apache-httpd: Update to 2.4.12
...
CVE-2014-3583, CVE-2014-3581, CVE-2014-8109, CVE-2013-5704.
2015-02-24 16:10:55 +01:00
Eelco Dolstra
db4053fb59
httpd-2.2: Enable building of mod_cache and friends
2014-11-11 10:39:24 +01:00
Eelco Dolstra
8e40703f6c
apache-httpd: Update to 2.2.29
...
CVE-2014-0118, CVE-2014-0231, CVE-2014-0226, CVE-2013-5704.
2014-09-24 21:04:24 +02:00
Vladimír Čunát
381dcb1d98
various packages fixed
2014-08-30 23:30:31 +02:00
Vladimír Čunát
96cec2a7bd
Merge 'staging' into multiple-outputs
...
Conflicts:
pkgs/applications/audio/flac/default.nix
pkgs/build-support/gcc-wrapper/builder.sh
pkgs/development/libraries/apr-util/default.nix
pkgs/development/libraries/apr/default.nix
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/builder.sh
pkgs/development/libraries/glibc/2.17/locales.nix
pkgs/development/libraries/libjpeg/default.nix
pkgs/development/libraries/libogg/default.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/libvorbis/default.nix
pkgs/development/libraries/mesa/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/development/web/nodejs/default.nix
pkgs/os-specific/linux/pam/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/stdenv/generic/setup.sh
pkgs/stdenv/linux/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Marc Weber
ba154ec9d4
apache 2_4 update, fixes some CVE's
...
See http://www.apache.org/dist/httpd/Announcement2.4.html It compiles,
didn't run it. I guess minor update doesn't cause much trouble even
though there are some new features
2014-07-24 18:10:10 +02:00
Eelco Dolstra
65a78e16f1
httpd: Update to 2.2.27
...
CVE-2013-6438, CVE-2014-0098
2014-05-01 11:48:56 +02:00
Peter Simons
2d4919dbb4
apacheHttpd_2_4: update from 2.4.7 to 2.4.9
2014-04-09 12:41:11 +02:00
Evgeny Egorochkin
c67f562d5e
add branch info
2014-02-18 04:13:45 +02:00
Peter Simons
0266ac9c30
apache-httpd-2.4: revert "enable building the 'event'-based mpm worker"
...
Commit 0c3d910cd027a926ffc8538ea60cf2da099d7808 didn't have any effect.
The 'event' MPM module isn't built because our version of APR is too old.
2014-01-08 13:17:40 +01:00
Peter Simons
cdfd953ffa
apache-httpd-2.4: enable building the 'event'-based mpm worker
...
Adding "LoadModule mpm_event_module modules/mod_mpm_event.so" to httpd.conf
enables that worker instead of the default choice.
2013-12-29 12:52:54 +01:00
Nixpkgs Monitor
6996067dcf
apacheHttpd_2_4: update from 2.4.6 to 2.4.7
2013-12-09 10:49:00 +02:00
Nixpkgs Monitor
e523fdfc47
apacheHttpd: update from 2.2.25 to 2.2.26
2013-12-09 10:47:10 +02:00
Eelco Dolstra
01087750ba
Don't build some packages on some platforms
2013-11-04 21:11:00 +01:00
Eelco Dolstra
798ce14839
apache-httpd: Update to 2.4.6
2013-11-04 21:10:59 +01:00
Eelco Dolstra
10cb4a8cf2
Merge remote-tracking branch 'origin/master' into multiple-outputs
...
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libsndfile/default.nix
pkgs/misc/cups/default.nix
pkgs/top-level/all-packages.nix
2013-08-21 17:05:30 +02:00
Eelco Dolstra
ca0936f17f
apache-httpd: Update to 2.2.25
...
CVE-2013-1896, CVE-2013-1862.
2013-07-17 12:59:29 +02:00
Jason \"Don\" O'Conal
ccb7715de8
apacheHttpd_2_4: fix build on darwin
2013-07-07 13:46:43 +02:00
Eelco Dolstra
552fd3d599
Merge remote-tracking branch 'origin/master' into multiple-outputs
...
Conflicts:
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/gmime/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/servers/x11/xorg/default.nix
pkgs/top-level/all-packages.nix
2013-06-25 18:42:56 +02: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
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
Eelco Dolstra
cc61d31902
apache-httpd: Use multiple outputs
2013-06-13 11:57:17 +02:00
Eelco Dolstra
8a42c8b94e
httpd: Update to 2.2.24
2013-03-28 13:13:36 +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
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
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
Peter Simons
a596022d80
apache-httpd: update to version 2.4.3
2012-09-27 13:46:50 +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
Eelco Dolstra
4b9ef75972
* Updated Apache httpd to 2.2.22.
...
svn path=/nixpkgs/trunk/; revision=32304
2012-02-15 16:21:44 +00:00
Eelco Dolstra
ef27bfc02a
* Apache 2.2.21.
...
svn path=/nixpkgs/trunk/; revision=29707
2011-10-07 11:37:42 +00:00
Eelco Dolstra
573e554e2c
* Apache httpd updated to 2.2.20, with a fix for CVE-2011-3192.
...
svn path=/nixpkgs/trunk/; revision=28976
2011-09-02 15:59:12 +00:00
Eelco Dolstra
c81069e9d5
* apr updated to 1.4.5.
...
* apr-util updated to 1.3.12.
* httpd updated to 2.2.19.
svn path=/nixpkgs/trunk/; revision=27487
2011-06-16 15:19:53 +00:00
Lluís Batlle i Rossell
ccd2316471
Fixing the builds of apr, apache, subversion and friends when having enabled the ldap support.
...
svn path=/nixpkgs/trunk/; revision=26764
2011-04-09 14:59:06 +00:00
Lluís Batlle i Rossell
450ef3730c
Adding ldap support to apache (true by default).
...
I imagine noone would mind this 'addon' in their nixos apache installations.
svn path=/nixpkgs/trunk/; revision=26763
2011-04-09 14:24:25 +00:00
Lluís Batlle i Rossell
f4f84af4ab
Updating from trunk. I only had to take away the usual stdenv2 in
...
all-packages.nix
svn path=/nixpkgs/branches/stdenv-updates/; revision=24553
2010-10-31 19:30:31 +00:00
Peter Simons
90490b0603
pkgs/servers/http/apache-httpd: updated to version 2.2.17
...
svn path=/nixpkgs/trunk/; revision=24468
2010-10-25 13:13:15 +00:00
Peter Simons
4fa49d4e8f
pkgs/servers/http/apache-httpd: added meta.platforms and meta.maintainer
...
svn path=/nixpkgs/trunk/; revision=24465
2010-10-25 13:12:57 +00:00
Peter Simons
3527fd782a
pkgs/servers/http/apache-httpd: dropped obsolete comment
...
svn path=/nixpkgs/trunk/; revision=24464
2010-10-25 13:12:33 +00:00
Lluís Batlle i Rossell
6dc839d344
Merging from trunk. I resolved some conflicts; I hope that well.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Peter Simons
b6693acfb2
pkgs/servers/http/apache-httpd: added meta.license information
...
svn path=/nixpkgs/trunk/; revision=24407
2010-10-21 15:39:53 +00:00
Lluís Batlle i Rossell
6923539d84
Fixing the apache build (comment on the fix in the source)
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=24032
2010-10-03 09:18:03 +00:00
Eelco Dolstra
ab5669146d
* apr 1.4.2, Apache httpd 2.2.16.
...
svn path=/nixpkgs/trunk/; revision=23046
2010-08-08 20:29:23 +00:00
Eelco Dolstra
7ba365a41a
* Apache httpd updated to 2.2.15.
...
svn path=/nixpkgs/trunk/; revision=20477
2010-03-08 14:28:47 +00:00
Eelco Dolstra
fa9d33b8cc
* Apache 2.2.14.
...
svn path=/nixpkgs/trunk/; revision=17768
2009-10-12 17:57:49 +00:00