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/nix
base: b52846ab5b5d
Choose a base ref
...
head repository: NixOS/nix
compare: cd74a55afc31
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 29, 2017

  1. Fix "Unexpected EOF reading a line" error 

    propagated-user-env-packages files in nixpkgs aren't all terminated by
newlines, as buildenv expected. Now it does not require a terminating
newline; note that this introduces a behaviour change: propagated user
env packages may now be spread across multiple lines. However, nix
1.11.x still expects them to be on a single line so this shouldn't be
used in nixpkgs for now.
    @lheckemann
    lheckemann committed Nov 29, 2017
    Configuration menu
    Copy the full SHA
    f986a44 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1704 from lheckemann/buildenv-eol-fix 

    Fix "Unexpected EOF reading a line" error
    @edolstra
    edolstra committed Nov 29, 2017
    Configuration menu
    Copy the full SHA
    cd74a55 View commit details
    Browse the repository at this point in the history