Upgrade nextcloud to 18

4 files changed, 17 insertions, 15 deletions

diff --git a/modules/private/websites/tools/cloud/default.nix b/modules/private/websites/tools/cloud/default.nix
index 3b6a871..e6f8ecb 100644
--- a/modules/private/websites/tools/cloud/default.nix
+++ b/modules/private/websites/tools/cloud/default.nix
@@ -79,8 +79,10 @@ in {
       user = "wwwrun";
       group = "wwwrun";
       permissions = "0600";
+      # This file is not actually included, see activationScript below
       text = ''
         <?php
+        include('${nextcloud}/version.php');
         $CONFIG = array (
           // FIXME: change this value when nextcloud starts getting slow
           'instanceid' => '${env.instance_id}1',
@@ -88,7 +90,7 @@ in {
           'passwordsalt' => '${env.password_salt}',
           'debug' => false,
           'dbtype' => 'pgsql',
-          'version' => '16.0.0.9',
+          'version' => implode($OC_Version, '.'),
           'dbname' => '${env.postgresql.database}',
           'dbhost' => '${env.postgresql.socket}',
           'dbtableprefix' => 'oc_',
@@ -139,8 +141,8 @@ in {
         cd ${nextcloud}
         NEXTCLOUD_CONFIG_DIR="${nextcloud}/config" \
           exec \
-          sudo -u wwwrun ${pkgs.php73}/bin/php \
-          -c ${pkgs.php73}/etc/php.ini \
+          sudo -u wwwrun ${pkgs.php74}/bin/php \
+          -c ${pkgs.php74}/etc/php.ini \
           occ $*
         '';
     in [ occ ];
@@ -156,7 +158,7 @@ in {
         ${builtins.concatStringsSep "\n" (lib.attrsets.mapAttrsToList (n: v:
           "install -D -m 0644 -o wwwrun -g wwwrun -T ${v} ${varDir}/config/${n}.json"
           ) confs)}
-        install -D -m 0600 -o wwwrun -g wwwrun -T /var/secrets/webapps/tools-nextcloud ${varDir}/config/config.php
+        #install -D -m 0600 -o wwwrun -g wwwrun -T /var/secrets/webapps/tools-nextcloud ${varDir}/config/config.php
       '';
     };
     # FIXME: add a warning when config.php changes
@@ -169,7 +171,7 @@ in {
       user = "wwwrun";
       group = "wwwrun";
       settings = phpFpm.pool;
-      phpPackage = pkgs.php73.withExtensions(e: pkgs.php73.enabledExtensions ++ [ e.redis e.apcu e.opcache ]);
+      phpPackage = pkgs.php74.withExtensions(e: pkgs.php74.enabledExtensions ++ [ e.redis e.apcu e.opcache ]);
     };
 
     services.cron = {
@@ -179,7 +181,7 @@ in {
           #! ${pkgs.stdenv.shell}
           export LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
           export PATH=/run/wrappers/bin:$PATH
-          ${pkgs.php73}/bin/php -d memory_limit=512M -f ${nextcloud}/cron.php
+          ${pkgs.php74}/bin/php -d memory_limit=512M -f ${nextcloud}/cron.php
           '';
       in [
         ''
diff --git a/pkgs/webapps/nextcloud/apps/deck.nix b/pkgs/webapps/nextcloud/apps/deck.nix
index f4c4f94..ec693c6 100644
--- a/pkgs/webapps/nextcloud/apps/deck.nix
+++ b/pkgs/webapps/nextcloud/apps/deck.nix
@@ -1,8 +1,8 @@
 { buildApp, nextcloudVersion }:
-assert nextcloudVersion == 17;
+assert nextcloudVersion == 18;
 buildApp rec {
   appName = "deck";
-  version = "0.8.2";
+  version = "1.0.0";
   url = "https://github.com/nextcloud/${appName}/releases/download/v${version}/${appName}.tar.gz";
-  sha256 = "0n4z1wbshahhvh3r532brzg0hgsyaf5djxpxg6hmma4ycrn4s358";
+  sha256 = "13r9vd5bf75slrzhvi6bybazhh1vcx0n4a8a7hf97bxr7pq2f91j";
 }
diff --git a/pkgs/webapps/nextcloud/apps/spreed.nix b/pkgs/webapps/nextcloud/apps/spreed.nix
index d6bd938..b52c8c5 100644
--- a/pkgs/webapps/nextcloud/apps/spreed.nix
+++ b/pkgs/webapps/nextcloud/apps/spreed.nix
@@ -1,8 +1,8 @@
 { buildApp, nextcloudVersion }:
-assert nextcloudVersion == 17;
+assert nextcloudVersion == 18;
 buildApp rec {
   appName = "spreed";
-  version = "7.0.3";
+  version = "8.0.8";
   url = "https://github.com/nextcloud/${appName}/releases/download/v${version}/${appName}-${version}.tar.gz";
-  sha256 = "09s5wabb516sfrq765hp6viag78xg349glwdxayjkbygkif0hw82";
+  sha256 = "19szk61ixzzrabs63l2fihx7k4f6a8k4kdzpa0xxzv5w9ssqjhbj";
 }
diff --git a/pkgs/webapps/nextcloud/default.nix b/pkgs/webapps/nextcloud/default.nix
index fecb3a7..3d5e114 100644
--- a/pkgs/webapps/nextcloud/default.nix
+++ b/pkgs/webapps/nextcloud/default.nix
@@ -1,4 +1,4 @@
-{ varDir ? "/var/lib/nextcloud", nextcloudVersion ? 17, otherConfig ? {}, lib, stdenv, callPackage, fetchurl }:
+{ varDir ? "/var/lib/nextcloud", nextcloudVersion ? 18, otherConfig ? {}, lib, stdenv, callPackage, fetchurl }:
 let
   appNames = [
     "apporder" "audioplayer" "bookmarks" "calendar" "carnet" "contacts"
@@ -41,11 +41,11 @@ let
     in newNextcloud;
   package = stdenv.mkDerivation rec {
     name = "nextcloud-${version}";
-    version = "${builtins.toString nextcloudVersion}.0.6";
+    version = "${builtins.toString nextcloudVersion}.0.4";
 
     src = fetchurl {
       url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-      sha256 = "0qq7lkgzsn1zakfym5bjqzpcisxmgfcdd927ddqlhddy3zvgxrxx";
+      sha256 = "0aa3f4xbkzacfw0h9aic0ywk5mqlwka83qaszizj8lmk68kf3n7s";
     };
 
     installPhase = ''