After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.
Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.
A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.
This commit was automatically created and can be verified using
nix-build a08b3a4d19.tar.gz \
--argstr baseRev b32a094368
result/bin/apply-formatting $NIXPKGS_PATH
Forgot to port this resholve Nix API fix in the course of #184292.
Same change as:
github.com/abathur/resholve/commit/b743d2eb12d82e35c567733a7a884174e3606641
Effort to fix automatic nixpkgs-update updates for resholved
packages in 9f6310d did help the bot get further, but it
then failed to find the source outputHash (the outer
derivation's source is the inner derivation; bot looks for
outer.src.outputHash; ours is at outer.src.src.outputHash).
This change uses `originalSrc` to indicate the source of the
inner derivation. Along with ryantm/nixpkgs-update#324, this
enables the bot to fall back on an attr that Nix/nixpkgs are
not directly depending on, supporting automatic updates for
packages built with `resholve.mkDerivation`.
Two items in resholve's mkDerivation are causing trouble for
some ecosystem tools:
1. I didn't pass through the original package's meta, which breaks the
ability of at least nixos package search and r-ryantm to find the
right source file (in the latter case breaking auto updates).
2. I was prepending "resholved-" to the pname, which at least nixos
package search picks up as the package's name. Repology also tries
to do this, but their current nix updater will prefer to get this
data from the name. For now, this means changing to name will not
stop repology from picking up the `resholved-<package>` names.
Repology's code makes it clear that they *want* to use the pname/
version, so I was inclined to settle with what I've got for now,
but thiagokokada clarified that we aren't just waiting for nixpkgs
fixes, but because Nix itself isn't exporting the pname/version in
its JSON. See also:
- https://github.com/repology/repology-updater/issues/854
- https://github.com/repology/repology-updater/commit/9313110121df5
For now, at least, I'll switch to appending "-unresholved" to the
inner derivation's pname.
Extract argument-handling utility functions to prepare for adding
resholveScript* functions.
This tracks upstream work, but I broke it up a little more semantically here
in case it aids review. See:
6aab748205
