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.

Sign up for GitHub

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

Jump to bottom

buildEnv: improve file check to avoid false-positives #56085

Merged
merged 1 commit into from
Feb 21, 2019
Merged

buildEnv: improve file check to avoid false-positives #56085

merged 1 commit into from
Feb 21, 2019

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Feb 20, 2019 •
edited
Loading

Motivation for this change

The original change in #55372 was supposed to fix the case where a store
path which is a file should be placed into buildEnv which broke with a
fairly misleading Perl error.

Unfortunately this introduced a regression, findFiles can have targets
that are files if the file isn't a store path. Rather than adding more
obscure checks with probably further regressions, I figured that it's
better to replicate the behavior of lib.isStorePath and explicitly
check if the store path is a file and break in this case only.

This should also fix recent staging issues.

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 nox --run "nox-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.

@Ma27
buildEnv: improve file check to avoid false-positives
5491592 
The original change in NixOS#55372 was supposed to fix the case where a store
path which is a file should be placed into `buildEnv` which broke with a
fairly misleading Perl error.

Unfortunately this introduced a regression, `findFiles` can have targets
that are files if the file isn't a store path. Rather than adding more
obscure checks with probably further regressions, I figured that it's
better to replicate the behavior of `lib.isStorePath` and explicitly
check if the store path is a file and break in this case only.

This should also fix recent staging issues.
@Ma27 Ma27 requested review from vcunat and FRidh February 20, 2019 10:11
@FRidh FRidh added this to the 19.03 milestone Feb 20, 2019
FRidh
FRidh approved these changes Feb 21, 2019
View reviewed changes
Copy link
Member

@FRidh FRidh left a comment

Choose a reason for hiding this comment

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

Tested locally, looks good to me.

@FRidh FRidh merged commit 9fcd3bf into NixOS:staging Feb 21, 2019
@Ma27 Ma27 deleted the fix-buildenv-regression branch February 21, 2019 09:49
@trueNAHO trueNAHO mentioned this pull request Jul 7, 2024
Closed
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh FRidh approved these changes

@vcunat vcunat Awaiting requested review from vcunat

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
19.03
Development

Successfully merging this pull request may close these issues.
3 participants
@Ma27 @FRidh @GrahamcOfBorg