resholve: fix mangled pname/meta integrations#191003
Merged
thiagokokada merged 1 commit intoNixOS:masterfrom Sep 13, 2022
Merged
resholve: fix mangled pname/meta integrations#191003thiagokokada merged 1 commit intoNixOS:masterfrom
thiagokokada merged 1 commit intoNixOS:masterfrom
Conversation
ofborg
bot
requested review from
Hyzual,
SamLukeYes,
figsoda,
peterhoeg,
thiagokokada,
thorstenweber83 and
utdemir
ofborg
bot
added
10.rebuild-darwin: 11-100
thiagokokada
requested changes
Sep 13, 2022
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: - repology/repology-updater#854 - repology/repology-updater@9313110121df5 For now, at least, I'll switch to appending "-unresholved" to the inner derivation's pname.
abathur
force-pushed
the
resholve_fix_meta
branch
from
f4cc236 to
9f6310d
Compare
thiagokokada
approved these changes
Sep 13, 2022
Contributor
|
@ofborg build bats sx shunit2 mons |
13 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Two items in resholve's mkDerivation are causing trouble for some ecosystem tools:
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).
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:
For now, at least, I'll switch to appending "-unresholved" to the inner derivation's pname.
Description of changes
nameinstead ofpname.Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notesResult of
nixpkgs-reviewrun on x86_64-darwin 112 packages built: