Merge pull request #260315 from twz123/update-k0sctl

k0sctl: 0.15.5 -> 0.16.0

authored by

Nick Cao and committed by
GitHub
3c6d278e 89285049

+11 -7
+11 -7
pkgs/applications/networking/cluster/k0sctl/default.nix
··· 1 1 { lib 2 - , buildGoModule 2 + , buildGo121Module 3 3 , fetchFromGitHub 4 4 , installShellFiles 5 5 }: 6 6 7 - buildGoModule rec { 7 + buildGo121Module rec { 8 8 pname = "k0sctl"; 9 - version = "0.15.5"; 9 + version = "0.16.0"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "k0sproject"; 13 13 repo = pname; 14 14 rev = "v${version}"; 15 - sha256 = "sha256-ntjrk2OEIkAmNpf9Ag6HkSIOSA3NtO9hSJOBgvne4b0="; 15 + hash = "sha256-DUDvsF4NCFimpW9isqEhodieiJXwjhwhfXR2t/ho3kE="; 16 16 }; 17 17 18 - vendorHash = "sha256-JlaXQqDO/b1xe9NA2JtuB1DZZlphWu3Mo/Mf4lhmKNo="; 18 + vendorHash = "sha256-eJTVUSAcgE1AaOCEEc202sC0yIfMj30UoK/ObowJ9Zk="; 19 19 20 20 ldflags = [ 21 21 "-s" 22 22 "-w" 23 23 "-X github.com/k0sproject/k0sctl/version.Environment=production" 24 - "-X github.com/carlmjohnson/versioninfo.Version=${version}" 25 - "-X github.com/carlmjohnson/versioninfo.Revision=${version}" 24 + "-X github.com/carlmjohnson/versioninfo.Version=v${version}" # Doesn't work currently: https://github.com/carlmjohnson/versioninfo/discussions/12 25 + "-X github.com/carlmjohnson/versioninfo.Revision=v${version}" 26 26 ]; 27 27 28 28 nativeBuildInputs = [ installShellFiles ]; 29 29 30 + # https://github.com/k0sproject/k0sctl/issues/569 31 + checkFlags = [ "-skip=^Test(Unmarshal|VersionDefaulting)/version_not_given$" ]; 32 + 30 33 postInstall = '' 31 34 for shell in bash zsh fish; do 32 35 installShellCompletion --cmd ${pname} \ ··· 38 41 description = "A bootstrapping and management tool for k0s clusters."; 39 42 homepage = "https://k0sproject.io/"; 40 43 license = licenses.asl20; 44 + mainProgram = pname; 41 45 maintainers = with maintainers; [ nickcao qjoly ]; 42 46 }; 43 47 }