Skip to content

oauth2_proxy: Handle attributes being derivations#41098

Merged
lukateras merged 1 commit intoNixOS:masterfrom
mkaito:oauth2_proxy
Jun 18, 2018
Merged

oauth2_proxy: Handle attributes being derivations#41098
lukateras merged 1 commit intoNixOS:masterfrom
mkaito:oauth2_proxy

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.

@GrahamcOfBorg GrahamcOfBorg added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 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 May 26, 2018
@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

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 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

Development

Successfully merging this pull request may close these issues.

3 participants