about summary refs log tree commit diff
path: root/pkgs/servers/http
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-07-21
|\
| * lighttpd: 1.4.39 -> 1.4.40Bjørn Forsman2016-07-19
* | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-07-19
|\|
| * nginx: refactor and add mainline versionFranz Pletz2016-07-19
* | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-07-15
|\|
| * nginx: 1.10.0 -> 1.10.1 (security)Franz Pletz2016-07-10
| * gatling: remove unused dependency on polarsslFranz Pletz2016-07-10
| * jetty: 9.3.9 -> 9.3.10Rickard Nilsson2016-06-26
| * apache-httpd: 2.4.18 -> 2.4.20Eelco Dolstra2016-06-20
| * Captialize meta.description of all packagesBjørn Forsman2016-06-20
| * Merge pull request #15677 from womfoo/mod_auth_mellonzimbatm2016-06-12
| |\
| | * mod_auth_mellon: init at 0.12.0Kranium Gikos Mendoza2016-05-23
* | | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-06-10
|\| |
| * | jetty: Remove obsolete versions and init new default to 9.3.9.v20160517Rickard Nilsson2016-06-10
| * | nginxModules.lua: 0.10.0 -> 0.10.5Teo Klestrup Röijezon2016-06-05
* | | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-05-30
|\| |
| * | treewide: Make explicit that 'dev' output of zlib is usedTuomas Tynkkynen2016-05-19
| * | treewide: Make explicit that 'dev' output of pcre is usedTuomas Tynkkynen2016-05-19
| * | treewide: Make explicit that 'dev' output of openssl is usedTuomas Tynkkynen2016-05-19
| * | treewide: Make explicit that 'dev' output of aprutil is usedTuomas Tynkkynen2016-05-19
| * | treewide: Make explicit that 'dev' output of apr is usedTuomas Tynkkynen2016-05-19
| * | treewide: Make explicit that 'dev' output of apacheHttpd is usedTuomas Tynkkynen2016-05-19
| |/
* | Merge remote-tracking branch 'origin/master' into hardened-stdenvFranz Pletz2016-05-18
|\|
| * Bring my stdenv.lib.maintainers user name in line with my github nick.Peter Simons2016-05-16
| * 4store: 1.1.5 -> 1.1.6 (convert from builderDefsPackage)Domen Kožar2016-05-08
| * nginx: restore .upstream filesTobias Geerinckx-Rice2016-05-06
| * nginxUnstable: alias to nginx until next unstable releaseTobias Geerinckx-Rice2016-05-06
| * nginx: remove .upstream filesTobias Geerinckx-Rice2016-05-06
| * nginx: 1.8.1 -> 1.10.0Tobias Geerinckx-Rice2016-05-03
| * lighttpd: 1.4.37 -> 1.4.39Franz Pletz2016-05-03
* | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-05-02
|\|
| * nix-binary-cache: take into account Nix split (mulitple-outputs)Michael Raskin2016-04-22
| * nghttp2: 1.8.0 -> 1.9.2, unify with libnghttp2, and use multiple outputsEelco Dolstra2016-04-18
* | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-04-18
|\|
| * nginxUnstable: 1.9.11 -> 1.9.14Michael Raskin2016-04-13
| * Merge branch 'master' into closure-sizeVladimír Čunát2016-04-10
| |\
| | * thttpd: 2.26 -> 2.27Florian Steinel2016-04-09
| * | Merge branch 'master' into closure-sizeVladimír Čunát2016-04-01
| |\ \
| * \ \ Merge master into closure-sizeVladimír Čunát2016-03-08
| |\ \ \
| * \ \ \ Merge #12779: Mass replace `pkg}/bin`-style stringsVladimír Čunát2016-02-03
| |\ \ \ \
| | * | | | treewide: Mass replace 'xz}/bin' to refer the 'bin' outputTuomas Tynkkynen2016-02-01
| | * | | | treewide: Mass replace 'openssl}/bin' to refer the 'bin' outputTuomas Tynkkynen2016-02-01
| | * | | | treewide: Mass replace 'bzip2}/bin' to refer the 'bin' outputTuomas Tynkkynen2016-02-01
| * | | | | Merge recent 'staging' into closure-sizeVladimír Čunát2016-02-03
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'staging' into closure-sizeVladimír Čunát2016-01-19
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into closure-sizeVladimír Čunát2015-12-31
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into closure-sizeLuca Bruno2015-12-11
| |\ \ \ \ \ \ \
| * | | | | | | | apache modules: fix build problemsVladimír Čunát2015-12-05
| * | | | | | | | apache-httpd-2.2: fix buildVladimír Čunát2015-12-05
| * | | | | | | | apache*: don't change layout in $out WRT masterVladimír Čunát2015-12-04