Merge pull request #212599 from SuperSandro2000/podman-cleanup

SuperSandro2000 · web-flow · commit 6f558d3009c2 · 2023-03-27T00:05:30.000+02:00
diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix
@@ -149,7 +149,7 @@ in
 
   };
 
-  config = lib.mkIf cfg.enable (lib.mkMerge [
+  config = lib.mkIf cfg.enable
     {
       environment.systemPackages = [ cfg.package ]
         ++ lib.optional cfg.dockerCompat dockerCompat;
@@ -235,6 +235,5 @@ in
           '';
         }
       ];
-    }
-  ]);
+    };
 }

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ in`
`149`	`149`
`150`	`150`	`};`
`151`	`151`
`152`		`- config = lib.mkIf cfg.enable (lib.mkMerge [`
	`152`	`+ config = lib.mkIf cfg.enable`
`153`	`153`	`{`
`154`	`154`	`environment.systemPackages = [ cfg.package ]`
`155`	`155`	`++ lib.optional cfg.dockerCompat dockerCompat;`
`@@ -235,6 +235,5 @@ in`
`235`	`235`	`'';`
`236`	`236`	`}`
`237`	`237`	`];`
`238`		`- }`
`239`		`- ]);`
	`238`	`+ };`
`240`	`239`	`}`