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

Commits on Mar 7, 2020

  1. nixos/networking: Add hostFiles option 

    When blocklists are built with a derivation, using extraHosts would
require IFD, since the result of the derivation needs to be converted to
a string again.

By introducing this option no IFD is needed for such use-cases, since
the fetched files can be assigned directly.
    @infinisil
    infinisil committed Mar 7, 2020
    Copy the full SHA
    ec6e4db View commit details
    Browse the repository at this point in the history

  2. nixos/cjdns: Don't use IFD for extra hosts

    @infinisil
    infinisil committed Mar 7, 2020
    Copy the full SHA
    1906320 View commit details
    Browse the repository at this point in the history

  3. nixos/cjdns: Fix connectTo example rendering

    @infinisil
    infinisil committed Mar 7, 2020
    Copy the full SHA
    64ee425 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2020

  1. Merge pull request #81945 from Infinisil/hostFiles 

    Introduce `networking.hostFiles` option
    @infinisil
    infinisil committed Mar 12, 2020
    Copy the full SHA
    8f2109c View commit details
    Browse the repository at this point in the history