From f885e0fe55be96b1770b22259fbf81b42e4457ba Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Thu, 15 Jan 2026 12:47:51 +0100 Subject: [PATCH 1/2] coredns: 1.13.2 -> 1.14.1 - go generate requires vendor deps to be present - skip the plugin parse transport-test --- pkgs/by-name/co/coredns/package.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/co/coredns/package.nix b/pkgs/by-name/co/coredns/package.nix index 982b34bd4550..2ce01637b83f 100644 --- a/pkgs/by-name/co/coredns/package.nix +++ b/pkgs/by-name/co/coredns/package.nix @@ -6,7 +6,7 @@ installShellFiles, nixosTests, externalPlugins ? [ ], - vendorHash ? "sha256-bnNpJgy54wvTST1Jtfbd1ldLJrIzTW62TL7wyHeqz28=", + vendorHash ? "sha256-3cY4Nd2RX5OKnJaQ7StYDsyq27qE1VY4wGaY4wiDeFQ=", }: let @@ -14,13 +14,13 @@ let in buildGoModule (finalAttrs: { pname = "coredns"; - version = "1.13.2"; + version = "1.14.1"; src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; tag = "v${finalAttrs.version}"; - hash = "sha256-9ggyFixdNy0t4UA8ZxU5oMUzA/8EB/k1jors4f8Q6YE="; + hash = "sha256-WcRX2BCWIQ8e0FYCIAzCdexz+Nl+/kKicQkhEw2AVMs="; }; inherit vendorHash; @@ -76,9 +76,9 @@ buildGoModule (finalAttrs: { } diff -u plugin.cfg.orig plugin.cfg || true for src in ${toString (attrsToSources externalPlugins)}; do go get $src; done + go mod vendor CC= GOOS= GOARCH= go generate go mod tidy - go mod vendor ''; modInstallPhase = '' @@ -106,6 +106,11 @@ buildGoModule (finalAttrs: { # it's a lint rather than a test of functionality, so it's safe to disable. substituteInPlace test/presubmit_test.go \ --replace-fail "TestImportOrdering" "SkipImportOrdering" + + substituteInPlace plugin/pkg/parse/transport_test.go \ + --replace-fail \ + "TestTransport" \ + "SkipTransport" '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # loopback interface is lo0 on macos From f37cd7a9f97c39d9cf7f96c8bc0898ed22cc192c Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Fri, 23 Jan 2026 00:37:59 +0100 Subject: [PATCH 2/2] coredns: skip test cases that fail due to use of network --- pkgs/by-name/co/coredns/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/co/coredns/package.nix b/pkgs/by-name/co/coredns/package.nix index 2ce01637b83f..dc4d4f26cefe 100644 --- a/pkgs/by-name/co/coredns/package.nix +++ b/pkgs/by-name/co/coredns/package.nix @@ -102,6 +102,12 @@ buildGoModule (finalAttrs: { substituteInPlace test/readme_test.go \ --replace-fail "TestReadme" "SkipReadme" + substituteInPlace test/metrics_test.go \ + --replace-fail "TestMetricsRewriteRequestSize" "SkipMetricsRewriteRequestSize" + + substituteInPlace test/quic_test.go \ + --replace-fail "TestQUICReloadDoesNotPanic" "SkipQUICReloadDoesNotPanic" + # 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. substituteInPlace test/presubmit_test.go \