Unverified Commit 4c336c55 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge: nextcloud29: drop (#397974)

parents 10b989b3 1efc79cc
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@
- `binwalk` was updated to 3.1.0, which has been rewritten in rust. The python module is no longer available.
  See the release notes of [3.1.0](https://github.com/ReFirmLabs/binwalk/releases/tag/v3.1.0) for more information.

- `pkgs.nextcloud28` has been removed since it's out of support upstream.
- `pkgs.nextcloud28` and `pkgs.nextcloud29` have been removed since they are out of support upstream.

- `centrifugo` was updated to v6, which uses a new config format. See [upstream documentation](https://centrifugal.dev/docs/getting-started/migration_v6) for migration.

+1 −3
Original line number Diff line number Diff line
@@ -420,7 +420,6 @@ in
      type = types.package;
      description = "Which package to use for the Nextcloud instance.";
      relatedPackages = [
        "nextcloud29"
        "nextcloud30"
        "nextcloud31"
      ];
@@ -1041,8 +1040,7 @@ in
            nextcloud31
        );

      services.nextcloud.phpPackage =
        if versionOlder cfg.package.version "29" then pkgs.php82 else pkgs.php83;
      services.nextcloud.phpPackage = pkgs.php83;

      services.nextcloud.phpOptions = mkMerge [
        (mapAttrs (const mkOptionDefault) defaultPHPSettings)
+0 −1
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ let
in
listToAttrs (
  concatMap genTests [
    29
    30
    31
  ]
+0 −7
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@
  stdenvNoCC,
  fetchurl,
  nixosTests,
  nextcloud29Packages,
  nextcloud30Packages,
  nextcloud31Packages,
}:
@@ -53,12 +52,6 @@ let
    };
in
{
  nextcloud29 = generic {
    version = "29.0.16";
    hash = "sha256-SZv2GrGe3NTlQq+GYJJDxbT0QOtbsGwrp9oML6pSUyI=";
    packages = nextcloud29Packages;
  };

  nextcloud30 = generic {
    version = "30.0.10";
    hash = "sha256-40ldF8X1yRZFQtk/Y21pasyPOLYL7HDPGtLnnHbZlbo=";
+0 −462

File deleted.

Preview size limit exceeded, changes collapsed.

Loading