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

update dev env to unstable, fix composer

Browse source
This commit is contained in:
Jonas Heinrich 2024-11-05 18:27:01 +01:00
parent 14c3c659bd
commit f627adc2a7
3 changed files with 53 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

21
flake.lock generated
View file

@ -21,11 +21,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1723616342, "lastModified": 1728308049,
"narHash": "sha256-plRKXQqww7easx0wgGKAkOJH1TW/PeeB20dq9XUN8J4=", "narHash": "sha256-wjAkG8f5orZ4+wgXmEaFAJkVJS6ORqfgM0zzLEvbUNw=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nixos-shell", "repo": "nixos-shell",
"rev": "93e314cdd16d4c3e3baf25b54734461c45a5d1ad", "rev": "9373ca9522f844a3b8029720c74f340e560e4462",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -51,18 +51,17 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1726917160, "lastModified": 1730825790,
"narHash": "sha256-IZe3LIHywCj4OGIXg1cOIPmQgt/eHe1dtymEgDIuS7U=", "narHash": "sha256-3mg9ETbJWsXrF4iMaIACVfiiZe8I/+E9Wxet7C78d1I=",
"owner": "onny", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fd993fb42f510f748206b471cc0d1d26e134eefb", "rev": "ec3d46cd68eff268ed54793ab909d700117f6a66",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "onny", "id": "nixpkgs",
"ref": "nextcloud-update10", "ref": "master",
"repo": "nixpkgs", "type": "indirect"
"type": "github"
} }
}, },
"root": { "root": {

55
flake.nix
View file

@ -3,8 +3,8 @@
inputs = { inputs = {
# FIXME # FIXME
#nixpkgs.url = "nixpkgs/nixos-24.05"; #nixpkgs.url = "nixpkgs/nixos-24.11";
nixpkgs.url = "github:onny/nixpkgs/nextcloud-update10"; nixpkgs.url = "nixpkgs/master";
nixos-shell.url = "github:Mic92/nixos-shell"; nixos-shell.url = "github:Mic92/nixos-shell";
keycloak-realms.url = "github:rorosen/nixpkgs/keycloak-realm-import"; keycloak-realms.url = "github:rorosen/nixpkgs/keycloak-realm-import";
}; };
@ -31,7 +31,8 @@
devShells.x86_64-linux = { devShells.x86_64-linux = {
default = with pkgs; mkShell { default = with pkgs; mkShell {
# FIXME "composer lint" only works with PHP 8.2 at the moment # FIXME "composer lint" only works with PHP 8.2 at the moment
nativeBuildInputs = with php82Packages; [ nativeBuildInputs = with php84Packages; [
php84
composer composer
php-cs-fixer php-cs-fixer
phpunit phpunit
@ -42,30 +43,30 @@
npm-check-updates npm-check-updates
licensedigger licensedigger
reuse reuse
(eslint.overrideAttrs (oldAttrs: rec { #(eslint.overrideAttrs (oldAttrs: rec {
version = "8.57.0"; # version = "8.57.0";
src = fetchFromGitHub { # src = fetchFromGitHub {
owner = "eslint"; # owner = "eslint";
repo = "eslint"; # repo = "eslint";
rev = "refs/tags/v${version}"; # rev = "refs/tags/v${version}";
hash = "sha256-nXlS+k8FiN7rbxhMmRPb3OplHpl+8fWdn1nY0cjL75c="; # hash = "sha256-nXlS+k8FiN7rbxhMmRPb3OplHpl+8fWdn1nY0cjL75c=";
}; # };
postPatch = '' # postPatch = ''
cp ${./package-lock.json} package-lock.json # cp ${./package-lock.json} package-lock.json
''; # '';
npmDepsHash = "sha256-DiXgAD0PvIIBxPAsdU8OOJIyvYI0JyPqu6sj7XN94hE="; # npmDepsHash = "sha256-DiXgAD0PvIIBxPAsdU8OOJIyvYI0JyPqu6sj7XN94hE=";
npmDeps = pkgs.fetchNpmDeps { # npmDeps = pkgs.fetchNpmDeps {
src = lib.fileset.toSource { # src = lib.fileset.toSource {
root = ./.; # root = ./.;
fileset = lib.fileset.unions [ # fileset = lib.fileset.unions [
./package-lock.json # ./package-lock.json
./package.json # ./package.json
]; # ];
}; # };
name = "eslint-${version}-npm-deps"; # name = "eslint-${version}-npm-deps";
hash = npmDepsHash; # hash = npmDepsHash;
}; # };
})) #}))
]; ];
}; };
}; };

24
vm-nextcloud.nix
View file

@ -1,4 +1,11 @@
{ pkgs, config, lib, options, inputs, ... }: { {
pkgs,
config,
lib,
options,
inputs,
...
}: {
virtualisation = { virtualisation = {
memorySize = 8000; memorySize = 8000;
@ -19,7 +26,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
nextcloud29 = super.nextcloud29.overrideAttrs (oldAttrs: rec { nextcloud30 = super.nextcloud30.overrideAttrs (oldAttrs: rec {
installPhase = oldAttrs.installPhase + '' installPhase = oldAttrs.installPhase + ''
mkdir -p $out/ mkdir -p $out/
cp -R . $out/ cp -R . $out/
@ -35,10 +42,10 @@
# Setup Nextcloud including apps # Setup Nextcloud including apps
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud29; package = pkgs.nextcloud30;
hostName = "localhost"; hostName = "localhost";
extraApps = with config.services.nextcloud.package.packages.apps; { extraApps = with config.services.nextcloud.package.packages.apps; {
inherit contacts calendar user_oidc hmr_enabler; # whiteboard; inherit contacts calendar user_oidc hmr_enabler; # files_mindmap;
}; };
extraAppsEnable = true; extraAppsEnable = true;
config = { config = {
@ -76,6 +83,7 @@
configureRedis = true; configureRedis = true;
extraOCCCommands = '' extraOCCCommands = ''
${config.services.nextcloud.occ}/bin/nextcloud-occ app:enable cleanup ${config.services.nextcloud.occ}/bin/nextcloud-occ app:enable cleanup
${config.services.nextcloud.occ}/bin/nextcloud-occ app:enable files_mindmap2
${config.services.nextcloud.occ}/bin/nextcloud-occ user_oidc:provider Keycloak \ ${config.services.nextcloud.occ}/bin/nextcloud-occ user_oidc:provider Keycloak \
--clientid="nextcloud" \ --clientid="nextcloud" \
--clientsecret="4KoWtOWtg8xpRdAoorNan4PdfFMATo91" \ --clientsecret="4KoWtOWtg8xpRdAoorNan4PdfFMATo91" \
@ -110,7 +118,7 @@
cache = "none"; cache = "none";
}; };
#"/var/lib/nextcloud/store-apps/files_mindmap2" = { #"/var/lib/nextcloud/store-apps/files_mindmap2" = {
# target = /home/onny/projects/nixos-nextcloud-testumgebung/files_mindmap2; # target = /home/onny/projects/files_mindmap2;
# cache = "none"; # cache = "none";
#}; #};
#"/var/lib/nextcloud/server" = { #"/var/lib/nextcloud/server" = {
@ -124,8 +132,6 @@
# Setup mail server # Setup mail server
services.stalwart-mail = { services.stalwart-mail = {
enable = false; enable = false;
# FIXME remove package definition in 24.11
package = pkgs.stalwart-mail;
settings = { settings = {
tracer.stdout = { tracer.stdout = {
type = "stdout"; type = "stdout";
@ -236,7 +242,7 @@
]; ];
}; };
system.stateVersion = "24.05"; system.stateVersion = "24.11";
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
litecli litecli
@ -255,7 +261,7 @@
}; };
nix = { nix = {
package = pkgs.nixFlakes; package = pkgs.nixVersions.stable;
registry.nixpkgs.flake = inputs.nixpkgs; registry.nixpkgs.flake = inputs.nixpkgs;
settings.experimental-features = [ "nix-command" "flakes" ]; settings.experimental-features = [ "nix-command" "flakes" ];
}; };