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: 424c38b92a7f
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c8aff961100a
Choose a head ref
  • 4 commits
  • 3 files changed
  • 1 contributor

Commits on Nov 2, 2018

  1. Revert "Revert "patch-shebangs: respect cross compilation"" 

    This reverts commit 9c4b11e.
    @matthewbauer
    matthewbauer committed Nov 2, 2018
    Copy the full SHA
    bde9909 View commit details
    Browse the repository at this point in the history

  2. patch-shebangs: use --build for auto patch shebangs 

    In strictDeps=false, autoPatchshebangs should use
--build (corresponding to PATH) to lookup commands. This restores the
previous behavior of patchshebangs so that we don’t break stuff that
isn’t careful in the buildInputs vs. nativeBuildInputs distinction.
Unfortunately this won’t work under cross compilation.
    @matthewbauer
    matthewbauer committed Nov 2, 2018
    Copy the full SHA
    eb7c50a View commit details
    Browse the repository at this point in the history

  3. darwin/stdenv: bash is a build input 

    patch shebangs needs to be in build inputs for it to get into
HOST_PATH.
    @matthewbauer
    matthewbauer committed Nov 2, 2018
    Copy the full SHA
    2f2e635 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2018

  1. Merge pull request #49608 from matthewbauer/cross-patch-shebangs-2 

    Restore cross-patch-shebangs branch
    @matthewbauer
    matthewbauer committed Nov 7, 2018
    Copy the full SHA
    c8aff96 View commit details
    Browse the repository at this point in the history