Commit Graph

1804 Commits

Author SHA1 Message Date
Rick van Schijndel
ba75066821
Merge pull request #271362 from pbsds/rm-dead-patches
treewide: remove unreferenced patch files
2023-12-06 03:28:15 +01:00
Stéphan Kochen
2a4c0e2f12 couchdb3: 3.3.2 -> 3.3.3 2023-12-05 21:56:08 +01:00
Robert Scott
ed972a40b2 router: add CVE-2023-45812 to knownVulnerabilities 2023-12-03 22:45:31 +00:00
Kristoffer Søholm
6c19bd6631 nginxModules.zstd: 0.1.0 -> 0.1.1 2023-12-01 21:06:38 +01:00
Peder Bergebakken Sundt
f41aba3739 treewide: remove unreferenced patch files
Found with `fd \\.patch$ pkgs/ -x bash -c 'rg -F "{/}" pkgs/ -q || echo {}'`
2023-12-01 06:11:20 +01:00
Mario Rodas
15b5295311
Merge pull request #270847 from anthonyroussel/updates/tomcat_10_1_16
tomcat10: 10.1.15 -> 10.1.16
2023-11-30 22:38:23 -05:00
ajs124
7b6580dba4 maintainers/teams: init and add helsinki-systems 2023-11-30 19:11:08 +01:00
Luke Granger-Brown
02eb145f86
Merge pull request #270404 from r-ryantm/auto-update/pomerium
pomerium: 0.23.0 -> 0.24.0
2023-11-29 18:54:40 +00:00
Anthony Roussel
c9aee562c1
tomcat: sync meta.platforms with jre 2023-11-29 07:54:46 +01:00
Anthony Roussel
d525015c8e
tomcat: refactor 2023-11-29 07:53:17 +01:00
Anthony Roussel
e24c29c9cc
tomcat9,tomcat10: rename sha256 to hash 2023-11-29 07:47:03 +01:00
Anthony Roussel
36e481f7c8
tomcat10: 10.1.15 -> 10.1.16
https://tomcat.apache.org/tomcat-10.1-doc/changelog.html#Tomcat_10.1.16_(schultz)
2023-11-29 07:46:17 +01:00
Anthony Roussel
1c32875fb3
tomcat9: 9.0.82 -> 9.0.83 2023-11-29 07:45:58 +01:00
figsoda
2f062cf3fa dufs: 0.37.1 -> 0.38.0
Diff: https://github.com/sigoden/dufs/compare/v0.37.1...v0.38.0

Changelog: https://github.com/sigoden/dufs/blob/v0.38.0/CHANGELOG.md
2023-11-28 19:34:39 -05:00
R. Ryantm
82b61410d8 pomerium: 0.23.0 -> 0.24.0 2023-11-27 11:58:50 +00:00
Ryan Lahfa
c78465609d
Merge pull request #268231 from wegank/nginx-darwin 2023-11-19 16:10:18 +01:00
Mario Rodas
d3deaacfb4
Merge pull request #263550 from anthonyroussel/updates/axis2
axis2: 1.7.9 -> 1.8.2, tomcat10: 10.0.27 -> 10.1.15, tomcat9: 9.0.75 -> 9.0.82
2023-11-19 09:39:19 -05:00
Weijia Wang
add7a091c6 nginx: fix build on darwin 2023-11-18 17:01:10 +01:00
Ryan Lahfa
5dcbaf3cc3
Merge pull request #264361 from RaitoBezarius/drop-ruby3 2023-11-17 18:43:35 +01:00
Raito Bezarius
0a1bc8a2d2 unit: drop Ruby 3.0 support
Ruby 3.0 will be removed from nixpkgs.
2023-11-17 16:03:00 +01:00
github-actions[bot]
dba5c9ef4e
Merge master into staging-next 2023-11-16 18:01:17 +00:00
Pol Dellaiera
3acc2484cf
Merge pull request #267560 from anthonyroussel/bugfix/plantuml-server-nixos
nixos/plantuml-server: fix
2023-11-16 18:32:44 +01:00
Vladimír Čunát
0fe5300699
Merge branch 'master' into staging-next 2023-11-16 09:49:24 +01:00
figsoda
176378f961
Merge pull request #266401 from r-ryantm/auto-update/dufs
dufs: 0.36.0 -> 0.37.1
2023-11-15 22:58:32 -05:00
Anthony Roussel
252d793e79
jetty_11,jetty_12: add anthonyroussel to maintainers 2023-11-15 15:14:28 +01:00
Anthony Roussel
c7d414ef38
jetty_11,jetty_12: init 2023-11-15 15:14:25 +01:00
Anthony Roussel
4d77d2a63f
jetty: 12.0.2 -> 12.0.3 2023-11-15 15:12:57 +01:00
Anthony Roussel
acd3c673a2
jetty: fix meta.homepage 2023-11-15 15:12:57 +01:00
github-actions[bot]
5f5513224f
Merge staging-next into staging 2023-11-11 00:02:47 +00:00
github-actions[bot]
912311b7fd
Merge master into staging-next 2023-11-11 00:02:21 +00:00
Alyssa Ross
e3e57b8f18 lib.systems: elaborate Rust metadata
We need this stuff to be available in lib so make-derivation.nix can
access it to construct the Meson cross file.

This has a couple of other advantages:

 - It makes Rust less special.  Now figuring out what Rust calls a
   platform is the same as figuring out what Linux or QEMU call it.

 - We can unify the schema used to define Rust targets, and the schema
   used to access those values later.  Just like you can set "config"
   or "system" in a platform definition, and then access those same
   keys on the elaborated platform, you can now set "rustcTarget" in
   your crossSystem, and then access "stdenv.hostPlatform.rustcTarget"
   in your code.

"rustcTarget", "rustcTargetSpec", "cargoShortTarget", and
"cargoEnvVarTarget" have the "rustc" and "cargo" prefixes because
these are not exposed to code by the compiler, and are not
standardized.  The arch/os/etc. variables are all named to match the
forms in the Rust target spec JSON.

The new rust.target-family only takes a list, since we don't need to
worry about backwards compatibility when that name is used.

The old APIs are all still functional with no warning for now, so that
it's possible for external code to use a single API on both 23.05 and
23.11.  We can introduce the warnings once 23.05 is EOL, and make them
hard errors when 23.11 is EOL.
2023-11-09 10:02:24 +01:00
R. Ryantm
2e51d19483 dufs: 0.36.0 -> 0.37.1 2023-11-09 06:51:16 +00:00
Anthony Roussel
e5ae8202f7
tomcat{9,10}: add anthonyroussel to maintainers 2023-11-07 11:38:55 +01:00
Anthony Roussel
9489fc779e
axis2: add anthonyroussel to maintainers 2023-11-07 11:38:34 +01:00
Anthony Roussel
a4f37c8896
tomcat{9,10}: add passthru.tests.version 2023-11-07 11:35:45 +01:00
Anthony Roussel
0031faaeca
tomcat10: 10.0.27 -> 10.1.15
https://tomcat.apache.org/tomcat-10.1-doc/changelog.html
2023-11-07 11:35:45 +01:00
Anthony Roussel
3655470d18
tomcat9: 9.0.75 -> 9.0.82
https://tomcat.apache.org/tomcat-9.0-doc/changelog.html
2023-11-07 11:35:39 +01:00
Anthony Roussel
6b6bc55a6f
nixosTests.tomcat: test Apache Axis2 container integration 2023-11-07 11:35:38 +01:00
Anthony Roussel
789fe864db
axis2: add meta.changelog 2023-11-07 11:35:37 +01:00
Anthony Roussel
5b146274ae
axis2: 1.7.9 -> 1.8.2
https://github.com/apache/axis-axis2-java-core/compare/v1.7.9...v1.8.2
2023-11-07 11:35:37 +01:00
Yongun Seong
dda958b638
apt-cacher-ng: fix build for glibc >= 2.38 2023-11-07 18:42:23 +09:00
Weijia Wang
9627659c22 Merge branch 'master' into staging-next 2023-11-04 17:27:09 +01:00
R. Ryantm
09575c6c9c tengine: 3.0.0 -> 3.1.0 2023-11-04 08:54:34 -07:00
github-actions[bot]
677e25fcd2
Merge master into staging-next 2023-11-02 12:01:08 +00:00
R. Ryantm
686a5fca36 lighttpd: 1.4.72 -> 1.4.73 2023-11-02 07:13:40 +01:00
github-actions[bot]
81270bbdcf
Merge master into staging-next 2023-10-31 18:01:02 +00:00
Artturi
2d3a5c7ddb
Merge pull request #262254 from Artturin/nginxsandboxrem 2023-10-31 18:39:55 +02:00
github-actions[bot]
571f1df5e4
Merge master into staging-next 2023-10-29 12:00:57 +00:00
Uri Baghin
48da240fc5
Merge pull request #262238 from avdv/bazel-6.4
bazel_6: 6.3.2 -> 6.4.0
2023-10-29 17:39:50 +08:00
Claudio Bley
7fa6816c0c envoy: Update hash after bazel_6 upgrade 2023-10-29 08:30:50 +01:00
github-actions[bot]
52b6b90243
Merge master into staging-next 2023-10-28 18:00:57 +00:00
Martin Weinelt
e4f4ef7ce8
Merge pull request #263793 from fleaz/update_nginx-videothumb
nginxModules.videothumb-extractor: unstable -> 1.0.0 and switch to ffmpeg-headless
2023-10-28 17:46:01 +02:00
Martin Weinelt
7286245d4a
Merge pull request #263644 from fleaz/update_nginx-vod
nginxModules.vod: 1.31 -> 1.32 and patch MAX_CLIPS
2023-10-28 17:45:37 +02:00
Robert Scott
8beb9b5a60
Merge pull request #262736 from LeSuisse/jetty-12.0.2
jetty: 12.0.1 -> 12.0.2
2023-10-28 13:31:45 +01:00
fleaz
55e29313dc
nginxModules: Switch from ffmpeg to ffmpeg-headless 2023-10-27 16:05:30 +02:00
fleaz
87338f90d4
nginxModules.video-thumbextractor: 92b8064 -> 1.0.0
Diff:
92b8064...e81f850
2023-10-27 16:05:29 +02:00
fleaz
f2efd2e9bc
nginxModules.vod: Patch MAX_CLIPS variable
The old limit was only 128 and this breaks some applications like e.g.
Frigate where playlists become bigger than that. According to upstream
you should just change the variable yourself if needed.

See this issue: https://github.com/kaltura/nginx-vod-module/issues/238
2023-10-26 23:21:32 +02:00
fleaz
30c49cdd91
nginxModules.vod: 1.31 -> 1.32
Changelog: https://github.com/kaltura/nginx-vod-module/compare/1.31...1.32
2023-10-26 23:20:08 +02:00
Vladimír Čunát
d811555465
Merge branch 'staging' into staging-next 2023-10-26 10:36:50 +02:00
poscat
0c50d6ec92
nginxModules.{lua,lua-upstream}: switch to luajit_openresty 2023-10-26 10:12:37 +08:00
Robert Scott
28a94c48ed
Merge pull request #262718 from LeSuisse/trafficserver-9.2.3
trafficserver: 9.2.2 -> 9.2.3
2023-10-25 19:24:21 +01:00
Maximilian Bosch
4df6cc87b5
Merge pull request #263304 from trofi/nginxMainline-update
nginxMainline: 1.25.2 -> 1.25.3
2023-10-25 19:15:31 +02:00
Sergei Trofimovich
4ca546d75e nginxMainline: 1.25.2 -> 1.25.3
Changes: https://nginx.org/en/CHANGES
2023-10-25 09:58:14 +01:00
Mario Rodas
10fad9387a
Merge pull request #257336 from trofi/nginxModules.http_proxy_connect_module-update
nginxModules.http_proxy_connect_module_v{24,25}: new modules for up t…
2023-10-23 18:35:50 -05:00
github-actions[bot]
9f5438ccdf
Merge staging-next into staging 2023-10-23 06:01:38 +00:00
Artturin
d3234553aa nixosTests.nginx-sandbox: remove broken test and move the sandboxing test to the openresty test
nginx lua needs resty

the enableSandbox option of nginx was removed in 535896671b

the test fails with

```
vm-test-run-nginx-sandbox> machine # [   47.753580] nginx[1142]: nginx: [alert] detected a LuaJIT version which is not OpenResty's; many optimizations will be disabled and performance will be compromised (see https://github.com/openresty/luajit2 for OpenResty's LuaJIT or, even better, consider using the OpenResty releases from https://openresty.org/en/download.html)
vm-test-run-nginx-sandbox> machine # [   47.756064] nginx[1142]: nginx: [alert] failed to load the 'resty.core' module (https://github.com/openresty/lua-resty-core); ensure you are using an OpenResty release from https://openresty.org/en/download.html (reason: module 'resty.core' not found:
vm-test-run-nginx-sandbox> machine # [   57.911766] systemd[1]: Failed to start Nginx Web Server.
```
2023-10-23 06:09:45 +03:00
OTABI Tomoya
6c09e05bef
Merge pull request #262613 from r-ryantm/auto-update/unit
unit: 1.31.0 -> 1.31.1
2023-10-23 11:03:26 +09:00
Thomas Gerbet
1fd6d6120b jetty: 12.0.1 -> 12.0.2
Fixes CVE-2023-44487.

https://github.com/jetty/jetty.project/releases/tag/jetty-12.0.2
2023-10-22 14:33:45 +02:00
Thomas Gerbet
a37eccb3fe trafficserver: 9.2.2 -> 9.2.3
Fixes CVE-2023-39456, CVE-2023-41752 and CVE-2023-44487.

Changelog:
https://raw.githubusercontent.com/apache/trafficserver/9.2.x/CHANGELOG-9.2.3
2023-10-22 12:51:30 +02:00
github-actions[bot]
09fabcdc4e
Merge staging-next into staging 2023-10-22 00:03:08 +00:00
Ryan Lahfa
76d4d2e76b
Merge pull request #262329 from SuperSandro2000/nginx-zstd-0-1-0 2023-10-22 00:59:19 +01:00
R. Ryantm
17e227a87d unit: 1.31.0 -> 1.31.1 2023-10-21 21:21:57 +00:00
github-actions[bot]
f4afba2014
Merge staging-next into staging 2023-10-21 18:01:53 +00:00
Ryan Lahfa
c5442c247f
Merge pull request #257262 from dongcarl/2023-09-nginx-fixes
nixos/nginx: Allow empty port for listen directive (for unix socket)
2023-10-21 17:26:57 +01:00
R. Ryantm
faa428aa71 tomcat-native: 2.0.5 -> 2.0.6 2023-10-21 03:05:46 +00:00
github-actions[bot]
613d60266a
Merge staging-next into staging 2023-10-21 00:02:49 +00:00
Bjørn Forsman
57f0dd3a2f lighttpd: re-enable remaining disabled tests
All tests work now.
2023-10-20 23:45:29 +02:00
Bjørn Forsman
c531697bc3 lighttpd: 1.4.71 -> 1.4.72
The patch to disable legacy crypt tests (which were broken for us) isn't
needed anymore, so remove it.
2023-10-20 23:45:29 +02:00
Aaron Andersen
c0d5048961
Merge pull request #262075 from ivan/apachehttpd-2.4.58
apacheHttpd: 2.4.57 -> 2.4.58
2023-10-20 17:33:01 -04:00
Sandro Jäckel
479739b03e
nginxModules.zstd: 25d88c262be47462cf90015ee7ebf6317b6848f9 -> 0.1.0 2023-10-20 18:03:37 +02:00
github-actions[bot]
b0ec8bbe1d
Merge staging-next into staging 2023-10-20 12:01:55 +00:00
Artturi
9c30003e04
Merge pull request #258652 from trofi/nginx-install-manpages 2023-10-20 12:37:26 +03:00
Ivan Kozik
f2254da826 apacheHttpd: 2.4.57 -> 2.4.58 2023-10-19 14:11:56 +00:00
github-actions[bot]
97d0182583
Merge staging-next into staging 2023-10-17 06:01:51 +00:00
Stanisław Pitucha
b48bbeab52 go-camo: migrate to by-name 2023-10-17 14:56:01 +11:00
github-actions[bot]
fbd39f6b6b
Merge staging-next into staging 2023-10-14 06:01:29 +00:00
Luke Granger-Brown
732fd4e0dd envoy: 1.26.4 -> 1.27.1 2023-10-13 23:17:11 +00:00
github-actions[bot]
0cf0d9af7e
Merge staging-next into staging 2023-10-10 18:01:26 +00:00
R. Ryantm
7e549d52e4 jetty: 11.0.16 -> 12.0.1 2023-10-10 10:58:55 +00:00
Carl Dong
e5c2c71280 nixos/nginx: Allow empty port for listen directive
When listening on unix sockets, it doesn't make sense to specify a port
for nginx's listen directive.

Since nginx defaults to port 80 when the port isn't specified (but the
address is), we can change the default for the option to null as well
without changing any behaviour.
2023-10-09 21:16:03 -04:00
Sergei Trofimovich
c814bbda40 nginx: add missing nginx.8 manpage
Without the change "man nginx" does not render any synopsis.

Closes: https://github.com/NixOS/nixpkgs/issues/258658
2023-10-08 08:07:19 +01:00
github-actions[bot]
ebeb6fb7f6
Merge staging-next into staging 2023-10-06 18:01:42 +00:00
ajs124
0b48455b2d
Merge pull request #256103 from WilliButz/update/nginxModules.njs/0.8.1
nginxModules.njs: 0.7.10 -> 0.8.1
2023-10-06 14:01:50 +02:00
github-actions[bot]
7017e013bf
Merge staging-next into staging 2023-10-05 12:02:16 +00:00
Anderson Torres
492414af5f treewide: remove cstrahan from meta.maintainers - part 1
All the packages here are now orphaned.
2023-10-04 22:20:58 -03:00
Maximilian Bosch
8bc5104a6e
treewide: refactor .attrs.sh detection
When specifying the `builder` attribute in `stdenv.mkDerivation`, this
will be effectively transformed into

    builtins.derivation {
      builder = stdenv.shell;
      args = [ "-e" builder ];
    }

This also means that `default-builder.sh` is never sourced and as a
result it's not guaranteed that `$NIX_ATTRS_SH_FILE` is set to a correct
location[1].

Also, we need to source `.attrs.sh` to source `$stdenv`. So, the
following is done now:

* If `$NIX_ATTRS_SH_FILE` points to a correct location, then use it.
  Directly using `.attrs.sh` is problematic for `nix-shell(1)` usage
  (see previous commit for more context), so prefer the environment
  variable if possible.

* Otherwise, if `.attrs.sh` exists, then use it. See [1] for when this
  can happen.

* If neither applies, it can be assumed that `__structuredAttrs` is
  turned off and thus nothing needs to be done.

[1] It's possible that it doesn't exist at all - in case of Nix 2.3 or
    it can point to a wrong location on older Nix versions with a bug in
    `__structuredAttrs`.
2023-10-04 18:36:57 +02:00
Fabian Affolter
4984613adb
Merge pull request #251812 from LeSuisse/licenses-elv2
lib/licenses: add Elastic License 2.0, drop Elastic License
2023-10-02 22:11:16 +02:00
Mario Rodas
a26f11d236 dufs: install completions 2023-10-01 04:20:00 +00:00
R. Ryantm
ef3e6b6e87 tomcat-native: 1.2.31 -> 2.0.5 2023-09-28 21:35:37 +00:00
Sergei Trofimovich
c8a23dd807 nginxModules.http_proxy_connect_module_v{18,19}: drop old broken modules
THe modules are failing assertions when are built against `nginx`
versions in `nixpkgs`.
2023-09-27 18:56:06 +01:00