Please either undo the formatting changes or move them into a separate commit.

cc @NixOS/podman

Sorry, I meant format then apply your changes. Add things and then reformatting them is hard to follow.

Alright, I will redo.

@zowoq In general is it possible to test basic GPU functionality on the nix build farm? If so, I'll add a test here.

In general is it possible to test basic GPU functionality on the nix build farm?

No, I don't think we're able to test this.

Now that the formatting changes are split out from the other changes I've noticed that you're probably using nixfmt, this file is already almost compliant with nixpkgs-fmt, it would only need one change.

Rather than ask you to redo this again I've reverted most of the formatting changes, squashed commits as needed and updated the commit messages to follow our style.

Alright I will try to get my editor set up to use the right tool to auto format

I am using nixpkgs-fmt actually, I suppose the default config is aggressive/unstable?

I am using nixpkgs-fmt actually, I suppose the default config is aggressive/unstable?

It is. Especially nixpkgs is not aligned with it. Maybe this change in future.

For me with nixpkgs-fmt 1.0.0 formatting nixos/modules/virtualisation/podman.nix on master only makes this change:

diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix
index f554aeffb45..e108d9d8c5f 100644
--- a/nixos/modules/virtualisation/podman.nix
+++ b/nixos/modules/virtualisation/podman.nix
@@ -7,10 +7,11 @@ let
   podmanPackage = (pkgs.podman.override { inherit (cfg) extraPackages; });

   # Provides a fake "docker" binary mapping to podman
-  dockerCompat = pkgs.runCommandNoCC "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" {
-    outputs = [ "out" "man" ];
-    inherit (podmanPackage) meta;
-  } ''
+  dockerCompat = pkgs.runCommandNoCC "${podmanPackage.pname}-docker-compat-${podmanPackage.version}"
+    {
+      outputs = [ "out" "man" ];
+      inherit (podmanPackage) meta;
+    } ''
     mkdir -p $out/bin
     ln -s ${podmanPackage}/bin/podman $out/bin/docker

I am going to rebase this and make sure this works with #108607

@zowoq I ended up having to add runc because that's being invoked by the new nvidia-container-runtime update I made in another PR. This could use another review.

@Mic92 @zowoq Can one of y'all give this a final review (and/or merge if satisifed) at your earliest convenience? Thanks!