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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 34c6922966f6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e49a143ac758
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 4, 2019

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    iv-nn Ivann
    Copy the full SHA
    d03ced8 View commit details
  2. tests/pdns-recursor: add

    Mic92 committed Apr 4, 2019
    Copy the full SHA
    d8445c9 View commit details

Commits on Apr 5, 2019

  1. Merge pull request #58982 from Mic92/pdns

    pdns-recursor: 4.1.11 -> 4.1.12
    Mic92 authored Apr 5, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    iv-nn Ivann
    Copy the full SHA
    e49a143 View commit details
Showing with 15 additions and 2 deletions.
  1. +1 −0 nixos/tests/all-tests.nix
  2. +12 −0 nixos/tests/pdns-recursor.nix
  3. +2 −2 pkgs/servers/dns/pdns-recursor/default.nix
1 change: 1 addition & 0 deletions nixos/tests/all-tests.nix
Original file line number Diff line number Diff line change
@@ -223,6 +223,7 @@ in
syncthing-relay = handleTest ./syncthing-relay.nix {};
systemd = handleTest ./systemd.nix {};
systemd-confinement = handleTest ./systemd-confinement.nix {};
pdns-recursor = handleTest ./pdns-recursor.nix {};
taskserver = handleTest ./taskserver.nix {};
telegraf = handleTest ./telegraf.nix {};
tomcat = handleTest ./tomcat.nix {};
12 changes: 12 additions & 0 deletions nixos/tests/pdns-recursor.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import ./make-test.nix ({ pkgs, lib, ... }: {
name = "powerdns";

nodes.server = { ... }: {
services.pdns-recursor.enable = true;
};

testScript = ''
$server->waitForUnit("pdns-recursor");
$server->succeed("echo | ${lib.getBin pkgs.netcat}/bin/nc -v localhost 53")
'';
})
4 changes: 2 additions & 2 deletions pkgs/servers/dns/pdns-recursor/default.nix
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@ with stdenv.lib;

stdenv.mkDerivation rec {
name = "pdns-recursor-${version}";
version = "4.1.11";
version = "4.1.12";

src = fetchurl {
url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
sha256 = "0w6nyjiid8d9rv6qsq42x210val6lqrm9shpid4s8gjxahmxbiwy";
sha256 = "1j5hrpz4c9dqd30piqd8xyjmirdxp4dy71nx9rwq8l4i4nc0l774";
};

nativeBuildInputs = [ pkgconfig ];