Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: e2cd07b99781
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 9fcd3bffc2f6
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Feb 21, 2019

  1. buildEnv: improve file check to avoid false-positives 

    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.
    @Ma27 @FRidh
    Ma27 authored and FRidh committed Feb 21, 2019
    Copy the full SHA
    9fcd3bf View commit details
    Browse the repository at this point in the history