Unverified Commit 754f3be2 authored by Eric Bailey's avatar Eric Bailey Committed by GitHub
Browse files

kops: add 1.31, 1.32, 1.33, drop 1.27, 1.28, 1.29, 1.30, set default 1.33 (#413580)

parents 55f161bd 1e2cd413
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -164,6 +164,8 @@

- `programs.goldwarden` has been removed, due to the software not working with newer versions of the Bitwarden and Vaultwarden servers, as well as it being abandoned upstream.

- The default `kops` version is now 1.33.0 and versions 1.30 and older have been dropped. See [Upgrading Kubernetes](https://kops.sigs.k8s.io/tutorial/upgrading-kubernetes/) for instructions on how to update kOps.

- `Prosody` has been updated to major release 13 which removed some obsoleted modules and brought a couple of major and breaking changes:
  - The `http_files` module is now disabled by default because it now requires `http_files_dir` to be configured.
  - The `vcard_muc` module has been removed and got replaced by the inbuilt `muc_vcard` module.
+9 −15
Original line number Diff line number Diff line
@@ -71,27 +71,21 @@ in
rec {
  mkKops = generic;

  kops_1_27 = mkKops rec {
    version = "1.27.1";
    sha256 = "sha256-WV+0380yj8GHckY4PDM3WspbZ/YuYZOAQEMd2ygEOjo=";
  kops_1_31 = mkKops rec {
    version = "1.31.0";
    sha256 = "sha256-q9megrNXXKJ/YqP/fjPHh8Oji4dPK5M3HLHa+ufwRAM=";
    rev = "v${version}";
  };

  kops_1_28 = mkKops rec {
    version = "1.28.7";
    sha256 = "sha256-rTf7+w/o8MGSBKV9wCzZOEI0v31exZhOJpRABeF/KyI=";
  kops_1_32 = mkKops rec {
    version = "1.32.1";
    sha256 = "sha256-nQKeTDajtUffPBhPrPuaJ+1XWgLDUltwDQDZHkylys4=";
    rev = "v${version}";
  };

  kops_1_29 = mkKops rec {
    version = "1.29.2";
    sha256 = "sha256-SRj0x9N+yfTG/UL/hu1ds46Zt6d5SUYU0PA9lPHO6jQ=";
    rev = "v${version}";
  };

  kops_1_30 = mkKops rec {
    version = "1.30.4";
    sha256 = "sha256-f+VdgQj6tHWrn+LG6qkArjcADYfpKjuOp+bU0BTYsWY=";
  kops_1_33 = mkKops rec {
    version = "1.33.0";
    sha256 = "sha256-VnnKWcU83yqsKW54Q1tr99/Ln8ppMyB7GLl70rUFGDY=";
    rev = "v${version}";
  };
}
+4 −5
Original line number Diff line number Diff line
@@ -14810,12 +14810,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_27
    kops_1_28
    kops_1_29
    kops_1_30
    kops_1_31
    kops_1_32
    kops_1_33
    ;
  kops = kops_1_29;
  kops = kops_1_33;

  lilypond = callPackage ../misc/lilypond { };