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

Commits on Sep 7, 2018

  1. nixpkgs module: Fix defaulting of localSystem and system

    Take two of #40708 (4fe2898).
    
    That PR attempted to bidirectionally default `config.nixpkgs.system` and
    `config.nixpkgs.localSystem.system` to each be updated by the other. But
    this is not possible with the way the module system works. Divergence in
    certain cases in inevitable.
    
    This PR is more conservative and just has `system` default `localSystem`
    and `localSystem` make the final call as-is. This solves a number of
    issues.
    
     - `localSystem` completely overrides `system`, just like with nixpkgs
     proper. There is no need to specify `localSystem.system` to clobber the
     old system.
    
     - `config.nixpkgs.localSystem` is exactly what is passed to nixpkgs. No
     spooky steps.
    
     - `config.nixpkgs.localSystem` is elaborated just as nixpkgs would so
     that all attributes are available, not just the ones the user
     specified.
    
    The remaining issue is just that `config.nixpkgs.system` doesn't update
    based on `config.nixpkgs.localSystem.system`. It should never be
    referred to lest it is a bogus stale value because
    `config.nixpkgs.localSystem` overwrites it.
    
    Fixes #46320
    Ericson2314 committed Sep 7, 2018
    3
    Copy the full SHA
    9f9723b View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2018

  1. Merge pull request #46341 from obsidiansystems/fix-46320

    nixpkgs module: Fix defaulting of `localSystem` and `system`
    grahamc committed Sep 8, 2018
    Copy the full SHA
    ca7391d View commit details
    Browse the repository at this point in the history