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

Jump to bottom

uwsgi: make instance configuration deeply mergeable #87871

Merged
merged 1 commit into from May 16, 2020
Merged

uwsgi: make instance configuration deeply mergeable #87871

merged 1 commit into from May 16, 2020

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented May 15, 2020 •
edited

allows to specify independent uwsgi instances in two modules.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Mic92
uwsgi: make instance configuration deeply mergeable
b96a4dc 
allows to specify independent uwsgi instances in two modules.
@Mic92
Copy link
Member Author

Mic92 commented May 15, 2020

@GrahamcOfBorg test uwsgi

@infinisil
Copy link
Member

Very relevant: #75584

@makefu
Copy link
Contributor

makefu commented May 15, 2020

I tripped over this issue a couple of times already!

@Mic92
Copy link
Member Author

Mic92 commented May 16, 2020

Very relevant: #75584

Won't work here because there are lambdas as well.

@Mic92 Mic92 merged commit b15831b into NixOS:master May 16, 2020
@Mic92 Mic92 deleted the uwsgi branch May 16, 2020 07:05
@Mic92
Copy link
Member Author

Mic92 commented May 16, 2020

I wonder if I should backport it because I would consider the previous behavior a bug.

@Mic92
Copy link
Member Author

Mic92 commented May 16, 2020 •
edited

@infinisil is it not possible to make type.attrs merging behavior smarter? I see this pattern popping up in different places.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Mic92 @infinisil @makefu @grahamc