diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15bde2b5ba77..85d7070b5158 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25379,42 +25379,27 @@ with pkgs; apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { inherit apacheHttpd; - mod_auth_mellon = callPackage ../servers/http/apache-modules/mod_auth_mellon { }; - - # Redwax collection mod_ca = callPackage ../servers/http/apache-modules/mod_ca { }; mod_crl = callPackage ../servers/http/apache-modules/mod_crl { }; - mod_csr = callPackage ../servers/http/apache-modules/mod_csr { }; mod_cspnonce = callPackage ../servers/http/apache-modules/mod_cspnonce { }; - mod_ocsp = callPackage ../servers/http/apache-modules/mod_ocsp{ }; - mod_scep = callPackage ../servers/http/apache-modules/mod_scep { }; - mod_pkcs12 = callPackage ../servers/http/apache-modules/mod_pkcs12 { }; - mod_spkac= callPackage ../servers/http/apache-modules/mod_spkac { }; - mod_timestamp = callPackage ../servers/http/apache-modules/mod_timestamp { }; - + mod_csr = callPackage ../servers/http/apache-modules/mod_csr { }; mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd { }; - - - mod_perl = callPackage ../servers/http/apache-modules/mod_perl { }; - mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { }; - - mod_python = callPackage ../servers/http/apache-modules/mod_python { }; - - mod_tile = callPackage ../servers/http/apache-modules/mod_tile { }; - - mod_wsgi3 = callPackage ../servers/http/apache-modules/mod_wsgi { }; - mod_itk = callPackage ../servers/http/apache-modules/mod_itk { }; - - mod_mbtiles = callPackage ../servers/http/apache-modules/mod_mbtiles { }; - - php = pkgs.php.override { inherit apacheHttpd; }; - - subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; - mod_jk = callPackage ../servers/http/apache-modules/mod_jk { }; + mod_mbtiles = callPackage ../servers/http/apache-modules/mod_mbtiles { }; + mod_ocsp = callPackage ../servers/http/apache-modules/mod_ocsp { }; + mod_perl = callPackage ../servers/http/apache-modules/mod_perl { }; + mod_pkcs12 = callPackage ../servers/http/apache-modules/mod_pkcs12 { }; + mod_python = callPackage ../servers/http/apache-modules/mod_python { }; + mod_scep = callPackage ../servers/http/apache-modules/mod_scep { }; + mod_spkac = callPackage ../servers/http/apache-modules/mod_spkac { }; + mod_tile = callPackage ../servers/http/apache-modules/mod_tile { }; + mod_timestamp = callPackage ../servers/http/apache-modules/mod_timestamp { }; + mod_wsgi3 = callPackage ../servers/http/apache-modules/mod_wsgi { }; + php = pkgs.php.override { inherit apacheHttpd; }; + subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; } // lib.optionalAttrs config.allowAliases { mod_evasive = throw "mod_evasive is not supported on Apache httpd 2.4"; mod_wsgi = self.mod_wsgi2;