Unverified Commit aaf57081 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #290219 from QJoly/cilium-0.15.23 

cilium-cli: 0.15.22 -> 0.15.23
parents 5d885711 b4c8de85

maintainers/maintainer-list.nix

+1 −1
Original line number Diff line number Diff line
@@ -15904,7 +15904,7 @@ 
    githubId = 10837173;

  };

  qjoly = {

    email = "github@thoughtless.eu";

    email = "github@une-pause-cafe.fr";

    github = "qjoly";

    githubId = 82603435;

    name = "Quentin JOLY";

pkgs/applications/networking/cluster/cilium/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -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 ];

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -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 { };