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: a6e7dffd1f8e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 67f37b70e8ea
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 8, 2017

  1. makeWrapper: Only wrap normal executable files 

    `makeWrapper` and `wrapProgram` are being invoked on all kinds of
wacky things (usually with the help of bash globs or other machine
assistance).

So far, I have come across `wrapProgram` being invoked on a directory,
as well as on the empty string.

As far as I can tell, it's only valid to invoke these utilities on a
normal (non-directory, non-device) executable file.  This commit
enforces that precondition.
    @ahmedtd
    ahmedtd committed Aug 8, 2017
    Configuration menu
    Copy the full SHA
    e1d46c0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #24944 from ahmedtd/make-makewrapper-picky 

    makeWrapper: Fail loudly when misused
    @peti
    peti committed Aug 8, 2017
    Configuration menu
    Copy the full SHA
    67f37b7 View commit details
    Browse the repository at this point in the history