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

Commits on Feb 27, 2020

  1. nixosTests.nesting: fix subtest scoping

    @thefloweringash
    thefloweringash committed Feb 27, 2020
    Copy the full SHA
    9879184 View commit details
    Browse the repository at this point in the history

  2. nixos/activation: propagate system to nested configurations 

    The current behavior lets `system` default to
`builtins.currentSystem`. The system value specified to
`eval-config.nix` has very low precedence, so this should compose
properly.

Fixes #80806
    @thefloweringash
    thefloweringash committed Feb 27, 2020
    Copy the full SHA
    b83164a View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2020

  1. nixos/activation: use eval-config's system argument for nesting 

    This avoids a possible surprise if the user is using `nixpkgs.system`
and `nesting.children`. `nesting.children` is expected to ignore all
parent configuration so we shouldn't propagate the user-facing option
`nixpkgs.system`. To avoid doing so, we introduce a new internal
option for holding the value passed to eval-config.nix, and use that
when recursing for nesting.
    @thefloweringash
    thefloweringash committed Mar 5, 2020
    Copy the full SHA
    ce41677 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2020

  1. Merge pull request #81241 from thefloweringash/nesting-system 

    nixos/activation: propagate system to nested configurations
    @rnhmjoj
    rnhmjoj committed Mar 13, 2020
    Copy the full SHA
    7b15d6c View commit details
    Browse the repository at this point in the history