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

Commits on Jul 28, 2017

  1. Revert "diffoscope: wrap executable and include tools in PATH" 

    This reverts commit 23ad77b.

Double wrapper scripts considered harmful.

(cherry picked from commit 3e68fac)
    @edolstra
    edolstra committed Jul 28, 2017
    Configuration menu
    Copy the full SHA
    0d61f5f View commit details
    Browse the repository at this point in the history

  2. diffoscope: Move all required tools into pythonPath 

    Alternative fix for #27534 that prevents the use of a double wrapper
(creating even uglier script names than usual, like
..diffoscope-wrapped-wrapped).

This was my bad in 96d7f35.

(cherry picked from commit 91dc811)
    @edolstra
    edolstra committed Jul 28, 2017
    Configuration menu
    Copy the full SHA
    5db121d View commit details
    Browse the repository at this point in the history

  3. nix: 1.11.11 -> 1.11.12 

    (cherry picked from commit 40cf34a)
    @edolstra
    edolstra committed Jul 28, 2017
    Configuration menu
    Copy the full SHA
    4f92d20 View commit details
    Browse the repository at this point in the history

  4. nix: 1.11.12 -> 1.11.13 

    (cherry picked from commit 17642b5)
    @edolstra
    edolstra committed Jul 28, 2017
    Configuration menu
    Copy the full SHA
    38ca6fa View commit details
    Browse the repository at this point in the history