buildRustPackage: fix overrideAttrs #179392
Draft
Artturin wants to merge 3 commits intoNixOS:masterfrom
Draft
Conversation
…rgoSha256' will convert the whole file to use finalAttrs
this commit doesn't change any hashes yet this fixes overriding cargoSha256 and other attrs so no need to overriding cargoDeps anymore
github-actions
bot
added
the
6.topic: rust
ofborg
bot
added
10.rebuild-darwin: 1-10
pennae
reviewed
Aug 26, 2022
Contributor
pennae
left a comment
pennae
left a comment
There was a problem hiding this comment.
seems to work fine. just a few nitpicks that might not even affect normal operation though.
| else if cargoLock != null then importCargoLock cargoLock | ||
| else | ||
| fetchCargoTarball ({ | ||
| src = finalAttrs.src or ""; |
Contributor
There was a problem hiding this comment.
Suggested change
| src = finalAttrs.src or ""; | |
| src = finalAttrs.src or null; |
probably not meaningful anyway, but keeping the default unchanged seems nicer
| hash = finalAttrs.cargoHash; | ||
| } // lib.optionalAttrs (finalAttrs ? cargoSha256) { | ||
| sha256 = finalAttrs.cargoSha256; | ||
| } // (args.depsExtraArgs or { })); |
Contributor
There was a problem hiding this comment.
should this be?
Suggested change
| } // (args.depsExtraArgs or { })); | |
| } // (finalAttrs.depsExtraArgs or args.depsExtraArgs or { })); |
Comment on lines
+82
to
+83
| maybeSetStr = x: lib.optionalString (previousAttrs ? ${x}) previousAttrs.${x}; | ||
| maybeSetListFromPrevious = x: lib.optionals (previousAttrs ? ${x}) previousAttrs.${x}; |
Contributor
There was a problem hiding this comment.
is there a specific reason to use these instead of
Suggested change
| maybeSetStr = x: lib.optionalString (previousAttrs ? ${x}) previousAttrs.${x}; | |
| maybeSetListFromPrevious = x: lib.optionals (previousAttrs ? ${x}) previousAttrs.${x}; | |
| maybeSetStr = x: previousAttrs.${x} or ""; | |
| maybeSetListFromPrevious = x: previousAttrs.${x} or []; |
or inlining them outright? looks like it'd be equivalent and eval slightly faster
Comment on lines
+62
to
+63
| if cargoVendorDir != null then null | ||
| else if cargoLock != null then importCargoLock cargoLock |
Contributor
There was a problem hiding this comment.
maybe these should be overridable from finalAttrs as well
| cargoCheckNoDefaultFeatures = pickPreviousOrFinalOrDefault "cargoCheckNoDefaultFeatures" "checkNoDefaultFeatures" | ||
| finalAttrs.cargoBuildNoDefaultFeatures; | ||
|
|
||
| cargoBuildFeatures = pickPreviousOrFinalOrDefault "cargoBuildFeatures" "buildFeatures" ""; |
Contributor
There was a problem hiding this comment.
Suggested change
| cargoBuildFeatures = pickPreviousOrFinalOrDefault "cargoBuildFeatures" "buildFeatures" ""; | |
| cargoBuildFeatures = pickPreviousOrFinalOrDefault "cargoBuildFeatures" "buildFeatures" []; |
old default was [], probably better to keep it like that?
|
|
||
| patches = (finalAttrs.cargoPatches or [ ]) ++ maybeSetListFromPrevious "patches"; | ||
|
|
||
| PKG_CONFIG_ALLOW_CROSS = previousAttrs.PKG_CONFIG_ALLOW_CROSS or |
Contributor
There was a problem hiding this comment.
does this (technically) change the behavior of this binding? looks like previously the value from args would always be overwritten.
| doCheck = previousAttrs.doCheck or true; | ||
|
|
||
| doCheck = args.doCheck or true; | ||
| strictDeps = previousAttrs.strictDeps or true; |
Contributor
There was a problem hiding this comment.
same here, previously we'd always set this to true. probably better to leave it like that anyway.
13 tasks
Contributor
|
Anything needed for this? It would be really nice to be able to override |
wegank
added
2.status: stale
stale
bot
removed
the
2.status: stale
wegank
added
the
2.status: stale
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
4 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.
this commit doesn't change any hashes yet
this fixes overriding cargoSha256 and other attrs
so no need to overriding cargoDeps anymore
will drop the first 2 commits before merge
Closes #107070
Description of changes
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 notes