From 307365acaa3d481fd6cc7ea55e229b1ca6893219 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Fri, 28 Mar 2025 08:51:40 +0100 Subject: [PATCH] gitmux: unpin Go builder, disable tests Signed-off-by: Paul Meyer --- pkgs/applications/version-management/gitmux/default.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitmux/default.nix b/pkgs/applications/version-management/gitmux/default.nix index 148e26cae34f..4a74e082ca86 100644 --- a/pkgs/applications/version-management/gitmux/default.nix +++ b/pkgs/applications/version-management/gitmux/default.nix @@ -21,6 +21,12 @@ buildGoModule (finalAttrs: { nativeCheckInputs = [ git ]; + # After bump of Go toolchain to version >1.22, tests fail with: + # vendor/github.com/rogpeppe/go-internal/testscript/exe_go118.go:14:27: + # cannot use nopTestDeps{} (value of struct type nopTestDeps) as testing.testDeps value in argument to testing.MainStart: + # nopTestDeps does not implement testing.testDeps (missing method InitRuntimeCoverage)'. + doCheck = false; + ldflags = [ "-X main.version=${finalAttrs.version}" ]; passthru.tests.version = testers.testVersion { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2396c7ac802..c67d59aba9c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1387,9 +1387,7 @@ with pkgs; gitlint = python3Packages.callPackage ../applications/version-management/gitlint { }; - gitmux = callPackage ../applications/version-management/gitmux { - buildGoModule = buildGo122Module; - }; + gitmux = callPackage ../applications/version-management/gitmux { }; gittyup = libsForQt5.callPackage ../applications/version-management/gittyup { };