onny/nixos-nextcloud-testumgebung
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update system, packages and dependencies

Browse source
This commit is contained in:
Jonas Heinrich 2024-06-23 16:08:48 +02:00
parent fa6f062830
commit 3e30171637
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
calendar

@ -1 +1 @@
Subproject commit df2d51b66631c5149e5a4d7db73c0ccad60bb6fc Subproject commit 3b327433c648c7089b3c82ca19c81ad351c8462b

8
flake.lock generated
View file

@ -35,16 +35,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1711460390, "lastModified": 1718835956,
"narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "44733514b72e732bd49f5511bd0203dea9b9a434", "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"type": "indirect" "type": "indirect"
} }
}, },

2
flake.nix
View file

@ -2,7 +2,7 @@
description = "Spawns lightweight nixos vm in a shell"; description = "Spawns lightweight nixos vm in a shell";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-23.11"; nixpkgs.url = "nixpkgs/nixos-24.05";
nixos-shell.url = "github:Mic92/nixos-shell"; nixos-shell.url = "github:Mic92/nixos-shell";
}; };

18
vm-nextcloud.nix
View file

@ -14,7 +14,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
nextcloud28 = super.nextcloud28.overrideAttrs (oldAttrs: rec { nextcloud29 = super.nextcloud29.overrideAttrs (oldAttrs: rec {
installPhase = oldAttrs.installPhase + '' installPhase = oldAttrs.installPhase + ''
mkdir -p $out/ mkdir -p $out/
cp -R . $out/ cp -R . $out/
@ -30,7 +30,7 @@
# Setup Nextcloud including apps # Setup Nextcloud including apps
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud28; package = pkgs.nextcloud29;
hostName = "localhost"; hostName = "localhost";
extraApps = with config.services.nextcloud.package.packages.apps; { extraApps = with config.services.nextcloud.package.packages.apps; {
inherit contacts calendar; inherit contacts calendar;
@ -82,8 +82,7 @@
}; };
appstoreEnable = true; appstoreEnable = true;
configureRedis = true; configureRedis = true;
# FIXME rename to settings with 24.05 settings = {
extraOptions = {
mail_smtpmode = "sendmail"; mail_smtpmode = "sendmail";
mail_sendmailmode = "pipe"; mail_sendmailmode = "pipe";
trusted_domains = [ "10.100.100.1" ]; trusted_domains = [ "10.100.100.1" ];
@ -100,10 +99,10 @@
}; };
nixos-shell.mounts.extraMounts = { nixos-shell.mounts.extraMounts = {
#"/var/lib/nextcloud/store-apps/cleanup" = { "/var/lib/nextcloud/store-apps/cleanup" = {
# target = /home/onny/projects/nixos-nextcloud-testumgebung/cleanup; target = /home/onny/projects/nixos-nextcloud-testumgebung/cleanup;
# cache = "none"; cache = "none";
#}; };
#"/var/lib/nextcloud/server" = { #"/var/lib/nextcloud/server" = {
# target = /home/onny/projects/nixos-nextcloud-testumgebung/server; # target = /home/onny/projects/nixos-nextcloud-testumgebung/server;
# cache = "none"; # cache = "none";
@ -113,6 +112,7 @@
#services.nginx.virtualHosts."localhost".root = lib.mkForce "/var/lib/nextcloud/server"; #services.nginx.virtualHosts."localhost".root = lib.mkForce "/var/lib/nextcloud/server";
# Setup mail server # Setup mail server
# FIXME maybe switchto stalwart
services.maddy = { services.maddy = {
enable = true; enable = true;
hostname = "localhost"; hostname = "localhost";
@ -153,7 +153,7 @@
}; };
}; };
system.stateVersion = "23.11"; system.stateVersion = "24.05";
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
sqlite sqldiff sqlite sqldiff