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: 8c912d4e471e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e718eb624301
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 5, 2019

  1. module system: prettify a bit error when unique option defined twice

    The error can be reproduced like:
    ```
    $ nix-instantiate ./nixos -A system --arg configuration '
      { fileSystems."/".device = "nodev";
        boot.loader.grub.devices = [ "nodev" ];
        containers.t.config.imports = [ <nixpkgs/nixos/modules/virtualisation/amazon-image.nix> ];
      }'
    ```
    
    Previously error was:
    ```
    error: The unique option `containers.t.networking.hostName' is defined multiple times, in `/nix/var/nix/profiles/per-user/root/channels/nixpkgs/nixos/modules/virtualisation/amazon-image.nix' and `module at /home/danbst/dev/nixpkgs/nixos/modules/virtualisation/containers.nix:470'.
    (use '--show-trace' to show detailed location information)
    ```
    
    Now it is:
    ```
    error: The unique option `containers.t.networking.hostName' is defined multiple times, in:
     - /nix/var/nix/profiles/per-user/root/channels/nixpkgs/nixos/modules/virtualisation/amazon-image.nix
     - module at /home/danbst/dev/nixpkgs/nixos/modules/virtualisation/containers.nix:470.
    (use '--show-trace' to show detailed location information)
    ```
    
    Related: #15747
    danbst committed Jun 5, 2019
    Copy the full SHA
    bfb6ef1 View commit details
    Browse the repository at this point in the history
  2. nixos/containers: give a name to an anonymous container module

    See #15747. Previously this module was called `<unknown-file>`
    in error messages, now it is called a bit more close to real:
    ```
    module at /home/danbst/dev/nixpkgs/nixos/modules/virtualisation/containers.nix:470
    ```
    danbst committed Jun 5, 2019
    Copy the full SHA
    f7940bb View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2019

  1. Merge pull request #62712 from danbst/module-conflict-naming

    NixOS module system: improve one of error messages
    danbst committed Jun 13, 2019
    Copy the full SHA
    e718eb6 View commit details
    Browse the repository at this point in the history