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: c78fead2069a
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 47fa2f133dec
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 12, 2019

  1. fetchurl: Don't force-override curl's gssSupport to on. Fixes #66499. 

    The original intent in commit

    a1fec86 treewide: assemble all `fetchurlBoot` uses in overrides to `fetchurl` itself

was to turn `gssSupport` *off* on Darwin, but the code actually also forced
it *on* on Linux.
This resulted in previous (e.g. overlays) `.override { gssSupport = false; }`
being ignored (#66499).

This commit fixes it by just respecting the old value when it doesn't need
to be forced to off.
    @nh2
    nh2 committed Aug 12, 2019
    Copy the full SHA
    b7dfc72 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #66506 from nh2/fetchurl-dont-force-set-gssSupport 

    fetchurl: Don't force-override curl's gssSupport to on unnecessarily
    @infinisil
    infinisil committed Aug 12, 2019
    Copy the full SHA
    47fa2f1 View commit details
    Browse the repository at this point in the history