From ae3826393746bdcda0058715d8931114c6b05fcf Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 12 Jul 2021 09:49:13 -0300 Subject: [PATCH 1/2] linkerd_edge: 21.7.1 -> 21.7.2 --- pkgs/applications/networking/cluster/linkerd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 7b5e5810581a..9bd9a8e7a187 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -64,8 +64,8 @@ in }; edge = generic { channel = "edge"; - version = "21.7.1"; - sha256 = "sha256-VLq776A0H2IZLBeYjXpYzFixcydw/OcYsvKFxeLuewo="; - vendorSha256 = "sha256-xSOPMFHfyCmG+yTzBfKR7F5KYV0gcKRNM0UrxpGBpE4="; + version = "21.7.2"; + sha256 = "sha256-rEO84t6znNb59a9i+SHgT4r0xzja6eMYi9lWmdU24Cc="; + vendorSha256 = "sha256-esVy+oIZa/ucvucdNV7MfUGFkIql9T2zl0+eu3hZAt8="; }; } From cfd92fd38c3ee66c08242ec0b57d4f9737cd1ef8 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 12 Jul 2021 09:50:26 -0300 Subject: [PATCH 2/2] linkerd: set default channel release to stable + minor refactor --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1615b6344033..5cf6a61950e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25151,9 +25151,9 @@ in fluxcd = callPackage ../applications/networking/cluster/fluxcd { }; - linkerd_stable = (callPackage ../applications/networking/cluster/linkerd { }).stable; linkerd_edge = (callPackage ../applications/networking/cluster/linkerd { }).edge; - linkerd = linkerd_edge; + linkerd_stable = (callPackage ../applications/networking/cluster/linkerd { }).stable; + linkerd = linkerd_stable; kile-wl = callPackage ../applications/misc/kile-wl { };