Commit Graph

55 Commits

Author SHA1 Message Date
Martin Weinelt
881a5eba9f openresty: fix nginx path in resty script
Fixes: #383002
2026-06-28 03:54:03 +02:00
Martin Weinelt
b09918a07d openresty: wrap restydoc with groff
Fixes: #416400
2026-06-28 03:47:25 +02:00
Martin Weinelt
ad3a0656fb openresty: include nginx-variants test in passthru.tests 2026-06-28 03:35:13 +02:00
Martin Weinelt
e9f2aca3d1 openresty: 1.27.1.2 -> 1.31.1.1
https://openresty.org/en/changelog-1031001.html (1.31.x)
https://openresty.org/en/changelog-1029002.html (1.29.x)

Fixes:
CVE-2026-1642
CVE-2026-9256
CVE-2026-27651
CVE-2026-27654
CVE-2026-27784
CVE-2026-28753
CVE-2026-28755
CVE-2026-32647
CVE-2026-40460
CVE-2026-40701
CVE-2026-42934
CVE-2026-42945
CVE-2026-42946
2026-06-28 03:35:12 +02:00
Martin Weinelt
05f57a7e9c openresty: add update script 2026-06-28 03:01:17 +02:00
Rylan Polster
ad73c80d33 openresty: fix lib.optional misuse in configureFlags 2026-05-12 18:00:44 -04:00
NAHO
c8d4dabc43 pkgs: remove optional builtins prefixes from prelude functions
Remove optional builtins prefixes from prelude functions by running:

    builtins=(
      abort
      baseNameOf
      break
      derivation
      derivationStrict
      dirOf
      false
      fetchGit
      fetchMercurial
      fetchTarball
      fetchTree
      fromTOML
      import
      isNull
      map
      null
      placeholder
      removeAttrs
      scopedImport
      throw
      toString
      true
    )

    fd \
      --type file \
      . \
      pkgs \
      --exec-batch sed --in-place --regexp-extended "
        s/\<builtins\.($(
          printf '%s\n' "${builtins[@]}" |
            paste --delimiter '|' --serial -
        ))\>/\1/g
      "

    nix fmt
2025-10-04 19:02:37 +02:00
liberodark
c15e3f9d81 openresty: 1.27.1.1 -> 1.27.1.2 2025-04-29 11:18:45 +02:00
Wolfgang Walther
88dfade94b postgresql: replace pg_config with custom script
By replacing upstream's pg_config binary with a shell script, we:
- gain the ability to run pg_config easily when cross-compiling,
- can remove the fake pg_config in the default output,
- can remove the pg_config wrapper script dealing with special cases.

Some 20 years ago, pg_config *was* a shell script upstream, too. It was
changed to a binary, when it was made "relocatable", so it would return
paths depending on the location of the "postgres" binary. However, this
is exactly the thing that just hurts us in nixpkgs - we don't want those
paths to change, we want them to always point at the right outputs. By
writing the script ourselves, this becomes a lot less painful.

This approach means more lines of codes, but all of them are dead simple
and we have a lot less complexity overall.

Additionally, pg_config is now made a separate derivation, only exposed
as "postgresql.pg_config". This has the nice side-effect, that all users
of postgresql and libpq in nixpkgs must be very *explicit* about their
dependency on pg_config. This gives a lot more visibility into the state
of affairs regarding pkg-config support for libpq, which ultimately is
the much better solution.
2025-03-21 18:05:38 +01:00
Martin Weinelt
909803a20e Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/by-name/au/automatic-timezoned/package.nix
- pkgs/by-name/da/darklua/package.nix
- pkgs/by-name/ki/kittycad-kcl-lsp/package.nix
- pkgs/by-name/li/limbo/package.nix
- pkgs/by-name/mi/minijinja/package.nix
- pkgs/by-name/pa/pay-respects/package.nix
- pkgs/by-name/ri/river-bsp-layout/package.nix
- pkgs/by-name/sv/svgbob/package.nix
- pkgs/by-name/tu/tui-journal/package.nix
- pkgs/by-name/wa/waypipe/package.nix
- pkgs/development/python-modules/zxcvbn-rs-py/default.nix
2025-01-29 16:08:53 +01:00
Wolfgang Walther
1c6126f709 various: replace substituteAll with replaceVars
A few more interesting cases, separated from the big treewide for better
visibility and testing.
2025-01-26 17:18:59 +01:00
Wolfgang Walther
546ece569b libpq: init at 17.2
Resolves #61580
2025-01-19 12:49:21 +01:00
Silvan Mosberger
667d42c00d treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.

Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.

A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.

This commit was automatically created and can be verified using

    nix-build a08b3a4d19.tar.gz \
      --argstr baseRev 57b193d8dd
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:27:17 +01:00
Silvan Mosberger
4f0dadbf38 treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.

Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.

A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.

This commit was automatically created and can be verified using

    nix-build a08b3a4d19.tar.gz \
      --argstr baseRev b32a094368
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:26:33 +01:00
Christoph Heiss
cb29290646 openresty: make postgres module optional
Enables users who don't need it to easily disable it. Defaults to on to
not regress any users.

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
2024-12-06 15:00:24 +01:00
Elliot Cameron
84a3cd9361 openresty: 1.25.3.2 -> 1.27.1.1 2024-11-18 16:51:30 -05:00
Robert Scott
382e49fddf openresty: 1.25.3.1 -> 1.25.3.2
addressing CVE-2024-39702
2024-08-26 13:10:51 +01:00
Sandro
aae713a4ae Merge pull request #280223 from lblasc/openresty
openresty: 1.21.4.3 -> 1.25.3.1
2024-06-26 19:35:21 +02:00
Emily
4b1d39d935 treewide: remove myself from packages I don’t use
I’ve had an extended absence from Nix work and no longer actively
use a bunch of packages I used to maintain, so remove myself as a
maintainer from things I can’t usefully review/test changes for
as I ease back into things. This does unfortunately leave a few
packages orphaned (`stm32loader`, `tinyprog`, `python3Packages.fx2`,
and `python3Packages.jsonmerge`).
2024-06-15 16:53:23 +01:00
Alexis Hildebrandt
755b915a15 treewide: Remove indefinite article from meta.description
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"[Aa]n?' pkgs \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Aa]n? (.)/\1\U\2/'
2024-06-09 23:07:45 +02:00
Luka Blaskovic
d4ebb89ef0 openresty: 1.21.4.3 -> 1.25.3.1 2024-01-11 09:06:46 +00:00
Konstantin Alekseev
23a4b38ac8 openresty: 1.21.4.1 -> 1.21.4.3 2024-01-01 09:48:41 +02:00
Izorkin
00cb53de4f nginx: fix nginx binary pathname 2023-12-17 16:51:29 +03:00
Sandro Jäckel
7f2d5f369c openresty: 1.19.9 -> 1.21.4 2022-12-19 08:38:48 +01:00
Bruno Bigras
feb47656e4 nixos/tests/openresty-lua: test openresty with lua
related to #140655
2021-10-14 07:01:56 -04:00
Naïm Favier
e41b098f16 openresty: 1.19.3.2 -> 1.19.9.1
https://openresty.org/en/changelog-1019009.html
2021-09-27 14:08:21 +02: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
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
Bruno Bigras
aca8ce740b openresty: 1.15.8.3 -> 1.17.8.2 2020-09-04 00:38:04 -04:00
Jamie McClymont
85760026a0 openresty: make compatible with nixos nginx module 2020-06-02 17:00:09 +12:00
Izorkin
a19800fb48 nginx: change logs path 2020-05-04 16:36:38 +03:00
Michael Reilly
84cf00f980 treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Emily
7be86f3b3c openresty: 1.15.8.2 -> 1.15.8.3 2020-03-24 11:37:44 -05: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
Robin Gloster
313da176d3 treewide: NIX_*_FLAGS -> string 2019-12-31 00:16:46 +01: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
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
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
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
R. RyanTM
f2849abd7e openresty: 1.13.6.1 -> 1.13.6.2 (#40648)
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.

These checks were done:

- built on NixOS
- /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/opm passed the binary check.
- /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/md2pod.pl passed the binary check.
- Warning: no invocation of /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/nginx-xml2pod had a zero exit code or showed the expected version
- /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/resty passed the binary check.
- /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/restydoc passed the binary check.
- Warning: no invocation of /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/restydoc-index had a zero exit code or showed the expected version
- /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/openresty passed the binary check.
- /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/luajit-openresty passed the binary check.
- /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/nginx passed the binary check.
- 7 of 9 passed binary check by having a zero exit code.
- 2 of 9 passed binary check by having the new version present in output.
- found 1.13.6.2 with grep in /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2
- directory tree listing: https://gist.github.com/3d4adc0eb55d63d7e2b269541039384b
- du listing: https://gist.github.com/f8dd4bb690e9b8615ede14c9f250f9f7
2018-05-17 22:08:26 +02:00
Luka Blašković
75d4499e69 openresty: 1.9.3.1 -> 1.13.6.1 (#36289) 2018-03-04 19:52:32 +00:00
Vladimír Čunát
38313d5d87 libxml2,libxslt: split into multiple outputs
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
2015-10-05 13:44:16 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Austin Seipp
4068869d62 nixpkgs: openresty 1.7.10.1 -> 1.9.3.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-08-31 03:18:13 -05:00
Vladimír Čunát
3b9ef2c71b fix "libc}/lib" and similar references
Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
2015-05-05 11:52:08 +02:00
Austin Seipp
2c4a005549 nixpkgs: openresty 1.7.7.1 -> 1.7.10.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-12 11:35:37 -05:00
Domen Kožar
9b7b2ce8eb Revert "Introduce patchShebangsPhase ran in preConfigurePhases"
This reverts commit 512fbb280f.

See #5368
2015-01-08 10:26:49 +01:00
Domen Kožar
512fbb280f Introduce patchShebangsPhase ran in preConfigurePhases
(cherry picked from commit 91c7e8747af1fdc2a70cd98594ccbb12a5c6902d)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-01-02 02:58:32 +01:00
Austin Seipp
5eba046b5d nixpkgs: openresty 1.7.4.1rc2 -> 1.7.7.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-27 12:43:52 -06:00