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 |
|
Eelco Dolstra
|
65a78e16f1
|
httpd: Update to 2.2.27
CVE-2013-6438, CVE-2014-0098
|
2014-05-01 11:48:56 +02:00 |
|
Evgeny Egorochkin
|
c67f562d5e
|
add branch info
|
2014-02-18 04:13:45 +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
|
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 |
|
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
|
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
|
c870b80512
|
apache: add version 2.4
|
2012-07-07 08:47:19 +02:00 |
|