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: 5259fccb41bf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 280e27327d49
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 11, 2020

  1. knot-resolver: 5.1.3 -> 5.2.0 

    https://lists.nic.cz/pipermail/knot-resolver-users/2020/000318.html

NixOS service: we'll probably want to switch listenDoH
to the new 'doh2' kind, but let me leave that for later.
    @vcunat
    vcunat committed Nov 11, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    280e273 View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 pkgs/servers/dns/knot-resolver/default.nix
5 changes: 3 additions & 2 deletions pkgs/servers/dns/knot-resolver/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,11 +16,11 @@ lua = luajitPackages;

unwrapped = stdenv.mkDerivation rec {
pname = "knot-resolver";
version = "5.1.3";
version = "5.2.0";

src = fetchurl {
url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
sha256 = "20cd829027e39a9f7d993894e3640e886825b492d9ac1a744ac5616cc101458b";
sha256 = "8824267ca3331fa06d418c1351b68c648da0af121bcbc84c6e08f5b1e28d9433";
};

outputs = [ "out" "dev" ];
@@ -67,6 +67,7 @@ unwrapped = stdenv.mkDerivation rec {
postInstall = ''
rm "$out"/lib/libkres.a
rm "$out"/lib/knot-resolver/upgrade-4-to-5.lua # not meaningful on NixOS
rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help
'';

doInstallCheck = with stdenv; hostPlatform == buildPlatform;