upgrade to nextcloud28

This commit is contained in:
Jonas Heinrich 2023-12-13 16:51:34 +01:00
parent a8f9f080d2
commit 982b8f7d7c
2 changed files with 6 additions and 11 deletions

View file

@ -1,6 +1,8 @@
{ {
inputs = { inputs = {
nixpkgs.url = "nixpkgs/23.11"; # FIXME
#nixpkgs.url = "nixpkgs/23.11";
nixpkgs.url = "github:onny/nixpkgs/nextcloud-update2";
# Required for multi platform support # Required for multi platform support
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
}; };
@ -14,13 +16,6 @@
export QEMU_NET_OPTS="hostfwd=tcp::8080-:80,hostfwd=tcp::1433-:143,hostfwd=tcp::5877-:587" export QEMU_NET_OPTS="hostfwd=tcp::8080-:80,hostfwd=tcp::1433-:143,hostfwd=tcp::5877-:587"
${pkgs.nixos-shell}/bin/nixos-shell vm-nextcloud.nix ${pkgs.nixos-shell}/bin/nixos-shell vm-nextcloud.nix
''; '';
phpunit = pkgs.phpunit.overrideAttrs (oldAttrs: rec {
version = "9.6.13";
src = pkgs.fetchurl {
url = "https://phar.phpunit.de/phpunit-${version}.phar";
hash = "sha256-1nxGBJCGBPQMyA91xbVd8baFoGoeqBkf7feFMcxdAeU=";
};
});
in in
{ {
devShell = pkgs.mkShell { devShell = pkgs.mkShell {

View file

@ -19,7 +19,7 @@
(self: super: { (self: super: {
# Remove first run wizard and password policy check from Nextcloud # Remove first run wizard and password policy check from Nextcloud
# package # package
nextcloud27 = super.nextcloud27.overrideAttrs (oldAttrs: rec { nextcloud28 = super.nextcloud28.overrideAttrs (oldAttrs: rec {
#patches = []; #patches = [];
#src = ./server; #src = ./server;
installPhase = oldAttrs.installPhase + '' installPhase = oldAttrs.installPhase + ''
@ -37,10 +37,10 @@
# Setup Nextcloud including apps # Setup Nextcloud including apps
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud27; package = pkgs.nextcloud28;
hostName = "localhost"; hostName = "localhost";
extraApps = with config.services.nextcloud.package.packages.apps; { extraApps = with config.services.nextcloud.package.packages.apps; {
inherit contacts; inherit contacts calendar;
# FIXME # FIXME
# enable hmr when debug flag is enabled # enable hmr when debug flag is enabled
hmr_enabler = pkgs.php.buildComposerProject (finalAttrs: { hmr_enabler = pkgs.php.buildComposerProject (finalAttrs: {