From def20ba1ac028d7fe4673c4dac98acbd7c9a184b Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Wed, 2 Aug 2023 07:55:17 +1000 Subject: [PATCH] =?UTF-8?q?kuma,kuma-cp,kuma-dp,kuma-experimental,kumactl:?= =?UTF-8?q?=201.8.1=20=E2=86=92=202.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/kuma/default.nix | 16 +++++++++------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index 20bba7d405dc..f662e965ff21 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -9,27 +9,28 @@ , components ? lib.optionals isFull [ "kumactl" "kuma-cp" - "kuma-prometheus-sd" "kuma-dp" ] }: buildGoModule rec { - inherit pname ; - version = "1.8.1"; - tags = lib.optionals enableGateway ["gateway"]; - vendorSha256 = "sha256-69uXHvpQMeFwQbejMpfQPS8DDXJyVsnn59WUEJpSeng="; + inherit pname; + version = "2.3.1"; + tags = lib.optionals enableGateway [ "gateway" ]; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - sha256 = "sha256-hNfgiMX3aMb8yjXjFKz73MczOeJyOI3Tna/NRSJBSzs="; + hash = "sha256-BayfHBTTqgc0ArD6ux9HOqaZy0GrEpqgDa7zHZtiG2I="; }; + vendorHash = "sha256-St+jGks7ojKrgecmN7UJ9FjGrmjtgEKsunSY+4itUyA="; + + # no test files doCheck = false; - nativeBuildInputs = [installShellFiles] ++ lib.optionals isFull [coredns]; + nativeBuildInputs = [ installShellFiles ] ++ lib.optionals isFull [ coredns ]; preBuild = '' export HOME=$TMPDIR @@ -59,6 +60,7 @@ buildGoModule rec { meta = with lib; { description = "Service mesh controller"; homepage = "https://kuma.io/"; + changelog = "https://github.com/kumahq/kuma/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ zbioe ]; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 35988a42b62e..68d9c9a1ebda 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -844,6 +844,7 @@ mapAliases ({ kubei = kubeclarity; # Added 2023-05-20 kubeless = throw "kubeless is deprecated and archived by upstream"; # Added 2022-04-05 kubicorn = throw "kubicorn has been dropped due to the lack of maintenance from upstream since 2019"; # Added 2022-05-30 + kuma-prometheus-sd = throw "kuma-prometheus-sd has been deprecated upstream"; # Added 2023-07-02 kvm = throw "'kvm' has been renamed to/replaced by 'qemu_kvm'"; # Converted to throw 2022-02-22 ### L ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc48e816f647..36e9e0a815fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32876,10 +32876,6 @@ with pkgs; components = ["kuma-dp"]; pname = "kuma-dp"; }; - kuma-prometheus-sd = callPackage ../applications/networking/cluster/kuma { - components = ["kuma-prometheus-sd"]; - pname = "kuma-prometheus-sd"; - }; kile-wl = callPackage ../applications/misc/kile-wl { };