Merge pull request #326165 from NixOS/backport-325373-to-release-24.05

[Backport release-24.05] coredns: 1.11.1 -> 1.11.3
This commit is contained in:
Robert Scott 2024-07-10 23:04:11 +01:00 committed by GitHub
commit 90d9aac22b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -3,8 +3,9 @@
, buildGoModule
, fetchFromGitHub
, installShellFiles
, nixosTests
, externalPlugins ? []
, vendorHash ? "sha256-tp22jj6DNnYFQhtAFW2uLo10ty//dyNqIDH2egDgbOw="
, vendorHash ? "sha256-mp+0/DQTNsgAZTnLqcQq1HVLAfKr5vUGYSZlIvM7KpE="
}:
let
@ -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;
@ -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 = "A DNS server that runs middleware";