117 Commits

Author SHA1 Message Date
Elliot Speck (arcayr)
5e29ff9df3 apache2: 2.4.66 -> 2.4.67
fixes cve-2026-23918
2026-05-06 14:34:15 +10:00
Marcin Serwin
99e6d1bfbb maintainers: drop lovek323
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
2026-02-24 23:43:50 +01:00
Stefan Frijters
887559386d apacheHttpd: move NIX_LDFLAGS into env for structuredAttrs 2026-02-03 12:58:36 +01:00
Ihar Hrachyshka
567e8dfd8e treewide: clean up 'meta = with' pattern
This commit was created by a combination of scripts and tools:
- an ast-grep script to prefix things in meta with `lib.`,
- a modified nixf-diagnose / nixf combination to remove unused `with
lib;`, and
- regular nixfmt.

Co-authored-by: Wolfgang Walther <walther@technowledgy.de>
2025-12-10 18:09:49 +01:00
Leona Maroni
edaa6c4e92 apacheHttpd: 2.4.65 -> 2.4.66
fixes
- CVE-2025-55753
- CVE-2025-58098
- CVE-2025-59775
- CVE-2025-65082
- CVE-2025-66200
2025-12-04 17:49:52 +01:00
Vladimír Čunát
38638f66c2 apacheHttpd: 2.6.62 -> 2.6.65 (#424369) 2025-08-08 09:29:17 +02:00
Wolfgang Walther
5a0711127c treewide: run nixfmt 1.0.0 2025-07-24 13:55:40 +02:00
Thomas Gerbet
29b0c59178 apacheHttpd: 2.6.62 -> 2.6.65
Fixes CVE-2025-53020, CVE-2025-49812, CVE-2025-49630, CVE-2025-23048, CVE-2024-47252,
CVE-2024-43204 and CVE-2024-42516.

https://dlcdn.apache.org/httpd/CHANGES_2.4.64
https://dlcdn.apache.org/httpd/CHANGES_2.4.65
2025-07-24 08:27:11 +02:00
Silvan Mosberger
374e6bcc40 treewide: Format all Nix files
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:

  nix-build ci -A fmt.check

This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).

This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).

Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase).

If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
2025-04-01 20:10:43 +02:00
Lucas Savva
229640ed3a nixos/tests/acme: Refactor test suite
Split tests up based on certain use cases:

- http01-builtin: Tests most functionality of the core module, such
 as the systemd and hashing components, whilst utilising lego's built
 in http01 resolution mechanis.
- dns01: Tests only that DNS01 renewal works as expected.
- nginx: Tests nginx compatability
- httpd: Tests httpd compatability
- caddy: Tests caddy compatability
2025-02-22 23:58:29 +00:00
Colin
0d6139a4bb apacheHttpd: fix shebangs in cross-compiled apxs output
apxs is a tool run at build time (hence why it's in the .dev output),
so perl needs to be in nativeBuildInputs for patchShebangs to give the
right shebang.
2024-12-05 12:40:42 +00:00
Thomas Gerbet
b5dea63a56 apacheHttpd: remove support for mod_tls
It has been removed upstream and is now managed independently.

988f449632
2024-11-30 15:20:40 +01:00
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Nick Cao
d2b1a6d012 apacheHttpd_2_4: fix cross compilation 2024-08-25 08:45:32 -04:00
Randy Eckenrode
2c36ff7a18 apacheHttpdPackages.apacheHttpd: fix build after libxml2 update
Apache requires zlib, which was previously but no longer propagated by libxml2.
2024-07-21 13:47:16 -04:00
Aaron Andersen
eaea4f8046 apacheHttpd: 2.4.61 -> 2.4.62 2024-07-17 15:57:32 -04:00
Aaron Andersen
ceb93ad2ff apacheHttpd: 2.4.59 -> 2.4.61 2024-07-03 12:19:50 -04:00
Thomas Gerbet
331f875bde apacheHttpd: 2.4.58 -> 2.4.59
Fixes CVE-2024-27316, CVE-2024-27316 and CVE-2023-38709

Changes:
https://downloads.apache.org/httpd/CHANGES_2.4.59
2024-04-04 21:11:38 +02:00
Jan Tojnar
4ac483c74e apacheHttpd: Fix build with libxml2 2.12 2023-12-24 14:03:18 +01:00
Ivan Kozik
f2254da826 apacheHttpd: 2.4.57 -> 2.4.58 2023-10-19 14:11:56 +00:00
Thomas Gerbet
abdd388fa8 rustls-ffi: 0.9.2 -> 0.10.0
Changelog:
https://github.com/rustls/rustls-ffi/releases/tag/v0.10.0
2023-07-13 22:39:54 +02:00
R. Ryantm
342ff3209c apacheHttpd: 2.4.56 -> 2.4.57 2023-04-29 07:43:39 +00:00
Sandro
5332b2b4d3 Merge pull request #213168 from LeSuisse/rustls-ffi-init
rustls-ffi: init at 0.9.2 and make possible to build Apache mod_tls with it
2023-03-31 11:25:24 +02:00
Thomas Gerbet
ce5b2e3773 apacheHttpd: add option to build experimental mod_tls
https://httpd.apache.org/docs/2.4/mod/mod_tls.html

Note: the attribute has been named `modTlsSupport` instead of
`tlsSupport` to try to limit the confusion with the existing
`sslSupport` attribute.
2023-03-28 18:00:35 +02:00
Thomas Gerbet
5475dfc18d apacheHttpd: 2.4.55 -> 2.4.56
Fixes CVE-2023-27522 and CVE-2023-25690.

https://downloads.apache.org/httpd/CHANGES_2.4.56
2023-03-25 11:55:59 +01:00
Thomas Gerbet
3470711e51 apacheHttpd: 2.4.54 -> 2.4.55
Fixes CVE-2022-37436, CVE-2022-36766 and CVE-2006-20001

https://downloads.apache.org/httpd/CHANGES_2.4.55
2023-01-24 23:39:56 +01:00
Franz Pletz
3028beca39 apacheHttpd: fix build with libxcrypt 2022-10-09 18:09:42 +02:00
Fabian Affolter
35c7173cf5 apacheHttpd: 2.4.53 -> 2.4.54
https://downloads.apache.org/httpd/CHANGES_2.4.54

Fixes: CVE-2022-31813, CVE-2022-30556, CVE-2022-30522, CVE-2022-29404,
CVE-2022-28615, CVE-2022-28614, CVE-2022-28330, CVE-2022-26377
2022-06-10 16:09:45 +02:00
Martin Weinelt
6bf3336975 apacheHttpd: 2.4.52 -> 2.4.53
https://downloads.apache.org/httpd/CHANGES_2.4.53

Migrating to pcre2 was recommended in the release notes, since pcre 8.x
is over 20 years old and has now reached its end of life.

Fixes: CVE-2022-23943, CVE-2022-22721, CVE-2022-22720, CVE-2022-22719
2022-03-14 13:26:41 +01:00
R. Ryantm
78700df942 apacheHttpd: 2.4.51 -> 2.4.52 2021-12-31 16:55:05 +00:00
Sandro
b964655a7d Merge pull request #141047 from risicle/ris-apache-httpd-more-passthru-tests 2021-11-16 17:05:35 +01:00
Peter Simons
476635afe1 Drop myself from meta.maintainers for most packages.
I'd like to reduce the number of Github notifications and
review requests I receive.
2021-10-14 11:01:27 +02:00
Robert Scott
a2c0536894 apacheHttpd: add proxy and php nixos tests to passthru.tests 2021-10-09 01:14:28 +01:00
Aaron Andersen
7381e553a5 apacheHttpd: 2.4.50 -> 2.4.51 2021-10-08 07:41:49 -04:00
Sandro Jäckel
4732298890 apache: cleanup, remove ? null, remove extra lib., remove let in, update homepage 2021-10-05 17:31:40 +02:00
Aaron Andersen
b17c155720 apacheHttpd: 2.4.49 -> 2.4.50 2021-10-05 07:26:52 -04:00
Aaron Andersen
0518560cf1 apacheHttpd: 2.4.48 -> 2.4.49 2021-09-16 09:12:44 -04:00
Alyssa Ross
b7abce543a apacheHttpd: 2.4.47 -> 2.4.48 2021-06-10 20:41:27 +00:00
Vladimír Čunát
5663b2b2d3 Merge branch 'master' into staging-next
(a trivial conflict in transmission)
2021-05-09 09:31:55 +02:00
Léo Gaspard
58c16121e6 apacheHttpd: add link to acme nixos test 2021-05-08 21:41:55 +02:00
R. RyanTM
fe563d71a3 apacheHttpd: 2.4.46 -> 2.4.47 2021-04-30 04:07:35 +00:00
Ben Siraphob
badf51221d treewide: stdenv.lib -> lib 2021-01-16 17:58:11 +07:00
Ben Siraphob
872973d7d1 pkgs/servers: stdenv.lib -> lib 2021-01-15 14:24:03 +07: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
Daniel Nagy
f20d8091d4 apacheHttpd: passthru lua variables 2020-12-25 22:49:01 +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
Aaron Andersen
6302eb2bfb apacheHttpd: 2.4.43 -> 2.4.46 2020-08-07 20:56:34 -04: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