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.

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

netbox: workaround to allow composible python packageOverrides #223268

Merged

Conversation

stuebinm
Copy link
Contributor

@stuebinm stuebinm commented Mar 26, 2023

the packageOverrides of python unfortunately does not compose. Since netbox's definition uses packageOverrides internally, this means something like netbox.override { python3 = python3.override { packageOverrides { ... }; }; } won't work as expected, since only the package override defined last is applied.

see #44426 for related discussion.

Description of changes

replaces the use of .override with .overrideScope, as suggested in #44426 (comment)

(note: there's an alternative solution which also does the trick:

python3.override (super: { 
 packageOverrides = 
   let ours = self: super: { django = super.django_4; }; 
   in if super ? packageOverrides
    then lib.composeExtensions super.packageOverrides ours
    else ours;
})

I do not know if there are any advantages or disadvantages to either approach, so I've gone with the one suggested in the above-linked comment)

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/)
  • 23.05 Release Notes (or backporting 22.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
  • Fits CONTRIBUTING.md.

see NixOS#44426 ("Python's
packageOverrides isn't composable") for why this is a useful
thing to do.
Copy link
Member

@RaitoBezarius RaitoBezarius left a comment

Choose a reason for hiding this comment

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

Thank you for this change!

@RaitoBezarius RaitoBezarius merged commit f39c23a into NixOS:master Mar 27, 2023
24 checks passed
@stuebinm stuebinm deleted the netbox-composible-packageOverrides branch March 27, 2023 20:10
lbpdt added a commit to lbpdt/nixpkgs that referenced this pull request Apr 3, 2023
lbpdt added a commit to lbpdt/nixpkgs that referenced this pull request Apr 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants