apptainer, singularity: format Nix expression according to Nix RFC 166

[ShamrockLee]

Description of changes

Format pkgs/applications/virtualization/singularity/{generic.nix,packages.nix} and nixos/modules/programs/singularity.nix with nixfmt to make them conform Nix RFC 166, providing a clean ground for subsequent changes.

Prevent unwanted absorption by comments. See also NixOS/nixfmt#198.

Cc: @GaetanLepage @jbedo @SomeoneSerge

Things done

• Built on platform(s)
  • x86_64-linux (evaluation result should stay the same)
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
  • sandbox = relaxed
  • sandbox = true
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
• Fits CONTRIBUTING.md.

---

Add a 👍 reaction to pull requests you find important.

[ShamrockLee]

Bump onto the master branch and resolve merge conflict.

[SomeoneSerge]

Do I understand correctly:

• The new revision doesn't include any manual edits, it's a fully automated reformatting.
• The custom nixfmt patches will eventually make their way into nixpkgs' nixfmt-rfc-style package?

[ShamrockLee]

The new revision doesn't include any manual edits, it's a fully automated reformatting.

Yes.

The custom nixfmt patches will eventually make their way into nixpkgs' nixfmt-rfc-style package?

I manipulate the formatting result by adding comments to the Nix code. The formatter is fetched unmodified from the master branch of NixOS/nixfmt.

For example,

{
  foo = [
    "aaaa"
    "bbbb"
  ]
  ++ lib.optional true "cccc"
  ++ lib.optional true "dddd";
}

formats to

{
  foo = [
    "aaaa"
    "bbbb"
  ] ++ lib.optional true "cccc"  ++ lib.optional true "dddd";
}

while

{
  foo = [
    "aaaa"
    "bbbb"
  ]
  # Optional dependencies
  ++ lib.optional true "cccc"
  ++ lib.optional true "dddd";
}

formats to

{
  foo =
    [
      "aaaa"
      "bbbb"
    ]
    # Optional dependencies
    ++ lib.optional true "cccc" 
    ++ lib.optional true "dddd";
}

[GaetanLepage]

Cool ! LGTM