Merge branch 'master' into staging-next

(a trivial conflict in transmission)
2021-05-09 09:31:27 +02:00
parent 9f024e4c92 90c2fb1f2f
commit 5663b2b2d3
201 changed files with 2565 additions and 1560 deletions
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -1,4 +1,5 @@
 { lib, stdenv, fetchurl, perl, zlib, apr, aprutil, pcre, libiconv, lynx
+, nixosTests
 , proxySupport ? true
 , sslSupport ? true, openssl
 , http2Support ? true, nghttp2
@@ -85,6 +86,9 @@ stdenv.mkDerivation rec {

  passthru = {
    inherit apr aprutil sslSupport proxySupport ldapSupport luaSupport lua5;
+    tests = {
+      acme-integration = nixosTests.acme;
+    };
  };

  meta = with lib; {