Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: b58ada326aa6
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: d1990cff8d87
Choose a head ref
  • 10 commits
  • 8 files changed
  • 8 contributors

Commits on Apr 16, 2019

  1. captive-browser: init at 2019-04-14

    volth committed Apr 16, 2019
    Copy the full SHA
    9498c8f View commit details
    Browse the repository at this point in the history
  2. captive-browser: fix darwin build, add meta

    volth committed Apr 16, 2019
    Copy the full SHA
    0dfcbeb View commit details
    Browse the repository at this point in the history

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: NixOS/nixpkgs#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 NixOS/nixpkgs#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. Copy the full SHA
    ce6edcd View commit details
    Browse the repository at this point in the history
  2. maintainers: add dmvianna

    dmvianna committed Jun 13, 2019
    Copy the full SHA
    80ca9a7 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    8c912d4 View commit details
    Browse the repository at this point in the history
  4. 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
  5. Merge pull request #60375 from anpryl/slack_dark_css_arg

    slack: dark mode css can be passed as argument
    etu committed Jun 13, 2019
    Copy the full SHA
    3674ff0 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #58036 from volth/captive-browser

    nixos/programs.captive-browser: init
    Ma27 committed Jun 13, 2019
    Copy the full SHA
    d1990cf View commit details
    Browse the repository at this point in the history