colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #290219 from QJoly/cilium-0.15.23

Browse Source 
cilium-cli: 0.15.22 -> 0.15.23
This commit is contained in:
Mario Rodas 2024-03-17 17:51:29 -05:00 committed by GitHub
commit aaf57081ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maintainers/maintainer-list.nix
View File

@ -15904,7 +15904,7 @@
githubId = 10837173; githubId = 10837173;
}; };
qjoly = { qjoly = {
email = "github@thoughtless.eu"; email = "github@une-pause-cafe.fr";
github = "qjoly"; github = "qjoly";
githubId = 82603435; githubId = 82603435;
name = "Quentin JOLY"; name = "Quentin JOLY";

8
pkgs/applications/networking/cluster/cilium/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "cilium-cli"; pname = "cilium-cli";
version = "0.15.22"; version = "0.16.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cilium"; owner = "cilium";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-tjVrcxWXE/eOeVoXnoBHYXk4rA3QqcWDbK1MRZ+v7uE="; hash = "sha256-RJJETvgLdE/fJtd1LMShJ7Hm8/s1zUybhec6YPT44wg=";
}; };
vendorHash = null; vendorHash = null;
@ -17,7 +17,7 @@ buildGoModule rec {
ldflags = [ ldflags = [
"-s" "-w" "-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: # Required to workaround install check error:
@ -26,7 +26,7 @@ buildGoModule rec {
doInstallCheck = true; doInstallCheck = true;
installCheckPhase = '' installCheckPhase = ''
$out/bin/cilium version | grep ${version} > /dev/null $out/bin/cilium version --client | grep ${version} > /dev/null
''; '';
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

4
pkgs/top-level/all-packages.nix
View File

@ -6769,7 +6769,9 @@ with pkgs;
cicero-tui = callPackage ../tools/misc/cicero-tui { }; 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 = callPackage ../tools/networking/cjdns { };
cjdns-tools = callPackage ../tools/admin/cjdns-tools { }; cjdns-tools = callPackage ../tools/admin/cjdns-tools { };