3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1236 commits

Author SHA1 Message Date
Aaron Andersen 90649bacfb apacheHttpdPackages.mod_auth_mellon: 0.13.1 -> 0.17.0 2021-03-04 14:57:28 -05:00
R. RyanTM d201c8631e apt-cacher-ng: 3.6 -> 3.6.1 2021-02-28 16:55:53 +00:00
Robert Schütz 54757b35c1 Merge branch 'staging-next' into staging 2021-02-26 10:56:17 +01:00
R. RyanTM 9c04b881b2 jetty: 9.4.36.v20210114 -> 9.4.37.v20210219 2021-02-24 02:43:25 +00:00
github-actions[bot] 2fd0f841be
Merge staging-next into staging 2021-02-22 00:37:55 +00:00
Fabian Affolter 3ba6124df7 darkhttpd: 1.12 -> 1.13 2021-02-21 18:15:49 +01:00
Ben Siraphob 127733211e
treewide: unzip buildInputs to nativeBuildInputs (#112302) 2021-02-20 16:01:53 -05:00
ajs124 4756b3c35c nginxMainline: 1.19.6 -> 1.19.7 2021-02-17 01:48:23 +01:00
Wael Nasreddine 2df97e4b0a
Merge pull request #111662 from nicknovitski/remove-ruby-2.5
Remove Ruby 2.5
2021-02-15 10:21:46 -08:00
R. RyanTM 73bb0589a5 apt-cacher-ng: 3.5 -> 3.6 2021-02-09 21:43:51 +00:00
Mario Rodas 7a158f9796
Merge pull request #111967 from r-ryantm/auto-update/lighttpd
lighttpd: 1.4.58 -> 1.4.59
2021-02-08 20:53:22 -05:00
Benjamin Hipple 14b6a84804
Merge pull request #108406 from zaninime/nginx-kaltura
nginx: add VOD-related modules from Kaltura
2021-02-08 17:02:09 -05:00
Benjamin Hipple 5f39471ad4
Merge pull request #111357 from lbpdt/feature/spnego-http-auth-nginx-module
nginxModules.spnego-http-auth-nginx-module: init at 16.04.2020
2021-02-08 12:30:49 -05:00
Louis Blin e7d7c51df3 nginxModules.spnego-http-auth-nginx-module: init at 16.04.2020 2021-02-08 14:07:40 +00:00
R. RyanTM 08fdd03217 lighttpd: 1.4.58 -> 1.4.59 2021-02-04 22:23:10 +00:00
Sandro 8a4a984fd5
Merge pull request #105439 from avdv/bazel_3.7.1 2021-02-04 20:15:45 +01:00
Claudio Bley 6d8c431eb0 bazel: 3.7.1 -> 3.7.2
* update sha256 for gvisor, tensorflow{,WithCuda}, bazel-watcher, bazel-remote
  and envoy
2021-02-03 10:44:07 +01:00
Nick Novitski c14b54d67b unit: remove withRuby_2_5 option 2021-02-02 10:50:03 -08:00
Sandro 4a1c41f124
Merge pull request #111410 from dotlambda/jetty-9.4.36.v20210114
jetty: 9.4.35.v20201120 -> 9.4.36.v20210114
2021-02-01 08:35:17 +01:00
Robert Schütz 4368be4851 jetty: 9.4.35.v20201120 -> 9.4.36.v20210114 2021-01-31 18:39:59 +01:00
R. RyanTM d41e69082a gitlab-pages: 1.30.0 -> 1.34.0 2021-01-29 20:32:47 +00:00
Pavol Rusnak a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
volth bc0d605cf1 treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
Pavol Rusnak 90f7338112
treewide: stdenv.lib -> lib 2021-01-24 01:49:49 +01:00
Ryan Mulligan f9d9227040
Merge pull request #110032 from r-ryantm/auto-update/lighttpd
lighttpd: 1.4.56 -> 1.4.58
2021-01-23 06:39:24 -08:00
zowoq 59b83c43e0 treewide: add final newline 2021-01-22 07:18:04 +10:00
R. RyanTM 058356f4ad lighttpd: 1.4.56 -> 1.4.58 2021-01-19 22:46:29 +00:00
adisbladis 6dfd1a2772
Merge pull request #108741 from lukegb/envoy
envoy: init at 1.16.2
2021-01-19 16:40:42 +01:00
Jonathan Ringer 9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Ben Siraphob badf51221d treewide: stdenv.lib -> lib 2021-01-16 17:58:11 +07:00
Ben Siraphob 8dd78bb4fb treewide: fix double quoted strings in meta.description 2021-01-16 11:29:30 +07:00
Ben Siraphob 872973d7d1 pkgs/servers: stdenv.lib -> lib 2021-01-15 14:24:03 +07:00
Luke Granger-Brown 6e684ca91e envoy: init at 1.16.2 2021-01-14 12:26:11 +00:00
Peter Hoeg a089d80e15 darkhttpd: drive-by cleanup 2021-01-14 12:11:49 +08:00
Profpatsch 4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Jan Tojnar dd72357155
Merge branch 'master' into staging-next 2021-01-10 23:24:33 +01:00
Dominik Xaver Hörl 25bef2d8f9 treewide: simplify pkgs.stdenv.lib -> pkgs.lib
The library does not depend on stdenv, that `stdenv` exposes `lib` is
an artifact of the ancient origins of nixpkgs.
2021-01-10 20:12:06 +01:00
Francesco Zanini 666cdb7dcc nginxModules.akamai-token-validate: init at 2020-06-26 2021-01-04 18:13:01 +01:00
Francesco Zanini f98c8b3d04 nginxModules.secure-token: init at 2020-08-28 2021-01-04 18:12:33 +01:00
Francesco Zanini 4872487cf4 nginxModules.vod: init at 2020-12-31 2021-01-04 18:11:51 +01:00
Ben Siraphob 3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
Aaron Andersen d72e29fe48 tomcat-native: 1.2.25 -> 1.2.26 2020-12-28 10:20:47 -05:00
Daniel Nagy f20d8091d4
apacheHttpd: passthru lua variables 2020-12-25 22:49:01 +01:00
ajs124 e2a3d3f559 nginx: add myself as maintainer 2020-12-17 19:58:07 +01:00
ajs124 fc3db0f443 nginx: 1.19.5 -> 1.19.6 2020-12-17 19:55:15 +01:00
R. RyanTM 34318b7c42 webhook: 2.7.0 -> 2.8.0 2020-12-08 09:12:54 +00:00
Markus S. Wamser ded8dc1c46 gatling: 0.15 -> 0.16, libowfat: drop patch for header location 2020-12-03 15:02:50 +01:00
R. RyanTM e1c319def2 lighttpd: 1.4.55 -> 1.4.56 2020-12-02 15:06:14 +00:00
Mario Rodas eaa41389fe
Merge pull request #105659 from r-ryantm/auto-update/gitlab-pages
gitlab-pages: 1.28.0 -> 1.30.0
2020-12-02 05:15:22 -05:00
Florian Klink e76e8cf22e openresty: 1.17.8 -> 1.19.3
Also, add a quick comment about what fixPatch does.
2020-12-02 09:08:02 +01:00
R. RyanTM 466daa42ad gitlab-pages: 1.28.0 -> 1.30.0 2020-12-02 06:44:21 +00:00
markuskowa b83e5dbc3c
Merge pull request #104363 from Izorkin/nginx-unit
unit: 1.20.0 -> 1.21.0
2020-11-29 00:32:35 +01:00
Mario Rodas 49bfd31410
Merge pull request #105211 from r-ryantm/auto-update/jetty
jetty: 9.4.34.v20201102 -> 9.4.35.v20201120
2020-11-28 10:21:15 -05:00
R. RyanTM 5df56b087d jetty: 9.4.34.v20201102 -> 9.4.35.v20201120 2020-11-28 05:54:25 +00:00
ajs124 db17db5318 nginx: 1.19.4 -> 1.19.5 2020-11-25 00:21:44 +01:00
Izorkin d78ef1f3b5
unit: 1.20.0 -> 1.21.0 2020-11-20 19:27:42 +03:00
Max Wilson ba4642eb6a update contact info 2020-11-18 12:00:31 -08:00
R. RyanTM d4da5f9d3d jetty: 9.4.31.v20200723 -> 9.4.34.v20201102 2020-11-13 18:09:23 +00:00
StigP 818f2dd7dd
Merge pull request #102240 from Izorkin/nginx-unit
unit: 1.19.0 -> 1.20.0
2020-11-02 16:04:54 +00:00
Mario Rodas b8c4e87021
Merge pull request #102312 from r-ryantm/auto-update/gitlab-pages
gitlab-pages: 1.21.0 -> 1.28.0
2020-11-01 21:28:22 -05:00
R. RyanTM f6863c9f5d gitlab-pages: 1.21.0 -> 1.28.0 2020-11-01 03:09:39 +00:00
Izorkin fb25f00cbb
unit: 1.19.0 -> 1.20.0 2020-10-31 18:50:24 +03:00
ajs124 91b55655ed nginxMainline: 1.19.3 -> 1.19.4 2020-10-27 20:05:34 +01:00
R. RyanTM ae76a7658d couchdb3: 3.1.0 -> 3.1.1 2020-10-22 09:25:10 +00:00
Ben Siraphob 683a87dbeb treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
Florian Klink a6fec75d04
Merge pull request #93426 from helsinki-systems/feat/gitlab-pages
nixos/gitlab: Support pages
2020-10-11 23:50:19 +02:00
WORLDofPEACE 7b5864db17 treewide: don't use spidermonkey attr 2020-10-09 16:50:48 -04:00
WORLDofPEACE b89c851737 Revert "couchdb: revert changes from 0da82de388a5214522262a3885080bad1c02fd1b"
This reverts commit 143650958c.
2020-10-09 16:50:48 -04:00
Peter Simons 143650958c couchdb: revert changes from 0da82de388
These changes break evaluation and they frankly don't look correct here.
2020-10-09 21:39:35 +02:00
Doron Behar 0da82de388 treewide: Use spidermonkey_68 explicitly
A fix for #100089 which caused ofborg eval errors on all PRs due to
usage of aliases in couchdb and mediatomb.
2020-10-09 20:47:45 +03:00
Janne Heß d85f50b71f
nixos/gitlab: Support pages
Fixes #84525
2020-09-01 12:08:36 +02:00
Jörg Thalheim 4c9ad3ca79
Merge branch 'master' into nginx-update 2020-08-24 13:42:11 +01:00
Aaron Andersen fd250d57bb
Merge pull request #79123 from aanderse/apachectl
nixos/httpd: remove impurity from /etc
2020-08-19 20:56:51 -04:00
Izorkin 5c70c5eeaa nginxModules: renamed module ngx_aws_auth to aws-auth 2020-08-17 10:42:54 +03:00
Izorkin 772f5d5401 nginxModules: rename source to module name 2020-08-17 10:42:04 +03:00
Izorkin 15b3330747 nginxModules.statsd: change mirror 2020-08-17 10:42:04 +03:00
Izorkin b5c1848625 nginxModules.upstream-check: 2018.08.12 -> 2019.11.03 2020-08-17 10:42:04 +03:00
Izorkin e40dd8d4b9 nginxModules.subsFilter: 2016.04.13 -> 2019.08.06 2020-08-17 10:42:04 +03:00
Izorkin d3fdff5cbf nginxModules.shibboleth: 2017.04.06 -> 2020.08.12 2020-08-17 10:42:03 +03:00
Izorkin fdc7f541cf nginxModules.push-stream: 0.5.4 -> 2020.05.03 2020-08-17 10:42:03 +03:00
Izorkin a27273294f nginxModules.pam: v1.5.1 -> v1.5.2 2020-08-17 10:42:03 +03:00
Izorkin cb62b1d1a8 nginxModules.opentracing: v0.7.0 -> v0.9.0 2020-08-17 10:42:03 +03:00
Izorkin b590894e58 nginxModules.naxsi: 0.56 -> 2020.08.15 2020-08-17 10:42:03 +03:00
Izorkin 9c588fce29 nginxModules.modsecurity-nginx: v1.0.0 -> v1.0.1 2020-08-17 10:42:03 +03:00
Izorkin 4460a3700b nginxModules.http_proxy_connect_module: 2019.05.06 -> 2020.07.24 2020-08-17 10:42:03 +03:00
Izorkin 36c95f331d nginxModules.cache-purge: 2.5 -> 2.5.1 2020-08-17 10:42:01 +03:00
Izorkin 980d487480 nginxModules.echo: v0.61 -> v0.62 2020-08-16 12:03:59 +03:00
Izorkin 42cde0d357 nginxModules.develkit: v0.3.1rc1 -> v0.3.1 2020-08-16 12:03:59 +03:00
Izorkin 4bc560d205 nginxModules.brotli: 2019.09.09 -> 2020.04.23 2020-08-16 12:03:50 +03:00
Izorkin c5d3a46c5f nginxMainline: 1.19.0 -> 1.19.2 2020-08-16 09:59:10 +03:00
Izorkin d56514c76a unit: 1.18.0 -> 1.19.0 2020-08-15 11:08:22 +03:00
Aaron Andersen 4fc4fe539b
Merge pull request #94910 from aanderse/apacheHttpd
apacheHttpd: 2.4.43 -> 2.4.46
2020-08-12 13:38:58 -04:00
Elis Hirwing 6be7d1c176
php: Drop PHP 7.2 support 2020-08-10 22:28:12 +02:00
Aaron Andersen 6302eb2bfb apacheHttpd: 2.4.43 -> 2.4.46 2020-08-07 20:56:34 -04:00
R. RyanTM c5564e176a jetty: 9.4.29.v20200521 -> 9.4.31.v20200723 2020-08-07 00:09:20 -07:00
R. RyanTM ff6c463748 hiawatha: 10.9 -> 10.11 2020-08-05 23:07:30 +02:00
R. RyanTM 62a44f8efa pshs: 0.3.3 -> 0.3.4 2020-07-12 11:42:29 +00:00
Michael Raskin 132ace5fe6
Merge pull request #89344 from JJJollyjim/openresty-no-perl
openresty: disable perl module by default
2020-06-20 18:45:44 +00:00
Jamie McClymont dca001e923 nginx: change how the perl module is configured
Previously, http_perl_module was disabled by overriding perl=null -- this means
it is impossible to disable http_perl_module in openresty, since openresty
requires perl for its configure scripts.
2020-06-20 14:22:34 +12:00
R. RyanTM 778ffb0334 webhook: 2.6.8 -> 2.7.0 2020-06-17 11:53:57 -07:00
Patrick Hilhorst b133532434 treewide: remove some trailing whitespace to please ofborg 2020-10-02 09:01:35 -07:00
Patrick Hilhorst f7e390e6d4 treewide: fix redirected urls (run 3)
Related:
 - 9fc5e7e473
 - 593e11fd94
 - 508ae42a0f

Since the last time I ran this script, the Repology API changed, so I had to
adapt the script used in the previous PR. The new API should be more robust, so
overall this is a positive (no more grepping the error messages for our relevant
data but just a nice json structure).

Here's the new script I used:

```sh
curl https://repology.org/api/v1/repository/nix_unstable/problems \
   | jq -r '.[] | select(.type == "homepage_permanent_https_redirect") | .data | "s@\(.url)@\(.target)@"' \
   | sort | uniq | tee script.sed
find -name '*.nix' | xargs -P4 -- sed -f script.sed -i
```

I will also add this script to `maintainers/scripts`.
2020-10-02 09:01:35 -07:00
ajs124 3b8220c74c nginxMainline: 1.19.2 -> 1.19.3 2020-09-30 20:18:47 +02:00
Jörg Thalheim 00bf6abad1
Merge pull request #97516 from Izorkin/nginx-modules 2020-09-15 08:34:21 +02:00
Aaron Andersen cc34aad0d7 tomcat-native: 1.2.24 -> 1.2.25 2020-09-13 20:29:06 -04:00
Izorkin 79906c4908
nginxModules.aws-auth: fix warning message 2020-09-12 16:26:08 +03:00
Izorkin 96311ca1c3
nginxModules.shibboleth: 2020.08.12 -> 2020.09.04 2020-09-12 16:26:08 +03:00
Izorkin 6f32af17e9
nginxModules.opentracing: v0.9.0 -> v0.10.0 2020-09-12 16:26:08 +03:00
Izorkin 9092c6140f
nginxModules.naxsi: 2020.08.15 -> 2020.09.10 2020-09-12 16:26:07 +03:00
Anderson Torres bbafcaa9c6
Merge pull request #97078 from bbigras/openresty
openresty: 1.15.8.3 -> 1.17.8.2
2020-09-11 13:35:13 -03:00
Damien Cassou 607f5a6755
Merge pull request #84246 from lostnet/couchdbpr
couchdb: add support for version 3.0.0
2020-09-11 17:47:47 +02:00
Will Young 0ef1be0aa1 couchdb: add support for version 3.1.0 2020-09-11 14:03:16 +02:00
Bruno Bigras aca8ce740b openresty: 1.15.8.3 -> 1.17.8.2 2020-09-04 00:38:04 -04:00
Stig Palmquist 5aef482f61 perl: 5.30.3 -> 5.32.0, perldevel: 5.32.0-RC0 -> 5.33.1
Co-authored-by: volth <volth@volth.com>
2020-08-30 20:21:26 +02:00
Doron Behar 01d4e2fe33 treewide: use ffmpeg_3 explicitly if not wanted otherwise
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that
used `ffmpeg` without requiring a specific version now use ffmpeg_3
explicitly so they shouldn't change.
2020-06-12 11:55:31 -07:00
Jörg Thalheim 3a46981e3c
Merge pull request #89241 from Izorkin/nginx-update
nginxMainline: 1.18.0 -> 1.19.0
2020-06-06 13:19:43 +01:00
Jamie McClymont 85760026a0 openresty: make compatible with nixos nginx module 2020-06-02 17:00:09 +12:00
Florian Klink 8ae5866152
Merge pull request #89224 from etu/fix-unit-php-extensions
unit: Expose PHP expressions used so it can easily be accessed for configs
2020-05-31 16:05:30 +02:00
Izorkin 70b11a0f50 nginxMainline: 1.18.0 -> 1.19.0 2020-05-31 09:46:48 +03:00
Elis Hirwing a4bf2cc166
unit: Expose PHP expressions used so it can easily be accessed for configs 2020-05-30 18:52:41 +02:00
Izorkin ea956bb53b unit: 1.17.0 -> 1.18.0 2020-05-30 19:28:25 +03:00
R. RyanTM c13c38c75a jetty: 9.4.26.v20200117 -> 9.4.29.v20200521 2020-05-25 23:49:59 +00:00
ajs124 deadc23034 nginxModules.fancyindex: 0.4.3 -> 0.4.4 2020-05-13 13:23:20 +02:00
Izorkin aa12fb8adb nginxModules: add option allowMemoryWriteExecute
The allowMemoryWriteExecute option is required to checking enabled nginxModules
and disable the nginx sandbox mode MemoryDenyWriteExecute.
2020-05-12 20:03:29 +03:00
Jörg Thalheim 11c18faa4e
Merge pull request #85862 from Izorkin/nginx-paths 2020-05-11 11:17:04 +01:00
Jörg Thalheim 887295fd2d
treewide: remove the-kenny from maintainers
@the-kenny did a good job in the past and is set as maintainer in many package,
however since 2017-2018 he stopped contributing. To create less confusion
in pull requests when people try to request his feedback, I removed him as
maintainer from all packages.
2020-05-09 10:28:57 +01:00
Martin Weinelt 1c7ad58742
apt-cacher-ng: 3.2 → 3.5
Fixes: CVE-2017-7443, CVE-2020-5202
2020-05-06 19:09:31 +02:00
Izorkin ca2145bdfc nixos/tests: add unit-php test 2020-05-06 13:21:59 +03:00
Izorkin dc0260f7da unit: add php 7.4 2020-05-06 12:27:13 +03:00
Izorkin 866f6dd677 unit: 1.16.0 -> 1.17.0 2020-05-06 12:27:12 +03:00
Izorkin f87bc13930 unit: remove drop capabilites patch 2020-05-06 12:27:12 +03:00
Izorkin 98e0cba469 tengine: change logs path 2020-05-04 16:36:38 +03:00
Izorkin 1d71150c73 tengine: add ETag patch 2020-05-04 16:36:38 +03:00
Izorkin a19800fb48 nginx: change logs path 2020-05-04 16:36:38 +03:00
Aaron Andersen 9218a3599a tomcat-native: 1.2.23 -> 1.2.24 2020-05-03 20:49:02 -04:00
R. RyanTM bc74bdedae jetty: 9.4.25.v20191220 -> 9.4.26.v20200117 2020-05-02 10:15:25 +02:00
Elis Hirwing 27b9b7b3af
Merge pull request #85026 from talyz/php_buildenv_override
php.buildEnv: Make the exported php package overridable, improve handling of currently enabled extensions, etc
2020-04-29 19:57:37 +02:00
talyz 5cad1b4aff
php: Get rid of the phpXXbase attributes, update docs
Since the introduction of php.unwrapped there's no real need for the
phpXXbase attributes, so let's remove them to lessen potential
confusion and clutter. Also update the docs to make it clear how to
get hold of an unwrapped PHP if needed.
2020-04-29 13:45:48 +02:00
Aaron Andersen 92d9d07c61
Merge pull request #82762 from aanderse/tomcat-native
tomcat-native: init at 1.2.23
2020-04-26 19:48:22 -04:00
talyz 72636bc2f6
php: Get rid of all config.php parameters
Since all options controlled by the config.php parameters can now be
overridden directly, there's no reason to keep them around.
2020-04-26 16:43:23 +02:00
Aaron Andersen 6b3506458e tomcat-native: init at 1.2.23 2020-04-26 09:12:41 -04:00
Izorkin cbfe203da7 nginxMainline: 1.17.9 -> 1.18.0 2020-04-23 14:34:21 +03:00
Izorkin 2e6cd807d7 nginxStable: 1.16.1 -> 1.18.0 2020-04-23 14:34:13 +03:00
Jan Tojnar 3d8e436917
Merge branch 'master' into staging-next 2020-04-16 10:09:43 +02:00
Maximilian Bosch 401e07d419
Merge pull request #84551 from gnprice/pr-stripDebugList
treewide: Fix types of stripDebugList attrs (and fix doc)
2020-04-14 15:54:52 +02:00
Jan Tojnar a04625379a
Merge branch 'master' into staging-next 2020-04-13 18:50:35 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Jan Tojnar 1ab03c3a76
Merge branch 'master' into staging-next 2020-04-10 12:12:56 +02:00
Milan 3847ec0e35
nginxMainline: 1.17.8 -> 1.17.9 (#84743) 2020-04-08 21:19:35 +02:00
Samuel Leathers 72cb7f81fd
Merge pull request #81442 from manveru/bundler-2.1.4
bundler: 1.17.3 -> 2.1.4
2020-04-08 12:44:54 -04:00
talyz 472d5c187b
php.buildEnv: Don't inherit dev from the original php
mkDerivation uses the dev output in buildInputs if it exits, hence the
php-with-extensions package was never built or put into the path of
packages dependent on it during build. With this fix, the php packages
built with buildEnv or withExtensions don't have any dev outputs;
packages which need the dev output can refer to the phpXXbase packages
instead.
2020-04-08 15:13:07 +02:00
Greg Price 7547cf9dfc treewide: Fix up stripDebugList attrs to be lists.
The documentation says this should be a list, and it already is in
about half the expressions that set it.

The difference doesn't matter at present, because these values are all
space-free literals.  But it will in a future with __structuredAttrs .

(The similar attr stripAllList has no users in the nixpkgs tree, so
there's nothing to do to fix any of those up.)
2020-04-06 21:26:52 -07:00
Michael Fellinger f92600b406
update versions in Gemfile.lock 2020-04-06 15:02:13 +02:00
Frederik Rietdijk 2420184727 Merge staging into staging-next 2020-04-06 08:54:28 +02:00
Elis Hirwing 3b6539896b
Merge pull request #83896 from etu/slim-down-default-php-v3
PHP: Make the default package more sane [v3]
2020-04-05 20:00:03 +02:00
Aaron Andersen d757d810d0
Merge pull request #84045 from r-ryantm/auto-update/apache-httpd
apacheHttpd: 2.4.41 -> 2.4.43
2020-04-04 19:22:17 -04:00
Elis Hirwing a5f77d6ea2
php-unit: Drop the declaration of the php-unit attributes since they aren't used 2020-04-03 10:11:11 +02:00
R. RyanTM f26b2afb93 apacheHttpd: 2.4.41 -> 2.4.43 2020-04-01 22:33:24 +00:00
Elis Hirwing 1983417a2f
unit: Make unit use phpbase packages 2020-03-31 22:06:56 +02:00
Frederik Rietdijk 46ec52f329 buildPython*: use pname 2020-03-30 17:07:41 +02:00
aszlig e1d63ada02
nginx: Fix ETag patch to ignore realpath(3) error
While our ETag patch works pretty fine if it comes to serving data off
store paths, it unfortunately broke something that might be a bit more
common, namely when using regexes to extract path components of
location directives for example.

Recently, @devhell has reported a bug with a nginx location directive
like this:

  location ~^/\~([a-z0-9_]+)(/.*)?$" {
    alias /home/$1/public_html$2;
  }

While this might look harmless at first glance, it does however cause
issues with our ETag patch. The alias directive gets broken up by nginx
like this:

  *2 http script copy: "/home/"
  *2 http script capture: "foo"
  *2 http script copy: "/public_html/"
  *2 http script capture: "bar.txt"

In our patch however, we use realpath(3) to get the canonicalised path
from ngx_http_core_loc_conf_s.root, which returns the *configured* value
from the root or alias directive. So in the example above, realpath(3)
boils down to the following syscalls:

  lstat("/home", {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0
  lstat("/home/$1", 0x7ffd08da6f60) = -1 ENOENT (No such file or directory)

During my review[1] of the initial patch, I didn't actually notice that
what we're doing here is returning NGX_ERROR if the realpath(3) call
fails, which in turn causes an HTTP 500 error.

Since our patch actually made the canonicalisation (and thus additional
syscalls) necessary, we really shouldn't introduce an additional error
so let's - at least for now - silently skip return value if realpath(3)
has failed.

However since we're using the unaltered root from the config we have
another issue, consider this root:

  /nix/store/...-abcde/$1

Calling realpath(3) on this path will fail (except if there's a file
called "$1" of course), so even this fix is not enough because it
results in the ETag not being set to the store path hash.

While this is very ugly and we should fix this very soon, it's not as
serious as getting HTTP 500 errors for serving static files.

I added a small NixOS VM test, which uses the example above as a
regression test.

It seems that my memory is failing these days, since apparently I *knew*
about this issue since digging for existing issues in nixpkgs, I found
this similar pull request which I even reviewed:

https://github.com/NixOS/nixpkgs/pull/66532

However, since the comments weren't addressed and the author hasn't
responded to the pull request, I decided to keep this very commit and do
a follow-up pull request.

[1]: https://github.com/NixOS/nixpkgs/pull/48337

Signed-off-by: aszlig <aszlig@nix.build>
Reported-by: @devhell
Acked-by: @7c6f434c
Acked-by: @yorickvP
Merges: https://github.com/NixOS/nixpkgs/pull/80671
Fixes: https://github.com/NixOS/nixpkgs/pull/66532
2020-03-28 02:57:21 +01:00
Emily 7be86f3b3c openresty: 1.15.8.2 -> 1.15.8.3 2020-03-24 11:37:44 -05:00
Aaron Andersen 6283b00f4f
Merge pull request #82319 from aanderse/tomcat-update
tomcat: 7.0.92 -> 7.0.100, 8.5.42 -> 8.5.51, 9.0.21 -> 9.0.31
2020-03-16 15:46:48 -04:00
R. RyanTM 79586e1b74 tomcat_connectors: 1.2.46 -> 1.2.48 2020-03-14 14:30:51 +01:00
Mario Rodas 34914fce19
Merge pull request #82290 from helsinki-systems/upd/ngx_fastcgi_cache_purge
nginxModules.fastcgi-cache-purge: 2.3 -> 2.5
2020-03-13 08:44:44 -05:00
Izorkin 5dbe01af5b unit: 1.15.0 -> 1.16.0 2020-03-12 19:53:13 +00:00
Aaron Andersen 46e7580f24 tomcat9: 9.0.21 -> 9.0.31 2020-03-11 07:51:04 -04:00
Aaron Andersen 22f24f7859 tomcat8: 8.5.42 -> 8.5.51 2020-03-11 07:51:04 -04:00
Aaron Andersen 78b0222cb2 tomcat7: 7.0.92 -> 7.0.100 2020-03-11 07:51:04 -04:00
ajs124 0aec2cdd08 nginxModules.fastcgi-cache-purge: 2.3 -> 2.5
switch to a fork that seems sort of alive
2020-03-10 23:35:15 +01:00
Aaron Andersen fc7efd51d6
Merge pull request #80182 from dirkx/Redwax-0.22-update
redwax-modules: 0.2.1 -> 0.2.2/0.2.3
2020-02-22 19:03:21 -05:00
Dirk-Willem van Gulik 928c365a1b redwax-modules: 0.2.1 -> 0.2.2/0.2.3 2020-02-21 12:00:00 +01:00
R. RyanTM 56debabe34 mod_wsgi: 4.7.0 -> 4.7.1 2020-02-19 08:54:38 +00:00
Frederik Rietdijk 1a6c3cb06b Merge staging into staging-next 2020-02-11 07:59:53 +01:00
zimbatm bcdc90a3a7 ruby_2_4: remove
According to https://endoflife.software/programming-languages/server-side-scripting/ruby
ruby 2.4 will go end-of-life in march, where the new release of nixpkgs
will be cut. We won't be able to support it for security updates.

Remove all references to ruby_2_4 and add ruby_2_7 instead where
missing.

Mark packages that depend on ruby 2.4 as broken:
* chefdk
* sonic-pi
2020-02-10 13:23:35 -05:00
R. RyanTM 3815de80c0 unit: 1.14.0 -> 1.15.0 2020-02-10 14:47:35 +00:00
Frederik Rietdijk 03755ed59a Merge master into staging-next 2020-02-09 09:17:51 +01:00
R. RyanTM fa84aa8adb lighttpd: 1.4.54 -> 1.4.55 2020-02-08 18:13:10 +01:00
Vladimír Čunát 48a997cd76
Merge #66528: glibc: 2.27 -> 2.30 (into staging)
Includes update of stdenv bootstap tools (for three main platforms)
and many package fixes with new glibc.
2020-02-05 13:41:09 +01:00
Emily 6d046e1079 openresty: rebase on top of nginx package
The primary motivation of this change was to allow third-party modules
to be used with OpenResty, but it also results in a significant
reduction of code duplication.
2020-02-04 19:30:40 -06:00
Emily db3182a65d nginxModules.brotli: v0.1.2 -> unstable
The fork was merged back upstream but has yet to see a formal release.
2020-02-04 19:30:40 -06:00
Will Dietz 500f032729
Merge pull request #78185 from dtzWill/update/nginx-1.17.8
nginxMainline: 1.17.3 -> 1.17.8
2020-02-03 17:35:42 -06:00
Aaron Andersen e23ba2a1b0 Revert "nixos/httpd: symlink apache configuration to /etc/httpd/httpd.conf for use in the apachectl command"
This reverts commit 336a6f471f.
2020-02-02 08:08:02 -05:00
Maximilian Bosch 1bb18d9e8d
lwan: 0.2 -> 0.3, fix build w/glibc-2.30 2020-02-01 17:30:18 +01:00
Silvan Mosberger 80a2740991
Merge pull request #78265 from Synthetica9/https-homepages
treewide: fix redirected urls
2020-01-27 15:00:53 +01:00
Patrick Hilhorst 593e11fd94
treewide: fix redirected urls
According to https://repology.org/repository/nix_unstable/problems, we have a
lot of packages that have http links that redirect to https as their homepage.
This commit updates all these packages to use the https links as their
homepage.

The following script was used to make these updates:

```

curl https://repology.org/api/v1/repository/nix_unstable/problems \
    | jq '.[] | .problem' -r \
    | rg 'Homepage link "(.+)" is a permanent redirect to "(.+)" and should be updated' --replace 's@$1@$2@' \
    | sort | uniq > script.sed

find -name '*.nix' | xargs -P4 -- sed -f script.sed -i
```
2020-01-22 11:26:22 +01:00
R. RyanTM 359f235769 jetty: 9.4.24.v20191120 -> 9.4.25.v20191220 2020-01-21 16:06:08 -08:00
Will Dietz 92d29418b3
nginxMainline: 1.17.3 -> 1.17.8
http://nginx.org/en/CHANGES
2020-01-21 11:02:11 -06:00
Jörg Thalheim 71c19d3efa
Merge pull request #76537 from Izorkin/unit
unit: 1.13.0 -> 1.14.0
2020-01-21 11:39:41 +00:00
Leonhard Markert 8008905e5a lwan: 0.1 -> 0.2 2020-01-16 16:55:07 +00:00
Aaron Andersen 7260d2eb13
Merge pull request #77326 from aanderse/apacheHttpd
nixos/httpd: symlink apache configuration to /etc/httpd/httpd.conf for use in the apachectl command
2020-01-15 21:02:05 -05:00
Mario Rodas c7e16e71d0
Merge pull request #77011 from r-ryantm/auto-update/mod_wsgi
mod_wsgi: 4.6.8 -> 4.7.0
2020-01-09 05:34:03 -05:00
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