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: 59667421a146
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 04373fd3ccf9
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jan 7, 2019

  1. make-disk-image: use filterSource instead of cleanSource 

    cleanSource does not appear to work correctly in this case. The path
does not get coerced to a string, resulting in a dangling symlink
produced in channel.nix.  Not sure why, but this
seems to fix it.

Fixes #51025.

/cc @elvishjericco
    @matthewbauer
    matthewbauer committed Jan 7, 2019
    Copy the full SHA
    f05d8f3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #52594 from matthewbauer/fix-51025 

    make-disk-image: use filterSource instead of cleanSource
    @matthewbauer
    matthewbauer committed Jan 7, 2019
    Copy the full SHA
    04373fd View commit details
    Browse the repository at this point in the history