summary refs log tree commit diff
diff options
context:
space:
mode:
authorEric Bailey <eric@ericb.me>2023-10-04 18:22:19 -0500
committerEric Bailey <yurrriq@users.noreply.github.com>2023-10-04 19:27:49 -0500
commitb90ac4c0ec8fbc828ccd4d201b2f0cd9824a3053 (patch)
tree9bcdfc1831c3af14e71f2ee1f2f8d6e91612a642
parent9f20229c6cf12577bb428fb025b06138f0808384 (diff)
downloadnixpkgs-b90ac4c0ec8fbc828ccd4d201b2f0cd9824a3053.tar
nixpkgs-b90ac4c0ec8fbc828ccd4d201b2f0cd9824a3053.tar.gz
nixpkgs-b90ac4c0ec8fbc828ccd4d201b2f0cd9824a3053.tar.bz2
nixpkgs-b90ac4c0ec8fbc828ccd4d201b2f0cd9824a3053.tar.lz
nixpkgs-b90ac4c0ec8fbc828ccd4d201b2f0cd9824a3053.tar.xz
nixpkgs-b90ac4c0ec8fbc828ccd4d201b2f0cd9824a3053.tar.zst
nixpkgs-b90ac4c0ec8fbc828ccd4d201b2f0cd9824a3053.zip
kops: 1.27.1 -> 1.28.0
- Drop kops_1_25
- kops_1_26: 1.26.5 -> 1.26.6
- Update 23.11 release notes
-rw-r--r--nixos/doc/manual/release-notes/rl-2311.section.md2
-rw-r--r--pkgs/applications/networking/cluster/kops/default.nix16
-rw-r--r--pkgs/top-level/all-packages.nix4
3 files changed, 11 insertions, 11 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md
index e8562a7580c..587a08b6cf4 100644
--- a/nixos/doc/manual/release-notes/rl-2311.section.md
+++ b/nixos/doc/manual/release-notes/rl-2311.section.md
@@ -225,7 +225,7 @@
 
 - The `aseprite-unfree` package has been upgraded from 1.2.16.3 to 1.2.40. The free version of aseprite has been dropped because it is EOL and the package attribute now points to the unfree version. A maintained fork of the last free version of Aseprite, named 'LibreSprite', is available in the `libresprite` package.
 
-- The default `kops` version is now 1.27.0 and support for 1.24 and older has been dropped.
+- The default `kops` version is now 1.28.0 and support for 1.25 and older has been dropped.
 
 - `pharo` has been updated to latest stable (PharoVM 10.0.5), which is compatible with the latest stable and oldstable images (Pharo 10 and 11). The VM in question is the 64bit Spur. The 32bit version has been dropped due to lack of maintenance. The Cog VM has been deleted because it is severily outdated. Finally, the `pharo-launcher` package has been deleted because it was not compatible with the newer VM, and due to lack of maintenance.
 
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index 9494729b68d..c3ae7d5081b 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -48,15 +48,9 @@ in
 rec {
   mkKops = generic;
 
-  kops_1_25 = mkKops rec {
-    version = "1.25.4";
-    sha256 = "sha256-Q40d62D+H7CpLmrjweCy75U3LgnHEV2pFZs2Ze+koqo=";
-    rev = "v${version}";
-  };
-
   kops_1_26 = mkKops rec {
-    version = "1.26.5";
-    sha256 = "sha256-DbKzqfcQCHP3ZWJQcRhPDkKVzHB/MkcfukguUDG4UQg=";
+    version = "1.26.6";
+    sha256 = "sha256-qaehvPgB3phZl/K577hig4G4RxAUi6Im94vXP5ctnWM=";
     rev = "v${version}";
   };
 
@@ -65,4 +59,10 @@ rec {
     sha256 = "sha256-WV+0380yj8GHckY4PDM3WspbZ/YuYZOAQEMd2ygEOjo=";
     rev = "v${version}";
   };
+
+  kops_1_28 = mkKops rec {
+    version = "1.28.0";
+    sha256 = "sha256-a/3amvgGG7Gro6K7uIi20jwCo+JAlSuPB3/EUf75hxc=";
+    rev = "v${version}";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c460de1f2d2..fb1e6b072d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -40646,11 +40646,11 @@ with pkgs;
   # Exceptions are versions that we need to keep to allow upgrades from older NixOS releases
   inherit (callPackage ../applications/networking/cluster/kops {})
     mkKops
-    kops_1_25
     kops_1_26
     kops_1_27
+    kops_1_28
     ;
-  kops = kops_1_27;
+  kops = kops_1_28;
 
   lguf-brightness = callPackage ../misc/lguf-brightness { };