From 7c895e75941c9f9950e0367c342e1ffb09f7d8f0 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 30 Jan 2022 08:25:33 -0300 Subject: [PATCH] linkerd_edge: 21.10.3 -> 22.1.4 --- pkgs/applications/networking/cluster/linkerd/edge.nix | 6 +++--- pkgs/applications/networking/cluster/linkerd/generic.nix | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 0af651246e5e..8c8a6d92930a 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "21.10.3"; - sha256 = "09k4c0dgn9vvgp6xb20x0vylk6bbd03srk3sra8vnpywwi591mcv"; - vendorSha256 = "sha256-J/+YFXHC6UTyhln2ZDEq/EyqMEP9XcNC4GRuJjGEY3g="; + version = "22.1.4"; + sha256 = "00r58k26qnxjsqjdcqz04p21c1vvw5ls485gad0pcny370wrp65n"; + vendorSha256 = "sha256-5vYf9/BCSHJ0iydKhz+9yDg0rRXpLd+j8uD8kcKhByc="; } diff --git a/pkgs/applications/networking/cluster/linkerd/generic.nix b/pkgs/applications/networking/cluster/linkerd/generic.nix index 7722a7109c21..5601bad7104a 100644 --- a/pkgs/applications/networking/cluster/linkerd/generic.nix +++ b/pkgs/applications/networking/cluster/linkerd/generic.nix @@ -1,8 +1,9 @@ -{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: +{ lib, fetchFromGitHub, buildGo117Module, installShellFiles }: { channel, version, sha256, vendorSha256 }: -buildGoModule rec { +# Fix-Me: Unlock buildGoModule version when #154059 is merged. +buildGo117Module rec { pname = "linkerd-${channel}"; inherit version vendorSha256;