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

oauth2_proxy: Handle attributes being derivations #41098

Merged
merged 1 commit into from Jun 18, 2018
Merged

oauth2_proxy: Handle attributes being derivations #41098

merged 1 commit into from Jun 18, 2018

Conversation

mkaito
Copy link
Contributor

@mkaito mkaito commented May 26, 2018

Motivation for this change

Any attribute being a derivation would cause infinite recursion

Things done

Handle derivations separately from sets when mapping the config to CLI arguments.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mkaito
Copy link
Contributor Author

mkaito commented May 27, 2018

I'm using toString but apparently that's not quite the same as ${attr}. I know this works because I'm already using it, but maybe someone has an opinion on it? I went with toString because it seemed more expressive to me in this case.

@lukateras lukateras merged commit 5e5bdfa into NixOS:master Jun 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lukateras lukateras lukateras approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mkaito @lukateras @GrahamcOfBorg