From f627adc2a7608f3b3bd943e23f6b7e8ecfa855dc Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 5 Nov 2024 18:27:01 +0100 Subject: [PATCH] update dev env to unstable, fix composer --- flake.lock | 21 +++++++++--------- flake.nix | 55 ++++++++++++++++++++++++------------------------ vm-nextcloud.nix | 24 +++++++++++++-------- 3 files changed, 53 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index f0ac774..8a1b5f8 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1723616342, - "narHash": "sha256-plRKXQqww7easx0wgGKAkOJH1TW/PeeB20dq9XUN8J4=", + "lastModified": 1728308049, + "narHash": "sha256-wjAkG8f5orZ4+wgXmEaFAJkVJS6ORqfgM0zzLEvbUNw=", "owner": "Mic92", "repo": "nixos-shell", - "rev": "93e314cdd16d4c3e3baf25b54734461c45a5d1ad", + "rev": "9373ca9522f844a3b8029720c74f340e560e4462", "type": "github" }, "original": { @@ -51,18 +51,17 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1726917160, - "narHash": "sha256-IZe3LIHywCj4OGIXg1cOIPmQgt/eHe1dtymEgDIuS7U=", - "owner": "onny", + "lastModified": 1730825790, + "narHash": "sha256-3mg9ETbJWsXrF4iMaIACVfiiZe8I/+E9Wxet7C78d1I=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd993fb42f510f748206b471cc0d1d26e134eefb", + "rev": "ec3d46cd68eff268ed54793ab909d700117f6a66", "type": "github" }, "original": { - "owner": "onny", - "ref": "nextcloud-update10", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "master", + "type": "indirect" } }, "root": { diff --git a/flake.nix b/flake.nix index ddd2a6a..7e5b432 100644 --- a/flake.nix +++ b/flake.nix @@ -3,8 +3,8 @@ inputs = { # FIXME - #nixpkgs.url = "nixpkgs/nixos-24.05"; - nixpkgs.url = "github:onny/nixpkgs/nextcloud-update10"; + #nixpkgs.url = "nixpkgs/nixos-24.11"; + nixpkgs.url = "nixpkgs/master"; nixos-shell.url = "github:Mic92/nixos-shell"; keycloak-realms.url = "github:rorosen/nixpkgs/keycloak-realm-import"; }; @@ -31,7 +31,8 @@ devShells.x86_64-linux = { default = with pkgs; mkShell { # FIXME "composer lint" only works with PHP 8.2 at the moment - nativeBuildInputs = with php82Packages; [ + nativeBuildInputs = with php84Packages; [ + php84 composer php-cs-fixer phpunit @@ -42,30 +43,30 @@ npm-check-updates licensedigger reuse - (eslint.overrideAttrs (oldAttrs: rec { - version = "8.57.0"; - src = fetchFromGitHub { - owner = "eslint"; - repo = "eslint"; - rev = "refs/tags/v${version}"; - hash = "sha256-nXlS+k8FiN7rbxhMmRPb3OplHpl+8fWdn1nY0cjL75c="; - }; - postPatch = '' - cp ${./package-lock.json} package-lock.json - ''; - npmDepsHash = "sha256-DiXgAD0PvIIBxPAsdU8OOJIyvYI0JyPqu6sj7XN94hE="; - npmDeps = pkgs.fetchNpmDeps { - src = lib.fileset.toSource { - root = ./.; - fileset = lib.fileset.unions [ - ./package-lock.json - ./package.json - ]; - }; - name = "eslint-${version}-npm-deps"; - hash = npmDepsHash; - }; - })) + #(eslint.overrideAttrs (oldAttrs: rec { + # version = "8.57.0"; + # src = fetchFromGitHub { + # owner = "eslint"; + # repo = "eslint"; + # rev = "refs/tags/v${version}"; + # hash = "sha256-nXlS+k8FiN7rbxhMmRPb3OplHpl+8fWdn1nY0cjL75c="; + # }; + # postPatch = '' + # cp ${./package-lock.json} package-lock.json + # ''; + # npmDepsHash = "sha256-DiXgAD0PvIIBxPAsdU8OOJIyvYI0JyPqu6sj7XN94hE="; + # npmDeps = pkgs.fetchNpmDeps { + # src = lib.fileset.toSource { + # root = ./.; + # fileset = lib.fileset.unions [ + # ./package-lock.json + # ./package.json + # ]; + # }; + # name = "eslint-${version}-npm-deps"; + # hash = npmDepsHash; + # }; + #})) ]; }; }; diff --git a/vm-nextcloud.nix b/vm-nextcloud.nix index 4c81151..f8e8bcb 100644 --- a/vm-nextcloud.nix +++ b/vm-nextcloud.nix @@ -1,4 +1,11 @@ -{ pkgs, config, lib, options, inputs, ... }: { +{ + pkgs, + config, + lib, + options, + inputs, + ... +}: { virtualisation = { memorySize = 8000; @@ -19,7 +26,7 @@ (self: super: { # Remove first run wizard and password policy check from Nextcloud # package - nextcloud29 = super.nextcloud29.overrideAttrs (oldAttrs: rec { + nextcloud30 = super.nextcloud30.overrideAttrs (oldAttrs: rec { installPhase = oldAttrs.installPhase + '' mkdir -p $out/ cp -R . $out/ @@ -35,10 +42,10 @@ # Setup Nextcloud including apps services.nextcloud = { enable = true; - package = pkgs.nextcloud29; + package = pkgs.nextcloud30; hostName = "localhost"; 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; config = { @@ -76,6 +83,7 @@ configureRedis = true; extraOCCCommands = '' ${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 \ --clientid="nextcloud" \ --clientsecret="4KoWtOWtg8xpRdAoorNan4PdfFMATo91" \ @@ -110,7 +118,7 @@ cache = "none"; }; #"/var/lib/nextcloud/store-apps/files_mindmap2" = { - # target = /home/onny/projects/nixos-nextcloud-testumgebung/files_mindmap2; + # target = /home/onny/projects/files_mindmap2; # cache = "none"; #}; #"/var/lib/nextcloud/server" = { @@ -124,8 +132,6 @@ # Setup mail server services.stalwart-mail = { enable = false; - # FIXME remove package definition in 24.11 - package = pkgs.stalwart-mail; settings = { tracer.stdout = { type = "stdout"; @@ -236,7 +242,7 @@ ]; }; - system.stateVersion = "24.05"; + system.stateVersion = "24.11"; environment.systemPackages = with pkgs; [ litecli @@ -255,7 +261,7 @@ }; nix = { - package = pkgs.nixFlakes; + package = pkgs.nixVersions.stable; registry.nixpkgs.flake = inputs.nixpkgs; settings.experimental-features = [ "nix-command" "flakes" ]; };