Merge branch 'staging' of https://github.com/NixOS/nixpkgs

4 files changed, 12 insertions, 12 deletions

diff --git a/nixpkgs/pkgs/applications/networking/cluster/k3s/1_24/default.nix b/nixpkgs/pkgs/applications/networking/cluster/k3s/1_24/default.nix
index 6f7644dd543b..9fed570ffce2 100644
--- a/nixpkgs/pkgs/applications/networking/cluster/k3s/1_24/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/k3s/1_24/default.nix
@@ -117,7 +117,7 @@ let
   k3sCNIPlugins = buildGoModule rec {
     pname = "k3s-cni-plugins";
     version = k3sCNIVersion;
-    vendorSha256 = null;
+    vendorHash = null;
 
     subPackages = [ "." ];
 
@@ -210,7 +210,7 @@ let
       rev = "v${containerdVersion}";
       sha256 = containerdSha256;
     };
-    vendorSha256 = null;
+    vendorHash = null;
     buildInputs = [ btrfs-progs ];
     subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ];
     ldflags = versionldflags;
diff --git a/nixpkgs/pkgs/applications/networking/cluster/k3s/1_25/default.nix b/nixpkgs/pkgs/applications/networking/cluster/k3s/1_25/default.nix
index 47c3b5886c59..49eb5fcadb1f 100644
--- a/nixpkgs/pkgs/applications/networking/cluster/k3s/1_25/default.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/k3s/1_25/default.nix
@@ -116,7 +116,7 @@ let
   k3sCNIPlugins = buildGoModule rec {
     pname = "k3s-cni-plugins";
     version = k3sCNIVersion;
-    vendorSha256 = null;
+    vendorHash = null;
 
     subPackages = [ "." ];
 
@@ -208,7 +208,7 @@ let
       rev = "v${containerdVersion}";
       sha256 = containerdSha256;
     };
-    vendorSha256 = null;
+    vendorHash = null;
     buildInputs = [ btrfs-progs ];
     subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ];
     ldflags = versionldflags;
diff --git a/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/versions.nix b/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/versions.nix
index 653fb2115d70..6bf1ac2ec272 100644
--- a/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/versions.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/versions.nix
@@ -1,14 +1,14 @@
 {
-  k3sVersion = "1.27.5+k3s1";
-  k3sCommit = "8d074ecb5a8765a09eeef6f8be7987055210bc40";
-  k3sRepoSha256 = "0bv0r1l97zip9798d8r3ldymmdhlrfw3j9i0nvads1sd1d4az6m6";
-  k3sVendorSha256 = "sha256-dFLBa/Sn3GrOPWsTFkP0H2HASE8XB99Orxx5K7nnNio=";
+  k3sVersion = "1.27.6+k3s1";
+  k3sCommit = "bd04941a294793ec92e8703d5e5da14107902e88";
+  k3sRepoSha256 = "04chr8gp0yprihigy1yzhvi2baby053fav384gq0sjq6bkp3fzd8";
+  k3sVendorSha256 = "sha256-LH9OsBK0Pq/NGEHprbIgYKQsslYdR3i4LYVvo5P0K+8=";
   chartVersions = import ./chart-versions.nix;
   k3sRootVersion = "0.12.2";
   k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";
   k3sCNIVersion = "1.3.0-k3s1";
   k3sCNISha256 = "0zma9g4wvdnhs9igs03xlx15bk2nq56j73zns9xgqmfiixd9c9av";
-  containerdVersion = "1.7.3-k3s1";
-  containerdSha256 = "03352jn1igsqi23sll06mdsvdbkfhrscqa2ackwczx1a3innxv9r";
+  containerdVersion = "1.7.6-k3s1.27";
+  containerdSha256 = "1kzjqw56pcdpsqdkw2k5a3pnpf8n93dh4jc2yybgqz3nyj4fw0a8";
   criCtlVersion = "1.26.0-rc.0-k3s1";
 }
diff --git a/nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix b/nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix
index 9605ff9f9476..c9d3e0a998a0 100644
--- a/nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix
@@ -129,7 +129,7 @@ let
   k3sCNIPlugins = buildGoModule rec {
     pname = "k3s-cni-plugins";
     version = k3sCNIVersion;
-    vendorSha256 = null;
+    vendorHash = null;
 
     subPackages = [ "." ];
 
@@ -226,7 +226,7 @@ let
       rev = "v${containerdVersion}";
       sha256 = containerdSha256;
     };
-    vendorSha256 = null;
+    vendorHash = null;
     buildInputs = [ btrfs-progs ];
     subPackages = [ "cmd/containerd-shim-runc-v2" ];
     ldflags = versionldflags;