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: b719e29d9592
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c896936cd13d
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Sep 24, 2018

  1. lib: Make overrideScope' which takes arguments in the conventional … 

    …order

The `overrideScope` bound by `makeScope` (via special `callPackage`)
took an override in the form `super: self { … }`. But this is
dangerously close to the `self: super { … }` form used by *everything*
else, even other definitions of `overrideScope`! Since that
implementation did not even share any code either until I changed it
recently in 3cf4354, this inconsistency
is almost certainly an oversight and not intentional.

Unfortunately, just as the inconstency is hard to debug if one just
assumes the conventional order, any sudden fix would break existing
overrides in the same hard-to-debug way. So instead of changing the
definition a new `overrideScope'` with the conventional order is added,
and old `overrideScope` deprecated with a warning saying to use
`overrideScope'` instead. That will hopefully get people to stop using
`overrideScope`, freeing our hand to change or remove it in the future.
    @Ericson2314
    Ericson2314 committed Sep 24, 2018
    Copy the full SHA
    b9dce11 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #47299 from obsidiansystems/overrideScope-order 

    lib: Deprecate `overrideScope` in lieu of `overrideScope'` taking arguments in the conventional order for 18.09
    @Ericson2314
    Ericson2314 committed Sep 24, 2018
    Copy the full SHA
    c896936 View commit details
    Browse the repository at this point in the history