JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
222,833 Commits 2 Branches 0 Tags 12 GiB
fbb9bcaef4
Commit Graph

944 Commits

Author SHA1 Message Date
Aaron Andersen
336a6f471f nixos/httpd: symlink apache configuration to /etc/httpd/httpd.conf for use in the apachectl command 2020-01-08 10:37:46 -05:00
Aaron Andersen
e9d3a3c7d8
Merge pull request #76417 from dirkx/redwax-modules 
mod_ca, mod_crl, mod_csr, mod_ocsp, mod_scep, mod_pkcs12, mod_spkac, mod_timestamp: init at 0.2.1
 2020-01-07 20:49:24 -05:00
R. RyanTM
aa4fe9c768 mod_wsgi: 4.6.8 -> 4.7.0 2020-01-05 22:08:04 -08:00
Ryan Mulligan
6de8b8f144
Merge pull request #61722 from Izorkin/pinba-nginx 
nginxModules.pinba: init at 13.05.2019
 2020-01-04 07:58:18 -08:00
Frederik Rietdijk
7aa2b0215b Merge master into staging-next 2020-01-03 10:25:14 +01:00
aszlig
845e92835d
Merge Last-Modified fix for nginx (#76697) 
This fixes the patch for nginx to clear the Last-Modified header if a
static file is served from the Nix store.

So far we only used the ETag from the store path, but if the
Last-Modified header is always set to "Thu, 01 Jan 1970 00:00:01 GMT",
Firefox and Chrome/Chromium seem to ignore the ETag and simply use the
cached content instead of revalidating.

Alongside the fix, this also adds a dedicated NixOS VM test, which uses
WebDriver and Firefox to check whether the content is actually served
from the browser's cache and to have a more real-world test case.
 2020-01-02 21:41:59 +01:00
Frederik Rietdijk
f08e3e38d4 Merge master into staging-next 2020-01-02 21:41:13 +01:00
zimbatm
c187844214
unit: add withRuby_2_7 option 2020-01-01 00:25:03 +00:00
Robin Gloster
6ca6ac796b
treewide: configureFlags is a flat list 2019-12-31 01:37:49 +01:00
Robin Gloster
760e23136a
treewide: *inputs are lists 2019-12-31 01:09:25 +01:00
Robin Gloster
313da176d3
treewide: NIX_*_FLAGS -> string 2019-12-31 00:16:46 +01:00
Robin Gloster
5f2b92e3ec
treewide: NIX_*_COMPILE -> string 2019-12-31 00:13:29 +01:00
aszlig
ccf55bead1
nginx: Clear Last-Modified if ETag is from store 
This is what I've suspected a while ago[1]:

> Heads-up everyone: After testing this in a few production instances,
> it seems that some browsers still get cache hits for new store paths
> (and changed contents) for some reason. I highly suspect that it might
> be due to the last-modified header (as mentioned in [2]).
>
> Going to test this with last-modified disabled for a little while and
> if this is the case I think we should improve that patch by disabling
> last-modified if serving from a store path.

Much earlier[2] when I reviewed the patch, I wrote this:

> Other than that, it looks good to me.
>
> However, I'm not sure what we should do with Last-Modified header.
> From RFC 2616, section 13.3.4:
>
> - If both an entity tag and a Last-Modified value have been
>   provided by the origin server, SHOULD use both validators in
>   cache-conditional requests. This allows both HTTP/1.0 and
>   HTTP/1.1 caches to respond appropriately.
>
> I'm a bit nervous about the SHOULD here, as user agents in the wild
> could possibly just use Last-Modified and use the cached content
> instead.

Unfortunately, I didn't pursue this any further back then because
@pbogdan noted[3] the following:

> Hmm, could they (assuming they are conforming):
>
>  * If an entity tag has been provided by the origin server, MUST
>    use that entity tag in any cache-conditional request (using If-
>    Match or If-None-Match).

Since running with this patch in some deployments, I found that both
Firefox and Chrome/Chromium do NOT re-validate against the ETag if the
Last-Modified header is still the same.

So I wrote a small NixOS VM test with Geckodriver to have a test case
which is closer to the real world and I indeed was able to reproduce
this.

Whether this is actually a bug in Chrome or Firefox is an entirely
different issue and even IF it is the fault of the browsers and it is
fixed at some point, we'd still need to handle this for older browser
versions.

Apart from clearing the header, I also recreated the patch by using a
plain "git diff" with a small description on top. This should make it
easier for future authors to work on that patch.

[1]: https://github.com/NixOS/nixpkgs/pull/48337#issuecomment-495072764
[2]: https://github.com/NixOS/nixpkgs/pull/48337#issuecomment-451644084
[3]: https://github.com/NixOS/nixpkgs/pull/48337#issuecomment-451646135

Signed-off-by: aszlig <aszlig@nix.build>
 2019-12-30 14:30:36 +01:00
Robin Gloster
2157dcd141
treewide: installFlags is a list 2019-12-30 13:22:43 +01:00
Nathan
b0caf68bff
maintainer-list.nix: remove ndowens 2019-12-26 16:47:41 -05:00
Izorkin
b5bd159690 unit: add drop capabilites patch 2019-12-26 17:51:53 +03:00
Izorkin
681dca1b67 unit: 1.13.0 -> 1.14.0 2019-12-26 17:39:14 +03:00
Dirk-Willem van Gulik
f85ec2d896 Additional redwax modules - including comments from review on #75620. 2019-12-24 17:01:04 +01:00
Jörg Thalheim
b9bc38934b
h2o: build with openssl 
otherwise we get symbol conflicts, once we link it against applications using
openssl
 2019-12-21 22:55:58 +00:00
Izorkin
edddf0ac47 nginxModules.pinba: init at 13.05.2019 2019-12-11 10:06:55 +03:00
Frederik Rietdijk
f3618342ec Merge staging-next into staging 2019-12-10 19:01:27 +01:00
Renaud
f640cf49d1
rdf4store: remove pkg and service modules 
(#74214)
 2019-12-08 20:33:51 +01:00
Frederik Rietdijk
353ec3f3a8
Merge pull request #73491 from Izorkin/unit 
unit: 1.12.0 -> 1.13.0
 2019-12-05 10:25:54 +01:00
R. RyanTM
fffce07e96 jetty: 9.4.22.v20191022 -> 9.4.24.v20191120 (#74417) 
* jetty: 9.4.22.v20191022 -> 9.4.24.v20191120

* jetty: homepage over https
 2019-11-30 22:03:40 +01:00
Jörg Thalheim
571ed9d22e
nginx: reference tests 2019-11-29 12:27:55 +00:00
tekeri
a5f26644d4 Add nginx perl modules (#73198) 
* nginx: enable perl_module if perl is given

* nginx: move `perl = null` to toplevel
 2019-11-27 17:08:56 +00:00
Izorkin
d5f8c4b1d1 unit: update build configuration 2019-11-24 12:55:21 +03:00
Izorkin
6ae0c68216 unit: 1.12.0 -> 1.13.0 2019-11-24 12:46:36 +03:00
R. RyanTM
f28fad5e2f jetty: 9.4.16.v20190411 -> 9.4.22.v20191022 
(#72533)
 2019-11-06 19:30:58 +01:00
Aaron Andersen
0cad3f6734
Merge pull request #70365 from jglukasik/mod_tile 
apacheHttpdPackages.mod_tile: init at unstable-2017-01-08
 2019-11-05 20:45:55 -05:00
Joseph Lukasik
babd3f7747 apacheHttpdPackage.mod_tile: init at unstable-2017-01-08 2019-11-01 22:52:14 -07:00
R. RyanTM
43e64eb545 mod_wsgi: 4.6.7 -> 4.6.8 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mod_wsgi/versions
 2019-10-21 09:14:11 +02:00
Mario Rodas
86df0e335c tengine: 2.3.1 -> 2.3.2 (#70574) 
* tengine: 2.3.1 -> 2.3.2

Changelog: https://github.com/alibaba/tengine/releases/tag/2.3.2

* tengine: unbreak
 2019-10-15 22:00:09 +02:00
Renaud
dbf21775d4
Merge pull request #70527 from Izorkin/nginx-unit 
unit: 1.11.0 -> 1.12.0
 2019-10-09 13:58:44 +02:00
Linus Heckemann
5aa4b19946 treewide: mark some broken packages as broken 
Refs:
e6754980264fe927320d5ff2dbd24ca4fac9a160
1e9cc5b9844ef603fe160e9f671178f96200774f
793a2fe1e8bb886ca2096c5904e1193dc3268b6d
c19cf65261639f749012454932a532aa7c681e4b
f6544d618f30fae0bc4798c4387a8c7c9c047a7c
 2019-10-08 17:14:26 +02:00
Izorkin
1134fb45c0 unit: 1.11.0 -> 1.12.0 2019-10-06 15:33:03 +03:00
Ryan Mulligan
43be6a46a8
Merge pull request #69715 from r-ryantm/auto-update/openresty 
openresty: 1.15.8.1 -> 1.15.8.2
 2019-09-28 08:30:18 -07:00
R. RyanTM
8696c19bbb openresty: 1.15.8.1 -> 1.15.8.2 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openresty/versions
 2019-09-27 16:17:19 -07:00
Vladimír Čunát
eab41878ac
Merge branch 'master' into staging-next 2019-09-24 08:14:34 +02:00
Vladimír Čunát
22a216849b
Re-Revert "Merge branch 'staging-next'" 
This reverts commit f8a8fc6c7c.
 2019-09-22 09:38:09 +02:00
Izorkin
b397fbc0aa unit: 1.10.0 -> 1.11.0 2019-09-22 10:16:59 +03:00
Vladimír Čunát
f8a8fc6c7c
Revert "Merge branch 'staging-next'" 
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
 2019-09-21 20:05:09 +02:00
Vladimír Čunát
41af38f372
Merge branch 'staging-next' 2019-09-21 13:14:09 +02:00
Austin Seipp
889537352b
h2o: 2.2.6 -> 2.3.0-beta2, enable multi-output 
This also lets us remove a hack for supporting LibreSSL 2.7, since we're
now using 2.9 by default, anyway.

Finally, use Ninja to run the CMake build instead of Make -- speeds
things up for me by a few seconds.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2019-09-19 18:28:04 -05:00
Izorkin
329a88efa7 treewide: replace mysql.connector-c to libmysqlclient 2019-09-09 15:55:34 +03:00
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Frederik Rietdijk
5f4734b1dd Merge remote-tracking branch 'upstream/gcc-8' into staging-next 
Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
 2019-09-08 20:44:26 +02:00
Alyssa Ross
5262dd23b3 unit: drop withRuby_2_3 option 
Ruby 2.3 is EOL.
 2019-09-07 13:09:17 +00:00
Franz Pletz
de85797565
Merge remote-tracking branch 'origin/master' into gcc-8 2019-09-03 22:15:07 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk
5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
Frederik Rietdijk
98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
Peter Simons
79c6d22c1f mod_wsgi: allow building this module with python 2.x and 3.x 2019-08-27 14:27:31 +02:00
Robin Gloster
616b8343c4
Merge remote-tracking branch 'upstream/master' into gcc-8 2019-08-25 18:55:46 +02:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next 
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
 2019-08-24 08:55:37 +02:00
Izorkin
9332861720 unit: 1.9.0 -> 1.10.0 2019-08-23 10:03:00 +03:00
Robin Gloster
4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
Marek Mahut
f8892cb49c
Merge pull request #66890 from r-ryantm/auto-update/h2o 
h2o: 2.2.5 -> 2.2.6
 2019-08-19 11:51:02 +02:00
R. RyanTM
3ac9a51961 h2o: 2.2.5 -> 2.2.6 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/h2o/versions
 2019-08-19 02:10:02 -07:00
Aaron Andersen
23abcd5ee3 apacheHttpd: 2.4.39 -> 2.4.41 2019-08-18 17:40:26 -04:00
Marek Mahut
aff691af10
Merge pull request #65892 from r-ryantm/auto-update/couchdb 
couchdb2: 2.3.0 -> 2.3.1
 2019-08-18 16:28:41 +02:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Frederik Rietdijk
fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585) 
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
 2019-08-15 13:41:18 +01:00
Izorkin
83381bec9c nginxMainline: 1.17.2 -> 1.17.3 2019-08-13 21:31:57 +03:00
Izorkin
aec55db737 nginxStable: 1.16.0 -> 1.16.1 2019-08-13 21:30:08 +03:00
Marek Mahut
1b8da7d755 Adding python3Packages.requests as dependecy 2019-08-13 18:20:21 +02:00
Sander van der Burg
5f01a2586a
Merge pull request #50805 from r-ryantm/auto-update/axis2 
axis2: 1.6.4 -> 1.7.9
 2019-08-11 12:15:33 +02:00
Marek Mahut
0e679dd53e axis2: 1.7.8 -> 1.7.9 2019-08-10 10:24:53 +02:00
R. RyanTM
07a9c36ccf couchdb2: 2.3.0 -> 2.3.1 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/couchdb/versions
 2019-08-03 17:34:19 -07:00
Jörg Thalheim
8044f32219
Merge pull request #61816 from Izorkin/nginxMainline 
nginxMainline: 1.16.0 -> 1.17.2
 2019-07-25 10:01:59 +01:00
Izorkin
293e5d8365 nginxMainline: 1.16.0 -> 1.17.2 2019-07-24 21:09:22 +03:00
Nick Novitski
7136e0d0a6 bundlerUpdateScript: init and use (#64822) 2019-07-22 12:02:47 +00:00
Yorick van Pelt
a9baaf90f6
couchdb2: pin to erlangR21 2019-07-16 10:35:47 +02:00
Elis Hirwing
80c7463a92
php: drop 7.1 
PHP 7.1 is currently on life support, as in only recieving security related patches.

This will only continue until: 2019-12-01

This date are in the middle of the 19.09 lifecycle. So it would be
nice to not have it in the 19.09 stable release. Dropping it now would
also result in less maintanance in updating them.

The death dates can be seen on following links:
 - https://endoflife.date/php
 - https://php.net/supported-versions.php
 - https://en.wikipedia.org/wiki/PHP#Release_history
 2019-07-04 14:31:49 +02:00
Rok Garbas
65781e204d
Remove me (garbas) as maintainer since I don't have much time to maintain anything 2019-07-03 11:27:39 +02:00
R. RyanTM
5e4bbd8bee tengine: 2.3.0 -> 2.3.1 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tengine/versions
 2019-07-03 08:30:58 +02:00
R. RyanTM
3a28589551 mod_wsgi: 4.6.6 -> 4.6.7 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mod_wsgi/versions
 2019-07-02 20:10:49 +02:00
Johan Thomsen
1fd9ac6ff6 tomcat85: 8.5.35 -> 8.5.42 2019-06-21 15:52:24 +02:00
Johan Thomsen
e62883d5cf tomcat9: 9.0.13 -> 9.0.21 2019-06-21 15:40:02 +02:00
R. RyanTM
2779dd85e6 mod_wsgi: 4.6.5 -> 4.6.6 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mod_wsgi/versions
 2019-06-17 15:30:45 +02:00
Franz Pletz
c051374da2
nginx: fix build with gcc8 2019-06-17 07:06:02 +02:00
volth
f3282c8d1e treewide: remove unused variables (#63177) 
* treewide: remove unused variables

* making ofborg happy
 2019-06-16 19:59:05 +00:00
worldofpeace
132b013b9a
Merge pull request #62263 from Izorkin/nginx-unit 
unit: 1.8.0 -> 1.9.0
 2019-06-04 23:14:02 -04:00
R. RyanTM
7254994411 lighttpd: 1.4.53 -> 1.4.54 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lighttpd/versions
 2019-06-02 10:21:14 +02:00
Izorkin
aa8a11c1b3 unit: 1.8.0 -> 1.9.0 2019-05-30 22:57:45 +03:00
Izorkin
c9156695cc tengine: 2.2.3 -> 2.3.0 2019-05-27 00:21:57 +03:00
markuskowa
4dda834ee3
Merge pull request #61870 from r-ryantm/auto-update/openresty 
openresty: 1.13.6.2 -> 1.15.8.1
 2019-05-22 13:51:09 +02:00
R. RyanTM
03d2c7f8a7 openresty: 1.13.6.2 -> 1.15.8.1 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openresty/versions
 2019-05-22 02:17:37 -07:00
c0bw3b
582fd549fb winstone: drop package and service 
Close #56294
Upstream package is unmaintained for years
and nixpkgs provides alternatives
 2019-05-15 20:30:48 +02:00
Izorkin
872f056bb4 nginxModules.lua: 0.10.14 -> 0.10.15 2019-05-13 12:37:14 +03:00
Izorkin
fa3f68edab nginxModules.http_proxy_connect_module: 16.04.2019 -> 06.05.2019 2019-05-13 12:37:10 +03:00
Jörg Thalheim
0816c69173
nginxModules: update and add nginx modules (#59949) 
nginxModules: update and add nginx modules
 2019-05-13 10:15:09 +01:00
Andrew Newman
0b5a5c52d6 lighttpd: fix crosscompilation 2019-05-08 10:43:00 +03:00
R. RyanTM
8d55d7f64f jetty: 9.4.14.v20181114 -> 9.4.16.v20190411 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jetty/versions
 2019-05-01 11:10:54 +02:00
Izorkin
619aa5c97f nginxMainline: 1.15.12 -> 1.16.0 2019-04-30 07:56:29 +03:00
Izorkin
65a736064a nginxStable: 1.14.2 -> 1.16.0 2019-04-30 07:56:23 +03:00
Yurii Izorkin
5ba8811758 nginxMainline: 1.15.10 -> 1.15.12 (#59950) 2019-04-22 00:08:08 +02:00
Izorkin
452cf0b3e2 nginxModules.naxsi: init at 0.56 2019-04-21 11:10:49 +03:00
Izorkin
6600d00ed1 nginxModules.video-thumbextractor: init at 0.9.0 2019-04-21 10:32:46 +03:00