Unverified Commit 285ea04d authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

nextcloud32: init at 32.0.0 (#446632)

parents cc1a6946 7008470c

doc/release-notes/rl-2511.section.md

+4 −0
Original line number Diff line number Diff line
@@ -324,3 +324,7 @@ 
  See the neovim help page [`:help startup`](https://neovim.io/doc/user/starting.html#startup) for more information, as well as [the nixpkgs neovim wrapper documentation](#neovim-custom-configuration).



- `cloudflare-ddns`: Added package cloudflare-ddns.



- `nextcloud32`: Added for the Nextcloud 32 major release.



  See https://nextcloud.com/blog/nextcloud-hub25-autumn/ for more details on the new major version.

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

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ self-hostable cloud platform. The server setup can be automated using 
[services.nextcloud](#opt-services.nextcloud.enable). A

desktop client is packaged at `pkgs.nextcloud-client`.



The current default by NixOS is `nextcloud31` which is also the latest

The current default by NixOS is `nextcloud32` which is also the latest

major version available.



## Basic usage {#module-services-nextcloud-basic-usage}

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

+8 −4
Original line number Diff line number Diff line
@@ -441,10 +441,11 @@ in 
      description = "Which package to use for the Nextcloud instance.";

      relatedPackages = [

        "nextcloud31"

        "nextcloud32"

      ];

    };

    phpPackage = lib.mkPackageOption pkgs "php" {

      default = [ "php83" ];

      default = [ "php84" ];

      example = "php82";

    };
@@ -1028,7 +1029,7 @@ in 
      {

        warnings =

          let

            latest = 31;

            latest = 32;

            upgradeWarning = major: nixos: ''

              A legacy Nextcloud install (from before NixOS ${nixos}) may be installed.
@@ -1059,7 +1060,8 @@ in 
          ++ (lib.optional (lib.versionOlder overridePackage.version "28") (upgradeWarning 27 "24.05"))

          ++ (lib.optional (lib.versionOlder overridePackage.version "29") (upgradeWarning 28 "24.11"))

          ++ (lib.optional (lib.versionOlder overridePackage.version "30") (upgradeWarning 29 "24.11"))

          ++ (lib.optional (lib.versionOlder overridePackage.version "31") (upgradeWarning 30 "25.05"));

          ++ (lib.optional (lib.versionOlder overridePackage.version "31") (upgradeWarning 30 "25.05"))

          ++ (lib.optional (lib.versionOlder overridePackage.version "32") (upgradeWarning 31 "25.11"));



        services.nextcloud.package = lib.mkDefault (

          if pkgs ? nextcloud then
@@ -1074,8 +1076,10 @@ in 
            pkgs.nextcloud29

          else if lib.versionOlder stateVersion "25.05" then

            pkgs.nextcloud30

          else

          else if lib.versionOlder stateVersion "25.11" then

            pkgs.nextcloud31

          else

            pkgs.nextcloud32

        );



        services.nextcloud.phpOptions = lib.mkMerge [

nixos/tests/nextcloud/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -140,5 +140,6 @@ in 
listToAttrs (

  concatMap genTests [

    31

    32

  ]

)

pkgs/servers/nextcloud/default.nix

+7 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
  cacert,

  caBundle ? "${cacert}/etc/ssl/certs/ca-bundle.crt",

  nextcloud31Packages,

  nextcloud32Packages,

}:



let
@@ -63,6 +64,12 @@ in 
    packages = nextcloud31Packages;

  };



  nextcloud32 = generic {

    version = "32.0.0";

    hash = "sha256-V0SNVdm4cQLxfDY0cyA0ahslj2AXxjuVjHie/ULjRaM=";

    packages = nextcloud32Packages;

  };



  # tip: get the sha with:

  # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256'

}