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

uwsgi: make instance configuration deeply mergeable #87871

Merged
merged 1 commit into from May 16, 2020
Merged

Conversation

@Mic92
Copy link
Contributor

Mic92 commented May 15, 2020

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.
allows to specify independent uwsgi instances in two modules.
@Mic92
Copy link
Contributor Author

Mic92 commented May 15, 2020

@GrahamcOfBorg test uwsgi

@Infinisil
Copy link
Member

Infinisil commented May 15, 2020

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
Contributor 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
19 checks passed
19 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="b96a4dc"; rev="b96a4dcc6079e9c7ea94f9f06b7399a4e10a9e05"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="b96a4dc"; rev="b96a4dcc6079e9c7ea94f9f06b7399a4e10a9e05"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="b96a4dc"; rev="b96a4dcc6079e9c7ea94f9f06b7399a4e10a9e05"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="b96a4dc"; rev="b96a4dcc6079e9c7ea94f9f06b7399a4e10a9e05"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="b96a4dc"; rev="b96a4dcc6079e9c7ea94f9f06b7399a4e10a9e05"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="b96a4dc"; rev="b96a4dcc6079e9c7ea94f9f06b7399a4e10a9e05"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="b96a4dc"; rev="b96a4dcc6079e9c7ea94f9f06b7399a4e10a9e05"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
tests.uwsgi on aarch64-linux Success
Details
tests.uwsgi on x86_64-linux Success
Details
uwsgi, uwsgi.passthru.tests on aarch64-linux Success
Details
uwsgi, uwsgi.passthru.tests on x86_64-darwin Success
Details
uwsgi, uwsgi.passthru.tests on x86_64-linux Success
Details
@Mic92 Mic92 deleted the Mic92:uwsgi branch May 16, 2020
@Mic92
Copy link
Contributor 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
Contributor Author

Mic92 commented May 16, 2020

@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
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.