about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorThomas Gerbet <thomas@gerbet.me>2023-02-27 17:56:56 +0100
committerThomas Gerbet <thomas@gerbet.me>2023-02-27 17:56:56 +0100
commit43e79015bf52e90bfe2983e0f1c54e781557d79f (patch)
tree57f05fc001766a6830ba31f7f3e6f8806ed9e7f6 /nixos
parent592fe49fc7fc4b92e26a0bb85def2d3a2e7d8ccf (diff)
nixos/tests/haproxy: stop using nixos/profiles/minimal
The defaults conflicts with the defaults of `services.httpd`:
```
error: The option `nodes.machine.services.logrotate.enable' has conflicting definition values:
       - In `/home/thomas/Workspace/Packaging/nixpkgs/nixos/modules/profiles/minimal.nix': false
       - In `/home/thomas/Workspace/Packaging/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix': true
       Use `lib.mkForce value` or `lib.mkDefault value` to change the priority on any of these definitions.
(use '--show-trace' to show detailed location information)
```

`nixos/profile/minimal` is not used in the majority of the tests and it does not
seem to have a specific reason to use it for the HAProxy test.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/haproxy.nix1
1 files changed, 0 insertions, 1 deletions
diff --git a/nixos/tests/haproxy.nix b/nixos/tests/haproxy.nix
index b6ff4102fe683..555474d7f2999 100644
--- a/nixos/tests/haproxy.nix
+++ b/nixos/tests/haproxy.nix
@@ -2,7 +2,6 @@ import ./make-test-python.nix ({ pkgs, ...}: {
   name = "haproxy";
   nodes = {
     machine = { ... }: {
-      imports = [ ../modules/profiles/minimal.nix ];
       services.haproxy = {
         enable = true;
         config = ''