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: 8fc21a347e06
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 829ada37bfd5
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 4, 2019

  1. nixos/nsd: Don't override bind via nixpkgs.config

    When generating values for the services.nsd.zones attribute using values
    from pkgs, we'll run into an infinite recursion because the nsd module
    has a condition on the top-level definition of nixpkgs.config.
    
    While it would work to push the definition a few levels down, it will
    still only work if we don't use bind tools for generating zones.
    
    As far as I could see, Python support for BIND seems to be only needed
    for the dnssec-* tools, so instead of using nixpkgs.config, we now
    directly override pkgs.bind instead of globally in nixpkgs.
    
    To illustrate the problem with a small test case, instantiating the
    following Nix expression from the nixpkgs source root will cause the
    mentioned infinite recursion:
    
      (import ./nixos {
        configuration = { lib, pkgs, ... }: {
          services.nsd.enable = true;
          services.nsd.zones = import (pkgs.writeText "foo.nix" ''
            { "foo.".data = "xyz";
              "foo.".dnssec = true;
            }
          '');
        };
      }).vm
    
    With this change, generating zones via import-from-derivation is now
    possible again.
    
    Signed-off-by: aszlig <aszlig@nix.build>
    Cc: @pngwjpgh
    aszlig committed Jan 4, 2019
    Copy the full SHA
    751bdac View commit details
    Browse the repository at this point in the history
  2. nixos/nsd: Improve checking for empty dnssec zones

    While at it (see previous commit), using attrNames in combination with
    length is a bit verbose for checking whether the filtered attribute set
    is empty, so let's just compare it against an empty attribute set.
    
    Signed-off-by: aszlig <aszlig@nix.build>
    aszlig committed Jan 4, 2019
    Copy the full SHA
    6446d9e View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2019

  1. Copy the full SHA
    829ada3 View commit details
    Browse the repository at this point in the history