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

mercurial: don't propagate frameworks #33153

Merged
merged 1 commit into from Dec 30, 2017
Merged

Conversation

LnL7
Copy link
Member

@LnL7 LnL7 commented Dec 28, 2017

Motivation for this change
Things done
  • 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.

@LnL7 LnL7 added the 6.topic: darwin Running or building packages on Darwin label Dec 28, 2017
@LnL7 LnL7 merged commit 36326ed into NixOS:master Dec 30, 2017
@LnL7 LnL7 deleted the darwin-mercurial branch December 30, 2017 00:37
@other-mickk
Copy link

Could this have introduced the following double quoting in the Mercurial wrapper:

$ less $(command -v hg)                 
#! /nix/store/65l6hr8snf4v823f974k97jc65i7bhvf-bash-4.4-p12/bin/bash -e
export TK_LIBRARY='"/nix/store/gwzzcr61sk5arbi9vzh2c3pnz4k2z930-tk-8.6.6/lib/tk8.6"'
export HG='"/nix/store/6ji054br1di9iwm4md73gr8p12lvp60y-mercurial-4.3.2/bin/hg"'
export PATH='"/nix/store/gwzzcr61sk5arbi9vzh2c3pnz4k2z930-tk-8.6.6/bin"'${PATH:+':'}$PATH
exec -a "$0" "/nix/store/6ji054br1di9iwm4md73gr8p12lvp60y-mercurial-4.3.2/bin/.hg-wrapped"  "${extraFlagsArray[@]}" "$@"

Note the export HG='"…"' pattern of double quoting. This makes the variables point at the wrong things—I ran into this because my editor script for committing uses "$HG".

Out of curiosity I ran a search for e.g. ^export\s+\w+='" (as well as one for "") in my store and there’s actually quite a couple of hits. Is there an outstanding issue for this?

@LnL7
Copy link
Member Author

LnL7 commented Jan 8, 2018

No, this only changes $out/nix-support/propagated-build-inputs.

@LnL7
Copy link
Member Author

LnL7 commented Jan 8, 2018

@mickk-on-cpp Don't think I've seen extra quoting like this before for wrappers mercurial/default.nix. Should be safe to remove if you look at other usages of wrapProgram.

@other-mickk
Copy link

Sorry for the noise, I have opened #33625.

@LnL7
Copy link
Member Author

LnL7 commented Jan 8, 2018

No problem. 😃

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants