Reviewing files that changed from the base of the PR and between e9ad491 and 48d4d65.

• flake.nix (19 hunks)
• nix/cargo-bench.nix (1 hunks)
• nix/ciShell.nix (2 hunks)
• nix/ciTestShell.nix (2 hunks)
• nix/devShell.nix (2 hunks)
• nix/docker-builder.nix (1 hunks)
• nix/mkShell.nix (1 hunks)
• nix/rust-builder.nix (5 hunks)
• nix/rust-package.nix (7 hunks)
• nix/testShell.nix (2 hunks)

• GitHub Check: hoprd / docker
• GitHub Check: hopli / docker
• GitHub Check: tests-smoke-hopli
• GitHub Check: tests-unit-nightly
• GitHub Check: zizmor
• GitHub Check: Linter
• GitHub Check: tests-unit

nix/docker-builder.nix (2)

1-8: Improved argument list formatting

The multi-line argument list with trailing commas improves readability and makes future modifications easier. This formatting change aligns well with the RFC 166 guidelines.

---

11-21: Well-structured content list

The multi-line formatting of the package list provides better readability by clearly separating each package dependency, making it easier to maintain in the future.

nix/mkShell.nix (4)

1-10: Improved function parameter structure

The multi-line parameter list with trailing commas enhances readability and aligns with the RFC 166 formatting guidelines.

---

13-19: Cleaner conditional expression formatting

The restructured if-then-else expression for rustToolchain improves readability by properly indenting each branch.

---

21-46: Well-structured package list

The multi-line formatting of minimumPackages significantly improves readability by clearly organizing each package on its own line, with proper sections for formatting tools.

---

54-60: Better library path construction

The multi-line structure for LD_LIBRARY_PATH construction makes it easier to see which libraries are included and how conditional inclusions are applied.

nix/cargo-bench.nix (3)

1-3: Improved input parameter structure

The restructured input parameter improves clarity by separating mkCargoDerivation into its own parameter.

---

5-9: Enhanced argument pattern matching

The multi-line format for the attribute pattern matching enhances readability while maintaining the same destructuring functionality.

---

15-25: Clearer function call structure

The reformatted mkCargoDerivation call with multi-line attribute merging improves readability while preserving the exact same functionality.

nix/rust-builder.nix (10)

1-12: Improved input parameter structure

The multi-line format with trailing commas for function parameters significantly improves readability and maintainability.

---

13-16: Better let-binding structure

The nested let-binding is now properly formatted with clear indentation, making the code structure more apparent.

---

21-25: Well-structured overlay list

The multi-line format for overlays makes each overlay clearly visible and easier to maintain.

---

30-36: Cleaner conditional logic formatting

The restructured conditional expression with proper indentation improves readability.

---

40-43: Consistent overlay formatting

The multi-line format for overlays matches the style used earlier in the file, maintaining consistency.

---

53-53: Improved function definition

The single-line function definition has been properly formatted with consistent spacing.

---

68-70: Better nesting for toolchain override

The multi-line format for the toolchain override improves readability by clearly separating the configuration options.

---

79-79: Improved environment variable expression

The string interpolation for environment variable naming is now properly formatted.

---

84-89: Cleaner conditional structure

The if-then-else expression for static build environment is now properly formatted with consistent indentation and braces.

---

97-126: Well-structured callPackage function

The complete restructuring of the callPackage function with proper indentation, multi-line parameter lists, and clear attribute set merging significantly improves readability while maintaining identical functionality.

flake.nix (1)

1-867: Formatting updates comply with RFC 166 and maintain existing semantics.

All modifications in this file are purely stylistic—adjusting indentation, alignments, multi-line lists, attribute set formatting, and shell-script string blocks—for improved readability and consistency. I confirm no logic, control-flow, or exported-entity changes.

nix/devShell.nix (1)

1-24: Consistent argument destructuring and import formatting.

The reformatted argument list and the multi-line import of ./testShell.nix follow the same style guidelines applied across the Nix files in this PR. No behavioral changes introduced.

nix/ciShell.nix (1)

1-39: Purely stylistic reformat of ciShell.

The transition to a standard attribute-set pattern for arguments and the multi-line mkShell call improve clarity without altering functionality. Approved.

nix/testShell.nix (1)

1-50: Multiline string and record update formatting only.

Adjustments to finalShellHook concatenation and the mkShell invocation are formatting-only and consistent with RFC 166. No logic changed.

nix/ciTestShell.nix (1)

1-24: Reformatted argument list and import merge.

The changes to argument destructuring and the ./testShell.nix merge expression are stylistic, matching the rest of the PR. Functionally equivalent.

nix/rust-package.nix (15)

1-28: Consistent, comma-separated argument list improves readability

The transition to a trailing-comma, comma-separated function argument list adheres to RFC 166 conventions and greatly enhances maintainability without changing any semantics.

---

48-54: Consolidated darwinSuffixSalt, targetSuffixSalt, and setup hook definition

Refactoring these assignments into single-line expressions and inlining the makeSetupHook call sharpens focus on intent while preserving existing behavior.

---

66-68: Compact inline conditional definitions for pnameSuffix and pnameDeps

The one-liner if expressions yield the same suffix logic in fewer lines, increasing clarity and matching adjacent patterns.

---

69-71: Streamlined version computation

Using lib.strings.concatStringsSep with take 3 in a concise, multi-line form maintains functionality while reducing boilerplate.

---

78-85: Expanded darwinBuildInputs into a multi-line list

Explicitly bracketing and indenting the list of macOS frameworks follows the project’s style guide and keeps the original contents intact.

---

88-89: Refactored darwinNativeBuildInputs conditional

The inline if-else expression clearly communicates when the Darwin hook should be included, without affecting logic.

---

91-102: Enhanced readability for buildInputs conditional branches

Separating the isStatic and non-static branches with with pkgs.pkgsStatic; and with pkgs; plus bracketed lists improves legibility, while semantics remain unchanged.

---

108-119: Clean concatenation for nativeBuildInputs and buildInputs in sharedArgsBase

Listing each input in bracketed arrays and then merging via ++ ensures consistent formatting. Both nativeBuildInputs and buildInputs concatenations preserve prior dependency order and behavior.

---

131-139: Flattened sharedArgs conditional for tests

Merging additional test-specific attributes into sharedArgsBase with a compact // { … } block removes unnecessary braces around the outer expression and aligns with surrounding styles.

---

163-170: Refactored defaultArgs cargoArtifacts merging

Using a parenthesized, multi-line merge of sharedArgs with overrides for pname and src condenses the definition without affecting its output.

---

172-172: Concise args selection with inline conditional

The single-line if buildDocs then … else … merge succinctly chooses between documentation and default arguments, matching the file’s new stylistic conventions.

---

190-193: Normalized builder invocation formatting

Breaking out the builder function call into multiple lines with explicit inherit src postInstall; merges clarifies the final derivation inputs without modifying behavior.

---

195-201: Aligned indentation for preConfigure script

Consistent indentation of the heredoc-style shell block enhances readability and parallels other Nix expressions in the repo.

---

203-209: Aligned indentation for preFixup script

Using lib.optionalString with a neatly indented script block keeps the cross-compilation patch logic intact and in line with the updated formatting guidelines.

---

210-211: Clean closing braces and parentheses

Final alignment of the closing } and ) completes the refactoring, ensuring the file respects consistent indentation and trailing-comma conventions.