diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 07f5874226e4..9dca180063e3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15904,7 +15904,7 @@ githubId = 10837173; }; qjoly = { - email = "github@thoughtless.eu"; + email = "github@une-pause-cafe.fr"; github = "qjoly"; githubId = 82603435; name = "Quentin JOLY"; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 986ed3f09c98..2174bd7bc658 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.15.22"; + version = "0.16.0"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - hash = "sha256-tjVrcxWXE/eOeVoXnoBHYXk4rA3QqcWDbK1MRZ+v7uE="; + hash = "sha256-RJJETvgLdE/fJtd1LMShJ7Hm8/s1zUybhec6YPT44wg="; }; vendorHash = null; @@ -17,7 +17,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/cilium/cilium-cli/cli.Version=${version}" + "-X github.com/cilium/cilium-cli/defaults.CLIVersion=${version}" ]; # Required to workaround install check error: @@ -26,7 +26,7 @@ buildGoModule rec { doInstallCheck = true; installCheckPhase = '' - $out/bin/cilium version | grep ${version} > /dev/null + $out/bin/cilium version --client | grep ${version} > /dev/null ''; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00c054b9f2e2..e8122b969bfe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6769,7 +6769,9 @@ with pkgs; cicero-tui = callPackage ../tools/misc/cicero-tui { }; - cilium-cli = callPackage ../applications/networking/cluster/cilium { }; + cilium-cli = callPackage ../applications/networking/cluster/cilium { + buildGoModule = buildGo122Module; + }; cjdns = callPackage ../tools/networking/cjdns { }; cjdns-tools = callPackage ../tools/admin/cjdns-tools { };