gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apacheHttpdPackages: Disable renamed/removed attributes when allowAliases disabled

Browse Source
This commit is contained in:
Silvan Mosberger
2023-12-22 20:47:25 +01:00
parent 8bbbb78c9a
commit feb114f7f0
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/aliases.nix
+12
View File
@@ -610,6 +610,18 @@ mapAliases ({
minetestserver_5 = minetestserver; # Added 2023-12-11
minizip2 = pkgs.minizip-ng; # Added 2022-12-28
mirage-im = throw "'mirage-im' has been removed, as it was broken and unmaintained"; # Added 2023-11-26
mod_dnssd = apacheHttpdPackages.mod_dnssd; # Added 2014-11-07
mod_fastcgi = apacheHttpdPackages.mod_fastcgi; # Added 2014-11-07
mod_python = apacheHttpdPackages.mod_python; # Added 2014-11-07
mod_wsgi = apacheHttpdPackages.mod_wsgi; # Added 2014-11-07
mod_ca = apacheHttpdPackages.mod_ca; # Added 2019-12-24
mod_crl = apacheHttpdPackages.mod_crl; # Added 2019-12-24
mod_csr = apacheHttpdPackages.mod_csr; # Added 2019-12-24
mod_ocsp = apacheHttpdPackages.mod_ocsp; # Added 2019-12-24
mod_scep = apacheHttpdPackages.mod_scep; # Added 2019-12-24
mod_spkac = apacheHttpdPackages.mod_spkac; # Added 2019-12-24
mod_pkcs12 = apacheHttpdPackages.mod_pkcs12; # Added 2019-12-24
mod_timestamp = apacheHttpdPackages.mod_timestamp; # Added 2019-12-24
monero = monero-cli; # Added 2021-11-28
mongodb-4_0 = throw "mongodb-4_0 has been removed, it's end of life since April 2022"; # Added 2023-01-05
mongodb-4_2 = throw "mongodb-4_2 has been removed, it's end of life since April 2023"; # Added 2023-06-06
pkgs/top-level/all-packages.nix
+4 -17
View File
@@ -26201,7 +26201,6 @@ with pkgs;
mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd { };
mod_evasive = throw "mod_evasive is not supported on Apache httpd 2.4";
mod_perl = callPackage ../servers/http/apache-modules/mod_perl { };
@@ -26211,8 +26210,6 @@ with pkgs;
mod_tile = callPackage ../servers/http/apache-modules/mod_tile { };
mod_wsgi = self.mod_wsgi2;
mod_wsgi2 = throw "mod_wsgi2 has been removed since Python 2 is EOL. Use mod_wsgi3 instead";
mod_wsgi3 = callPackage ../servers/http/apache-modules/mod_wsgi { };
mod_itk = callPackage ../servers/http/apache-modules/mod_itk { };
@@ -26222,6 +26219,10 @@ with pkgs;
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;
mod_wsgi2 = throw "mod_wsgi2 has been removed since Python 2 is EOL. Use mod_wsgi3 instead";
};
apacheHttpdPackages_2_4 = recurseIntoAttrs (apacheHttpdPackagesFor apacheHttpd_2_4 apacheHttpdPackages_2_4);
@@ -26691,20 +26692,6 @@ with pkgs;
mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { };
# Backwards compatibility.
mod_dnssd = apacheHttpdPackages.mod_dnssd;
mod_fastcgi = apacheHttpdPackages.mod_fastcgi;
mod_python = apacheHttpdPackages.mod_python;
mod_wsgi = apacheHttpdPackages.mod_wsgi;
mod_ca = apacheHttpdPackages.mod_ca;
mod_crl = apacheHttpdPackages.mod_crl;
mod_csr = apacheHttpdPackages.mod_csr;
mod_ocsp = apacheHttpdPackages.mod_ocsp;
mod_scep = apacheHttpdPackages.mod_scep;
mod_spkac = apacheHttpdPackages.mod_spkac;
mod_pkcs12 = apacheHttpdPackages.mod_pkcs12;
mod_timestamp = apacheHttpdPackages.mod_timestamp;
inherit (callPackages ../servers/mpd {
inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit;
}) mpd mpd-small mpdWithFeatures;