Unverified Commit 77e77688 authored by Jonas Heinrich's avatar Jonas Heinrich Committed by GitHub
Browse files

Merge pull request #322397 from Ma27/bump-nextcloud 

nextcloud: drop 27, 28.0.6 -> 28.0.7, 29.0.2 -> 29.0.3
parents 58519c15 70d8f4cf

nixos/doc/manual/release-notes/rl-2411.section.md

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ 
  nvimpager settings: user commands in `-c` and `--cmd` now override the

  respective default settings because they are executed later.



- `pkgs.nextcloud27` has been removed since it's EOL.



- `services.forgejo.mailerPasswordFile` has been deprecated by the drop-in replacement `services.forgejo.secrets.mailer.PASSWD`,

  which is part of the new free-form `services.forgejo.secrets` option.

  `services.forgejo.secrets` is a small wrapper over systemd's `LoadCredential=`. It has the same structure (sections/keys) as

nixos/modules/services/web-apps/nextcloud.nix

+1 −3
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ in { 
    package = mkOption {

      type = types.package;

      description = "Which package to use for the Nextcloud instance.";

      relatedPackages = [ "nextcloud26" "nextcloud27" "nextcloud28" ];

      relatedPackages = [ "nextcloud28" "nextcloud29" ];

    };

    phpPackage = mkPackageOption pkgs "php" {

      example = "php82";
@@ -861,8 +861,6 @@ in { 
              nextcloud defined in an overlay, please set `services.nextcloud.package` to

              `pkgs.nextcloud`.

            ''

          else if versionOlder stateVersion "23.05" then nextcloud25

          else if versionOlder stateVersion "23.11" then nextcloud26

          else if versionOlder stateVersion "24.05" then nextcloud27

          else nextcloud29

        );

nixos/tests/nextcloud/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -109,4 +109,4 @@ let 
      ./with-objectstore.nix

    ];

in

listToAttrs (concatMap genTests [ 27 28 29 ])
 
listToAttrs (concatMap genTests [ 28 29 ])

pkgs/servers/nextcloud/default.nix

+4 −11
Original line number Diff line number Diff line 
{ lib, stdenvNoCC, fetchurl, nixosTests

, nextcloud27Packages

, nextcloud28Packages

, nextcloud29Packages

}:
@@ -42,21 +41,15 @@ let 
    };

  };

in {

  nextcloud27 = generic {

    version = "27.1.10";

    hash = "sha256-lD4ScNdxp8gNqisy5ylM6MO3e56u9yrYs4SH1YyFB1Y=";

    packages = nextcloud27Packages;

  };



  nextcloud28 = generic {

    version = "28.0.6";

    hash = "sha256-3w0zhLRHy6HhKPIggPZ4BSH4aBab6r7o6g0VW/nGa48=";

    version = "28.0.7";

    hash = "sha256-WOh1S4Ip/UTr1ykmQlaRlbi2R4xArBCaoIbIa1yrp9k=";

    packages = nextcloud28Packages;

  };



  nextcloud29 = generic {

    version = "29.0.2";

    hash = "sha256-LUnSl9w0AJICEFeCPo54oxK8APVt59hneseQWQkYqxc=";

    version = "29.0.3";

    hash = "sha256-pZludkwSCSf4hE2PWyjHNrji8ygLEgvhOivXcxzbf9Q=";

    packages = nextcloud29Packages;

  };

pkgs/servers/nextcloud/packages/27.json

deleted100644 → 0
+0 −362

File deleted.

Preview size limit exceeded, changes collapsed.