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

update to nixos 23.11

Browse source
This commit is contained in:
Jonas Heinrich 2023-12-09 17:37:33 +01:00
parent e47363142d
commit a8f9f080d2
5 changed files with 33 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
calendar

@ -1 +1 @@
Subproject commit 04eeeaabab222fb35a96bc43b5723e8f7d3607a4 Subproject commit df2d51b66631c5149e5a4d7db73c0ccad60bb6fc

19
flake.lock generated
View file

@ -5,11 +5,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1701680307,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -20,18 +20,17 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1695272228, "lastModified": 1701282334,
"narHash": "sha256-4uw2OdJPVyjdB+xcDst9SecrNIpxKXJ2usN3M5HVa7o=", "narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "55ac2a9d2024f15c56adf20da505b29659911da8", "rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "id": "nixpkgs",
"ref": "nixos-23.05", "ref": "23.11",
"repo": "nixpkgs", "type": "indirect"
"type": "github"
} }
}, },
"root": { "root": {

13
flake.nix
View file

@ -1,6 +1,6 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; nixpkgs.url = "nixpkgs/23.11";
# 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,14 +14,21 @@
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 {
packages = with pkgs; [ packages = with pkgs; [
phpPackages.composer php82Packages.composer
phpunit phpunit
nodejs nodejs
nodePackages.rollup nodePackages.rollup
]; ];
}; };
packages = { inherit start; }; packages = { inherit start; };

2
server

@ -1 +1 @@
Subproject commit 5de36b6941f395932ad2889afadb6952b8fd9c20 Subproject commit 28e0ccfed906525183306ff3d38b67075d688773

25
vm-nextcloud.nix
View file

@ -1,7 +1,3 @@
# Todo
# - Creating symlink to config dir
# - Patch chgrp in Nextcloud module
{ pkgs, config, lib, options, ... }: { { pkgs, config, lib, options, ... }: {
virtualisation = { virtualisation = {
@ -10,6 +6,7 @@
}; };
# FIXME # FIXME
# is it possible to extend existing module with additional options using flake?
disabledModules = [ disabledModules = [
"services/web-apps/nextcloud.nix" "services/web-apps/nextcloud.nix"
]; ];
@ -44,17 +41,19 @@
hostName = "localhost"; hostName = "localhost";
extraApps = with config.services.nextcloud.package.packages.apps; { extraApps = with config.services.nextcloud.package.packages.apps; {
inherit contacts; inherit contacts;
# FIXME
# enable hmr when debug flag is enabled
hmr_enabler = pkgs.php.buildComposerProject (finalAttrs: { hmr_enabler = pkgs.php.buildComposerProject (finalAttrs: {
pname = "hmr_enabler"; pname = "hmr_enabler";
version = "1.0.0"; version = "1.0.0";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "onny"; owner = "nextcloud";
repo = "hmr_enabler"; repo = "hmr_enabler";
rev = "85404e232344c856133e0b14e3ea30bbb8118034"; rev = "b8d3ad290bfa6fe407280587181a5167d71a2617";
hash = "sha256-mxUTWQozqcnTnlHrUtfUcsAX+X/N0fcLiUec4cGjGdg="; hash = "sha256-yXFby5zlDiPdrw6HchmBoUdu9Zjfgp/bSu0G/isRpKg=";
}; };
composerNoDev = false; composerNoDev = false;
vendorHash = "sha256-ENfs9gsXtrWP7u8+LKDMQ+hhiP3UKtn6t5lPl6wKOdQ="; vendorHash = "sha256-PCWWu/SqTUGnZXUnXyL8c72p8L14ZUqIxoa5i49XPH4=";
postInstall = '' postInstall = ''
cp -r $out/share/php/hmr_enabler/* $out/ cp -r $out/share/php/hmr_enabler/* $out/
rm -r $out/share rm -r $out/share
@ -117,16 +116,16 @@
}; };
nixos-shell.mounts.extraMounts = { nixos-shell.mounts.extraMounts = {
"/var/lib/nextcloud/calendar" = { "/var/lib/nextcloud/cleanup" = {
target = ./calendar; target = ./cleanup;
cache = "none"; cache = "none";
}; };
}; };
systemd.mounts = [ systemd.mounts = [
{ {
what = "/var/lib/nextcloud/calendar"; what = "/var/lib/nextcloud/cleanup";
where = "/var/lib/nextcloud/store-apps/calendar"; where = "/var/lib/nextcloud/store-apps/cleanup";
type = "fuse.bindfs"; type = "fuse.bindfs";
options = "uid=997,gid=997"; options = "uid=997,gid=997";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
@ -194,7 +193,7 @@
system.fsPackages = [ pkgs.bindfs ]; system.fsPackages = [ pkgs.bindfs ];
system.stateVersion = "23.05"; system.stateVersion = "23.11";
documentation = { documentation = {
info.enable = false; info.enable = false;