From 7a7ff877b78e4f602a3aa8d3704bfd68caefb5de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 25 Jan 2023 13:21:36 +0100 Subject: [PATCH] nixos/podman: remove unused mkMerge --- nixos/modules/virtualisation/podman/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index 6c00fabaa185..667c5fcf6b67 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -147,7 +147,7 @@ in }; - config = lib.mkIf cfg.enable (lib.mkMerge [ + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ] ++ lib.optional cfg.dockerCompat dockerCompat; @@ -241,6 +241,5 @@ in ''; } ]; - } - ]); + }; }