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: 03f1f355adc0
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 8b04b63c76f1
Choose a head ref
  • 11 commits
  • 3 files changed
  • 8 contributors

Commits on Sep 9, 2018

  1. Merge branch 'release-18.09' into staging-18.09

    @xeji
    xeji committed Sep 9, 2018
    Copy the full SHA
    33e2a6d View commit details
    Browse the repository at this point in the history

  2. texlive: Adds patch for missing synctex header. (#46376) 

    This seems like a known issue as other distributions (ArchLinux here)
have patches fixing the issue.

This hopefully fixes more than one dependant builds for ZHF 18.09.

(cherry picked from commit 1ac912b)
    @samueldr @xeji
    samueldr authored and xeji committed Sep 9, 2018
    Copy the full SHA
    97916ac View commit details
    Browse the repository at this point in the history

  3. git: use default texinfo 

    (cherry picked from commit 7705c76)
    @oxij @xeji
    oxij authored and xeji committed Sep 9, 2018
    Copy the full SHA
    4ce4c24 View commit details
    Browse the repository at this point in the history

  4. gpgme: use default texinfo 

    (cherry picked from commit 53c9efe)
    @oxij @xeji
    oxij authored and xeji committed Sep 9, 2018
    Copy the full SHA
    69b6db0 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2018

  1. dhcpcd: No need to hack around broken patchShebangs anymore

    @Ericson2314
    Ericson2314 committed Sep 11, 2018
    Copy the full SHA
    c64d76d View commit details
    Browse the repository at this point in the history

  2. stdenv: Define HOST_PATH more loosely when strictDeps isn't set 

    This ensures this change is safe last minute for 18.09. Master won't
have this.
    @Ericson2314
    Ericson2314 committed Sep 11, 2018
    Copy the full SHA
    c72c865 View commit details
    Browse the repository at this point in the history

  3. patch-shebangs: respect cross compilation 

    This hopefully makes patchShebangs respect cross compilation. It
introduces the concept of the HOST_PATH. Nothing is ever executed on
it but instead used as a way to get the proper path using ‘command
-v’. Needs more testing.

/cc @Ericson2314 @dtzWill

Fixes #33956
Fixes #21138

(Modified backport of f069423. See
previous commit to understand the differences between this and the
original.)
    @matthewbauer @Ericson2314
    matthewbauer authored and Ericson2314 committed Sep 11, 2018
    Copy the full SHA
    e9b6300 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #46108 from obsidiansystems/cross-patch-shebangs 

    patch-shebangs: respect cross compilation for 18.09
    @Ericson2314
    Ericson2314 committed Sep 11, 2018
    Copy the full SHA
    6877b4c View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2018

  1. Revert "Merge pull request #46108 from obsidiansystems/cross-patch-sh… 

    …ebangs"

This reverts commit 6877b4c, reversing
changes made to 69b6db0.
    @matthewbauer
    matthewbauer committed Sep 16, 2018
    Copy the full SHA
    a86020b View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2018

  1. Merge branch 'release-18.09' into staging-18.09

    @vcunat
    vcunat committed Sep 17, 2018
    Copy the full SHA
    1c9013d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'staging-18.09' into release-18.09

    @vcunat
    vcunat committed Sep 17, 2018
    Copy the full SHA
    8b04b63 View commit details
    Browse the repository at this point in the history