Commit Graph

1194 Commits

Author SHA1 Message Date
github-actions[bot]
382fdc7ad3
Merge master into staging-next 2021-07-18 00:01:24 +00:00
Felix Buehler
82cb33a0ae treewide: remove meta.version 2021-07-18 00:07:38 +02:00
github-actions[bot]
d6b748b2b3
Merge master into staging-next 2021-07-17 18:00:56 +00:00
Thomas Gerbet
2dbdca1aa4 openresty: 1.19.3.1 -> 1.19.3.2
Fixes CVE-2021-23017.

https://openresty.org/en/ann-1019003002.html
2021-07-17 10:33:10 +02:00
github-actions[bot]
266cb48e65
Merge master into staging-next 2021-07-12 18:01:03 +00:00
R. RyanTM
9ee9cd1e37 jetty: 9.4.41.v20210516 -> 9.4.43.v20210629 2021-07-10 01:40:14 +00:00
github-actions[bot]
30ff0457a4
Merge master into staging-next 2021-07-09 12:01:24 +00:00
Sandro
87af92267a
Merge pull request #129694 from helsinki-systems/upd/nginx
nginxMainline: 1.21.0 -> 1.21.1
2021-07-09 12:43:37 +02:00
ajs124
95805c3240 nginxQuic: 1fec68e322d0 -> 5b0c229ba5fe 2021-07-08 23:44:27 +02:00
ajs124
b50102b719 nginxMainline: 1.21.0 -> 1.21.1 2021-07-08 23:41:30 +02:00
Martin Weinelt
eb5659f4c2
Merge pull request #126962 from stigtsp/package/perl-5.34.0 2021-07-06 16:03:48 +02:00
Thomas Gerbet
d41e86c67f trafficserver: 9.0.1 -> 9.0.2
Fixes CVE-2021-32566 and CVE-2021-32567.
2021-07-05 15:16:06 +02:00
Mario Rodas
5606e90f87
Merge pull request #127030 from r-ryantm/auto-update/gitlab-pages
gitlab-pages: 1.39.0 -> 1.40.0
2021-07-03 08:27:30 -05:00
Luke Granger-Brown
7d281f26d3 pomerium: 0.14.4 -> 0.14.7 2021-06-30 01:44:30 +00:00
Alvar Penning
3690ae13a4 nginxModules.rtmp: 1.2.1 -> 1.2.2
This new release fixes segfaults,
https://github.com/arut/nginx-rtmp-module/compare/v1.2.1...v1.2.2
2021-06-21 20:04:10 +02:00
Aaron Andersen
c802ded7fc tomcat9: remove danbst as maintainer 2021-06-16 22:07:30 -04:00
Aaron Andersen
fa60c16dfc tomcat8: drop package 2021-06-16 22:07:30 -04:00
Aaron Andersen
b6ce336775 tomcat7: drop package 2021-06-16 22:05:28 -04:00
Aaron Andersen
d2080550e3 tomcat10: init at 10.0.6 2021-06-16 22:05:28 -04:00
Aaron Andersen
40ab59df39 tomcat-native: 1.2.28 -> 1.2.30 2021-06-16 22:02:06 -04:00
Aaron Andersen
120dfe6217 tomcat9: 9.0.31 -> 9.0.46 2021-06-16 22:02:06 -04:00
Stig Palmquist
2a1fcf89fc unit: add perl534 as default, remove perl530 2021-06-16 17:14:00 +02:00
R. RyanTM
c8d210f7a3 gitlab-pages: 1.39.0 -> 1.40.0 2021-06-16 03:00:26 +00:00
Maciej Krüger
07864c64aa
nginxQuic: 12f18e0bca09 -> 1fec68e322d0 2021-06-11 16:16:21 +02:00
Alyssa Ross
b7abce543a apacheHttpd: 2.4.47 -> 2.4.48 2021-06-10 20:41:27 +00:00
Alyssa Ross
4de8cbfb16 bmake.passthru.setupHook: set some defaults
These are all read from the environment by the default bmake
stdlib (e.g. <bsd.prog.mk>, <bsd.own.mk>).  Some of the default
values (like building cat pages instead of man pages, or stripping
binaries when installing) don't really make sense for Nixpkgs, so we
override them here for every build using bmake.

Eventually I'd like to unify the bmake setupHook and the NetBSD make
setupHook, but not today.
2021-06-09 12:44:43 +00:00
Luke Granger-Brown
137fcc6cf0 pomerium: 0.13.3 -> 0.14.4 2021-06-07 20:59:01 +00:00
Luke Granger-Brown
00e54055e1 envoy: 1.16.2 -> 1.17.3 2021-06-07 20:58:56 +00:00
Elis Hirwing
c76bebc549
unit: Add php80 and use it as default 2021-06-04 09:27:07 +02:00
Elis Hirwing
68eb5305ac
php: Drop PHP 7.3 support
PHP 7.3 won't be supported by upstream for the entire life cycle of
the 21.11 release.

Also drop the pcre' alias since it isn't needed anymore since we don't
need different pcre versions anymore.
2021-06-04 09:26:54 +02:00
ajs124
b6e6f1dddd
Merge pull request #125194 from Izorkin/update-unit
unit: 1.22.0 -> 1.24.0
2021-06-01 23:27:06 +02:00
Luke Granger-Brown
93e08b2e47
Merge pull request #124210 from liclac/bozohttpd
bozohttpd: init
2021-06-01 22:23:38 +01:00
Izorkin
79a477b1c6
unit: 1.22.0 -> 1.24.0 2021-06-01 13:29:20 +03:00
embr
a75c0a7f87 bozohttpd: experimental darwin compat patch
As far as I can tell, libSystem on darwin provides a libm compatibility
symlink, but not a libcrypt one.

Prior art (eg. CPython) appears to use `stdenv.isDarwin` as a proxy for
`stdenv.hostPlatform.libc == "libSystem"`, but the latter also works in
cases where we're building on Darwin, but with eg. musl for some reason.
2021-05-31 11:03:17 +02:00
embr
ee4b583ae8 bozohttpd: minor formatting
The Nix style guide isn't exactly comprehensive, but this at least seems
slightly closer to the examples:

https://nixos.org/manual/nixpkgs/stable/#sec-syntax

I'm annoyed that nixpkgs-fmt as of writing won't accept:

  COPTS = [
    # ...
  ] ++ optional (...) "..."
    ++ optional (...) "...";

...which seems to be the actual convention, looking at eg. pkgs.nginx.
2021-05-31 10:47:49 +02:00
embr
f4f05481e3 bozohttpd: add bozohttpd-minimal target 2021-05-26 11:38:57 +02:00
embr
dc9165346e bozohttpd: resolve warnings, serve >2GB files on 32bit host
-D_DEFAULT_SOURCE *and* -D_GNU_SOURCE together resolve all warnings
about implicitly defined functions.

-D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 enable gcc's Large File
Extensions to allow a 32-bit host to serve files larger than 2GB.

Based on what Makefile.boot does, for platforms without bmake:
http://cvsweb.netbsd.org/bsdweb.cgi/src/libexec/httpd/Makefile.boot
2021-05-26 11:21:01 +02:00
Ryan Mulligan
abe9683e5b
Merge pull request #123563 from r-ryantm/auto-update/jetty
jetty: 9.4.39.v20210325 -> 9.4.41.v20210516
2021-05-25 12:55:11 -07:00
Izorkin
0a7feef809
nginxMainline: 1.20.0 -> 1.21.0 2021-05-25 19:54:05 +03:00
Izorkin
919dd5497a
nginxStable: 1.20.0 -> 1.20.1 2021-05-25 19:53:58 +03:00
embr
77acedc33b bozohttpd: remove unnecessary checkFlags 2021-05-24 13:35:38 +02:00
embr
28508dce6a bozohttpd: use bmake flags instead of a custom installPhase 2021-05-24 13:35:09 +02:00
embr
caaee8a55e bozohttpd: init 2021-05-24 00:41:45 +02:00
Samuel Ainsworth
02c595ebdb
Prefer pname and version in mkDerivations instead of name (#123438)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Co-authored-by: nixpkgs-review <nixpkgs-review@example.com>
2021-05-23 17:07:31 +02:00
Mario Rodas
96d42f122f
Merge pull request #123248 from r-ryantm/auto-update/gitlab-pages
gitlab-pages: 1.38.0 -> 1.39.0
2021-05-19 05:00:10 -05:00
R. RyanTM
8bfc237eb3 jetty: 9.4.39.v20210325 -> 9.4.41.v20210516 2021-05-18 18:36:30 +00:00
Ben Siraphob
c5a669d3f7 treewide: remove unzip where not needed 2021-05-16 19:29:28 -07:00
github-actions[bot]
8c6d819143
Merge master into staging-next 2021-05-16 18:32:41 +00:00
midchildan
2b7ed5deef
trafficserver: remove joaquinito2051 as maintainer
This reverts commit da69e884b8.
2021-05-17 00:42:57 +09:00
R. RyanTM
d36d679838 gitlab-pages: 1.38.0 -> 1.39.0 2021-05-16 14:29:35 +00:00