coredns: 1.11.3 -> 1.12.2 (#416006)

This commit is contained in:
Gaétan Lepage 2025-07-14 19:56:55 +02:00 committed by GitHub
commit 4e806e6f5e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -6,21 +6,21 @@
installShellFiles, installShellFiles,
nixosTests, nixosTests,
externalPlugins ? [ ], externalPlugins ? [ ],
vendorHash ? "sha256-mp+0/DQTNsgAZTnLqcQq1HVLAfKr5vUGYSZlIvM7KpE=", vendorHash ? "sha256-Es3xy8NVDo7Xgu32jJa4lhYWGa5hJnRyDKFYQqB3aBY=",
}: }:
let let
attrsToSources = attrs: builtins.map ({ repo, version, ... }: "${repo}@${version}") attrs; attrsToSources = attrs: builtins.map ({ repo, version, ... }: "${repo}@${version}") attrs;
in in
buildGoModule rec { buildGoModule (finalAttrs: {
pname = "coredns"; pname = "coredns";
version = "1.11.3"; version = "1.12.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "coredns"; owner = "coredns";
repo = "coredns"; repo = "coredns";
rev = "v${version}"; tag = "v${finalAttrs.version}";
sha256 = "sha256-8LZMS1rAqEZ8k1IWSRkQ2O650oqHLP0P31T8oUeE4fw="; hash = "sha256-P4GhWrEACR1ZhNhGAoXWvNXYlpwnm2dz6Ggqv72zYog=";
}; };
inherit vendorHash; inherit vendorHash;
@ -95,16 +95,17 @@ buildGoModule rec {
postPatch = postPatch =
'' ''
substituteInPlace test/file_cname_proxy_test.go \ substituteInPlace test/file_cname_proxy_test.go \
--replace "TestZoneExternalCNAMELookupWithProxy" \ --replace-fail \
"SkipZoneExternalCNAMELookupWithProxy" "TestZoneExternalCNAMELookupWithProxy" \
"SkipZoneExternalCNAMELookupWithProxy"
substituteInPlace test/readme_test.go \ substituteInPlace test/readme_test.go \
--replace "TestReadme" "SkipReadme" --replace-fail "TestReadme" "SkipReadme"
# this test fails if any external plugins were imported. # this test fails if any external plugins were imported.
# it's a lint rather than a test of functionality, so it's safe to disable. # it's a lint rather than a test of functionality, so it's safe to disable.
substituteInPlace test/presubmit_test.go \ substituteInPlace test/presubmit_test.go \
--replace "TestImportOrdering" "SkipImportOrdering" --replace-fail "TestImportOrdering" "SkipImportOrdering"
'' ''
+ lib.optionalString stdenv.hostPlatform.isDarwin '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
# loopback interface is lo0 on macos # loopback interface is lo0 on macos
@ -112,9 +113,11 @@ buildGoModule rec {
# test is apparently outdated but only exhibits this on darwin # test is apparently outdated but only exhibits this on darwin
substituteInPlace test/corefile_test.go \ substituteInPlace test/corefile_test.go \
--replace "TestCorefile1" "SkipCorefile1" --replace-fail "TestCorefile1" "SkipCorefile1"
''; '';
__darwinAllowLocalNetworking = true;
postInstall = '' postInstall = ''
installManPage man/* installManPage man/*
''; '';
@ -124,15 +127,16 @@ buildGoModule rec {
kubernetes-multi-node = nixosTests.kubernetes.dns-multi-node; kubernetes-multi-node = nixosTests.kubernetes.dns-multi-node;
}; };
meta = with lib; { meta = {
homepage = "https://coredns.io"; homepage = "https://coredns.io";
description = "DNS server that runs middleware"; description = "DNS server that runs middleware";
mainProgram = "coredns"; mainProgram = "coredns";
license = licenses.asl20; license = lib.licenses.asl20;
maintainers = with maintainers; [ maintainers = with lib.maintainers; [
rushmorem
rtreffer
deltaevo deltaevo
djds
rtreffer
rushmorem
]; ];
}; };
} })