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

Commits on Mar 13, 2020

  1. nixosTests.nesting: fix subtest scoping 

    (cherry picked from commit 9879184)
    @thefloweringash @rnhmjoj
    thefloweringash authored and rnhmjoj committed Mar 13, 2020
    Copy the full SHA
    6e6d8a2 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

(cherry picked from commit b83164a)
    @thefloweringash @rnhmjoj
    thefloweringash authored and rnhmjoj committed Mar 13, 2020
    Copy the full SHA
    4a8801a View commit details
    Browse the repository at this point in the history

  3. 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.

(cherry picked from commit ce41677)
    @thefloweringash @rnhmjoj
    thefloweringash authored and rnhmjoj committed Mar 13, 2020
    Copy the full SHA
    d262f76 View commit details
    Browse the repository at this point in the history

  4. minecraft: install missing gsettings schemas 

    (cherry picked from commit 018a46f)
    @rnhmjoj
    rnhmjoj committed Mar 13, 2020
    Copy the full SHA
    525ab77 View commit details
    Browse the repository at this point in the history