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

Fix emacs wrapper expression to honor bash array use #27921

Merged
merged 1 commit into from Aug 4, 2017

Conversation

mdorman
Copy link
Contributor

@mdorman mdorman commented Aug 4, 2017

In 8d76eff, @Ericson2314 changed the representation of the value that
findInputs generated from a whitespace-separated bunch strings to an
actual array of strings.

Expressions that consume that value, however, also needed to be
changed to iterate over all the contents of the array, else they would
only select the first value, which turns out to be somewhat limiting.

Fixes #27873

Motivation for this change

Fix a bug!

Things done

Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers.

  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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.

@@ -80,7 +80,7 @@ stdenv.mkDerivation {
linkPath "$1" "share/emacs/site-lisp" "share/emacs/site-lisp"
}

for pkg in $requires; do
for pkg in "''${requires[@]}"; do
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please put a comment above describing what's going on.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An excellent suggestion. Done!

In 8d76eff, @Ericson2314 changed the representation of the value that
`findInputs` generated from a whitespace-separated bunch strings to an
actual array of strings.

Expressions that *consume* that value, however, also needed to be
changed to iterate over all the contents of the array, else they would
only select the first value, which turns out to be somewhat limiting.

Fixes NixOS#27873
@Ericson2314 Ericson2314 merged commit e84c717 into NixOS:master Aug 4, 2017
@mdorman mdorman deleted the emacs-wrapper-fix branch August 4, 2017 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants