diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-03-25 12:13:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-25 12:13:44 +0100 |
| commit | fa69c5754241880ea43506500fc2453765d4feed (patch) | |
| tree | d12a8c45dbe6f8845e2255af6f700fbfde8f0d6b /pkgs/top-level | |
| parent | 08d3f9aa07ab33efb459fb36f4e3f28f16e603bb (diff) | |
| parent | 6178d37883c267aafd0afe2da221a38e22957b4c (diff) | |
Merge pull request #117269 from aanderse/apacheHttpdPackages
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 985e7d463eb1..459206d37bb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18005,7 +18005,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"; mod_perl = callPackage ../servers/http/apache-modules/mod_perl { }; @@ -18024,7 +18024,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 { }; |