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

bundlerApp: Set up passthru properly #62971

Merged
merged 1 commit into from Jun 16, 2019

Conversation

lilyball
Copy link
Member

@lilyball lilyball commented Jun 10, 2019

Motivation for this change

The manual documents both bundlerEnv and bundlerApp as providing env and wrappedRuby attributes on the resulting derivations. However only bundlerEnv actually had these attributes. Update bundlerApp to provide the same passthru that bundlerEnv does.

Since bundlerApp already let the user provide their own passthru, I've chosen to allow that to take precedence over the default passthru, meaning the user may overwrite env or wrappedRuby with their own attributes if they choose to do so.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

I have not actually tested the impact of this change on the nixpkgs repository. It shouldn't result in rebuilding any bundlerApp packages as it only affects passthru. I did test the one package I actually care about (the package whose environment I want access to in a nix-shell). Given that any manually-provided passthru argument will overwrite what I'm adding, this change should be purely additive.

The manual documents both bundlerEnv and bundlerApp as providing `env`
and `wrappedRuby` attributes on the resulting derivations. However only
bundlerEnv actually had these attributes. Update bundlerApp to provide
the same passthru that bundlerEnv does.
@nixos-discourse
Copy link

This pull request has been mentioned on Nix community. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review-may-2019/3032/19

@matthewbauer matthewbauer merged commit 4d5c1c8 into NixOS:master Jun 16, 2019
@lilyball lilyball deleted the bundlerApp-passthru branch June 16, 2019 22:08
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