fetchurl: Don't force-override curl's gssSupport to on unnecessarily#66506
Merged
infinisil merged 1 commit intoNixOS:masterfrom Aug 12, 2019
Merged
fetchurl: Don't force-override curl's gssSupport to on unnecessarily#66506infinisil merged 1 commit intoNixOS:masterfrom
infinisil merged 1 commit intoNixOS:masterfrom
Conversation
nh2
changed the title
nh2
force-pushed
the
fetchurl-dont-force-set-gssSupport
branch
from
e13b9e9 to
65b4b27
Compare
ofborg
bot
added
10.rebuild-darwin: 0
…6499. 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 (NixOS#66499). This commit fixes it by just respecting the old value when it doesn't need to be forced to off.
nh2
force-pushed
the
fetchurl-dont-force-set-gssSupport
branch
from
65b4b27 to
b7dfc72
Compare
Contributor
Author
That was merged, I have rebased. |
Contributor
Author
|
Just for clarification, the previous version of the code was equivalent to this: and I've made it this: |
60 tasks
Member
|
Yep, that's a bug in a1fec86.
This LGTM.
|
This was referenced Aug 13, 2019
nh2
added a commit
to nh2/static-haskell-nix
that referenced
this pull request
Oct 20, 2019
With NixOS/nixpkgs#66506 being merged, we no longer need that workaround.
nh2
added a commit
to nh2/static-haskell-nix
that referenced
this pull request
Oct 20, 2019
With NixOS/nixpkgs#66506 being merged, we no longer need that workaround.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
callPackage#66503, merge that first (simply because the changed lines are close together and may result in a conflict if done independently).Motivation for this change
Bug #66499
The original intent in commit a1fec86
treewide: assemble all `fetchurlBoot` uses in overrides to `fetchurl` itselfwas to turngssSupportoff on Darwin, but the code actually also forcedit 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.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @oxij @infinisil @matthewbauer @Ericson2314