Skip to content

Fix wrapper arguments escaping#171836

Merged
thiagokokada merged 18 commits intoNixOS:masterfrom
ncfavier:escape-wrapper-args
May 12, 2022
Merged

Fix wrapper arguments escaping#171836
thiagokokada merged 18 commits intoNixOS:masterfrom
ncfavier:escape-wrapper-args

Conversation

@ncfavier
Copy link
Member

@ncfavier ncfavier commented May 6, 2022

Some packages invoke makeWrapper like this:

wrapProgram foo --prefix PATH : ${bins}

The lack of escaping is a problem in cases where bins might be an empty string. The problem is becoming more apparent with #164163 merged, because makeWrapper used to silently do nothing if the third argument to --prefix is missing, while makeBinaryWrapper fails.

This PR fixes all instances of this pattern I could find where bins has a chance of being empty (hence leaving alone statically okay cases like --prefix PATH : ${lib.makeBinPath [ hello ]}).

ZHF #172160

@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels May 6, 2022
@ncfavier
Copy link
Member Author

ncfavier commented May 7, 2022

@ofborg build image_optim megapixels chatty tremc jameica soapysdr qucs-s vdr podman i3blocks-gaps hunspell nuspell hci hercules-ci-agent sqitchMysql navidrome pufferpanel ibus-engines.typing-booster

@SuperSandro2000 SuperSandro2000 requested a review from vcunat May 8, 2022 23:46
@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review with nixpkgs-review-checks extension. It is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).

Result of nixpkgs-review pr 171836 run on x86_64-linux 1

31 packages built:
  • chatty
  • cubicsdr
  • gnuradio3_8Packages.ais
  • gnuradio3_8Packages.osmosdr
  • gqrx
  • gqrx-gr-audio
  • gqrx-portaudio
  • hci
  • hercules-ci-agent
  • i3blocks-gaps
  • ibus-engines.typing-booster
  • image_optim
  • jameica
  • megapixels
  • navidrome
  • openwebrx
  • podman
  • pothos
  • pufferpanel
  • python310Packages.soapysdr-with-plugins
  • python39Packages.soapysdr-with-plugins
  • qradiolink
  • qucs-s
  • rtl_433
  • sdrangel
  • soapysdr-with-plugins
  • sqitchMysql
  • sqitchPg
  • tremc
  • welle-io
  • wrapVdr

@vcunat vcunat changed the base branch from staging-next to master May 9, 2022 05:21
@ncfavier ncfavier added the 0.kind: build failure A package fails to build label May 9, 2022
@ncfavier ncfavier mentioned this pull request May 12, 2022
13 tasks
Copy link
Member

Choose a reason for hiding this comment

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

Escaping shouldn't hurt but this is always set.

@ncfavier ncfavier force-pushed the escape-wrapper-args branch from e87c0da to 163f818 Compare May 12, 2022 18:33
@dotlambda
Copy link
Member

Result of nixpkgs-review pr 171836 run on x86_64-linux 1

29 packages built:
  • chatty
  • cubicsdr
  • gnuradio3_8Packages.ais
  • gnuradio3_8Packages.osmosdr
  • gqrx
  • gqrx-gr-audio
  • gqrx-portaudio
  • hci
  • hercules-ci-agent
  • ibus-engines.typing-booster
  • image_optim
  • jameica
  • megapixels
  • openwebrx
  • podman
  • pothos
  • pufferpanel
  • python310Packages.soapysdr-with-plugins
  • python39Packages.soapysdr-with-plugins
  • qradiolink
  • qucs-s
  • rtl_433
  • sdrangel
  • soapysdr-with-plugins
  • sqitchMysql
  • sqitchPg
  • tremc
  • welle-io
  • wrapVdr

@thiagokokada thiagokokada merged commit eae1669 into NixOS:master May 12, 2022
@ncfavier ncfavier deleted the escape-wrapper-args branch May 12, 2022 21:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

0.kind: build failure A package fails to build 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants