diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-01-27 12:13:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-27 12:13:45 +0800 |
| commit | 7cc38c7daebbd48c12337635e654a8cde6b66147 (patch) | |
| tree | 368120b50cb474e1bdd0608f1a985488ab18a2a5 | |
| parent | 784509f662934bd8abf457280df3f586806ab315 (diff) | |
| parent | b9c3726403a14b9fc820f5e621cc2a33218d772f (diff) | |
Merge pull request #156627 from superherointj/package-fluxcd-0.25.3
fluxcd: 0.24.1 -> 0.25.3
| -rw-r--r-- | pkgs/applications/networking/cluster/fluxcd/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 54eaf06e12fb..7ea8fa76cfb2 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.24.1"; - sha256 = "18jzf5kd06c10f45y4crvaqa5r10dhq2ashlhppzrmhigiyavxac"; - manifestsSha256 = "0qbdik65irnwgw7klj5w0z00jxflm855gikpnqb9gsxd7rbw8ysk"; + version = "0.25.3"; + sha256 = "1j7jw6vfki67dz9lkx3f94b9hi6d2bc504yy3nfppp3hx8nwxb37"; + manifestsSha256 = "1akp1i3xasfjq6zqbk7mnbkhnzmq7if7v82q6zdp2678xrg6xps5"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-HoAVdY+kZLpUEl3mE7obbTzAJUyt5MBPjGhs6ZDSnzU="; + vendorSha256 = "sha256-/VeJq6l3kSZ9qcYf2ypyyoXVKME+rig6aDdWDoRqNzA="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63961133bbe3..54e661d6af0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26793,7 +26793,10 @@ with pkgs; fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; - fluxcd = callPackage ../applications/networking/cluster/fluxcd { }; + fluxcd = callPackage ../applications/networking/cluster/fluxcd { + # Fix-Me: This locking should be removed once PR #154059 is merged. + buildGoModule = buildGo117Module; + }; linkerd = callPackage ../applications/networking/cluster/linkerd { }; linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { }; |