Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

buildDotnetModule: stop passthru attributes from being overwritten #152758

Merged
merged 1 commit into from
Dec 30, 2021
Merged

buildDotnetModule: stop passthru attributes from being overwritten #152758

merged 1 commit into from
Dec 30, 2021

Conversation

IvarWithoutBones
Copy link
Member

Motivation for this change

By setting passthru.fetch-deps directly, buildDotnetModule would overwrite any user-supplied passthru attributes as @legendofmiracles pointed out.

Supercedes: #152617

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • 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/)
  • 22.05 Release Notes (or backporting 21.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@IvarWithoutBones IvarWithoutBones mentioned this pull request Dec 30, 2021
Closed
13 tasks
@prusnak
Copy link
Member

prusnak commented Dec 30, 2021 •
edited
Loading

Can you please @legendofmiracles confirm this change fixes your effort in PR #148541 ?

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Dec 30, 2021
@IvarWithoutBones IvarWithoutBones force-pushed the dotnetModule/fix-passthru branch from 05bd692 to 72236f1 Compare December 30, 2021 17:53
@IvarWithoutBones IvarWithoutBones force-pushed the dotnetModule/fix-passthru branch from 72236f1 to 612f808 Compare December 30, 2021 17:55
legendofmiracles
legendofmiracles approved these changes Dec 30, 2021
View reviewed changes
Copy link
Contributor

@legendofmiracles legendofmiracles left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM to me and works

@legendofmiracles legendofmiracles mentioned this pull request Dec 30, 2021
Merged
13 tasks
@prusnak
Copy link
Member

prusnak commented Dec 30, 2021

@GrahamcOfBorg build btcpayserver

@prusnak prusnak merged commit e2536c4 into NixOS:master Dec 30, 2021
@IvarWithoutBones IvarWithoutBones deleted the dotnetModule/fix-passthru branch December 30, 2021 18:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@legendofmiracles legendofmiracles legendofmiracles approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@IvarWithoutBones @prusnak @legendofmiracles