Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

apacheHttpdPackages: drop mod_evasive, use recurseIntoAttrs for apacheHttpdPackages #117269

Merged
merged 2 commits into from
Mar 25, 2021
Merged

apacheHttpdPackages: drop mod_evasive, use recurseIntoAttrs for apacheHttpdPackages #117269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5243300
apacheHttpdPackages.mod_evasive: drop package
aanderse Mar 22, 2021
6178d37
apacheHttpdPackages: compile packages
aanderse Mar 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 0 additions & 35 deletions pkgs/servers/http/apache-modules/mod_evasive/default.nix
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17990,7 +17990,7 @@ in

mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd { };

mod_evasive = callPackage ../servers/http/apache-modules/mod_evasive { };
mod_evasive = throw "mod_evasive is not supported on Apache httpd 2.4";
aanderse marked this conversation as resolved.
Show resolved Hide resolved

mod_perl = callPackage ../servers/http/apache-modules/mod_perl { };

Expand All @@ -18009,7 +18009,7 @@ in
subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; };
};

apacheHttpdPackages_2_4 = dontRecurseIntoAttrs (apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4);
apacheHttpdPackages_2_4 = recurseIntoAttrs (apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4);
apacheHttpdPackages = apacheHttpdPackages_2_4;

appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };
Expand Down