Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

coredns: 1.11.1 -> 1.11.3 #325373

Merged
merged 2 commits into from
Jul 10, 2024
Merged

coredns: 1.11.1 -> 1.11.3 #325373

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2bbafe
coredns: 1.11.1 -> 1.11.3
risicle Jul 7, 2024
ceeb0dc
coredns: add nixosTests.kubernetes dns tests to passthru.tests
risicle Jul 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions pkgs/servers/dns/coredns/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
, buildGoModule
, fetchFromGitHub
, installShellFiles
, nixosTests
, externalPlugins ? []
, vendorHash ? "sha256-tp22jj6DNnYFQhtAFW2uLo10ty//dyNqIDH2egDgbOw="
, vendorHash ? "sha256-mp+0/DQTNsgAZTnLqcQq1HVLAfKr5vUGYSZlIvM7KpE="
}:

let
Expand All @@ -14,13 +15,13 @@ let
builtins.map ({name, repo, version}: "${repo}@${version}") attrs;
in buildGoModule rec {
pname = "coredns";
version = "1.11.1";
version = "1.11.3";

src = fetchFromGitHub {
owner = "coredns";
repo = "coredns";
rev = "v${version}";
sha256 = "sha256-XZoRN907PXNKV2iMn51H/lt8yPxhPupNfJ49Pymdm9Y=";
sha256 = "sha256-8LZMS1rAqEZ8k1IWSRkQ2O650oqHLP0P31T8oUeE4fw=";
};

inherit vendorHash;
Expand Down Expand Up @@ -64,12 +65,21 @@ in buildGoModule rec {
'' + lib.optionalString stdenv.isDarwin ''
# loopback interface is lo0 on macos
sed -E -i 's/\blo\b/lo0/' plugin/bind/setup_test.go

# test is apparently outdated but only exhibits this on darwin
substituteInPlace test/corefile_test.go \
--replace "TestCorefile1" "SkipCorefile1"
'';

postInstall = ''
installManPage man/*
'';

passthru.tests = {
kubernetes-single-node = nixosTests.kubernetes.dns-single-node;
kubernetes-multi-node = nixosTests.kubernetes.dns-multi-node;
};

meta = with lib; {
homepage = "https://coredns.io";
description = "DNS server that runs middleware";
Expand Down