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

Commits on May 25, 2019

  1. nixos: Make 'nesting.clone' work in NixOS tests

    Because nesting.clone calls 'eval-config.nix' manually,
    without the 'extraArgs' argument that provides the 'nodes'
    argument to nixos modules in nixos tests, evaluating
    of 'nesting.clone' definitions would fail with the following error
    
    while evaluating the module argument `nodes' in "<redacted>"
    while evaluating the attribute '_module.args.nodes' at undefined position:
    attribute 'nodes' missing, at <redacted./nixpkgs/lib/modules.nix:163:28
    
    by not using 'extraArgs' but a nixos module instead, the nodes parameter
    gets propagated to the 'eval-config.nix' call that  'nesting.clone'
    makes too -  getting rid of the error.
    
    See  https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/system/activation/top-level.nix#L13-L23
    See  https://github.com/NixOS/nixpkgs/blob/master/nixos/lib/build-vms.nix#L27
    See  #20886 (comment)
    arianvp committed May 25, 2019
    Copy the full SHA
    d50b434 View commit details
    Browse the repository at this point in the history
  2. nixos: Add test that demonstrates how to use nesting.clone

    This is actually very useful. Allows you to test switch-to-configuration
    
    nesting.children is still currently still broken as it will throw
    away 'too much' of the config, including the modules that make
    nixos tests work in the first place. But that's something for
    another time.
    arianvp committed May 25, 2019
    Copy the full SHA
    a48047a View commit details
    Browse the repository at this point in the history

Commits on May 29, 2019

  1. nixos: Make nesting.children work in NixOS tests

    We differentiate between modules and baseModules in  the
    VM builder for NixOS tests. This way, nesting.children, eventhough
    it doesn't inherit from parent, still has enough config to
    actually complete the test. Otherwise, the qemu modules
    would not be loaded, for example, and a nesting.children
    statement would not evaluate.
    arianvp committed May 29, 2019
    Copy the full SHA
    cbc45b5 View commit details
    Browse the repository at this point in the history
  2. nixos: Make 'nesting.clone' work in NixOS tests (#62069)

    nixos: Make 'nesting.clone' work in NixOS tests
    flokli committed May 29, 2019
    Copy the full SHA
    b09c6ac View commit details
    Browse the repository at this point in the history