fix running composer lint

This commit is contained in:
Jonas Heinrich 2024-09-06 14:24:39 +02:00
parent fb792c2d26
commit 2411c37f57
4 changed files with 9 additions and 7 deletions

8
flake.lock generated
View file

@ -51,16 +51,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1725189734, "lastModified": 1725625109,
"narHash": "sha256-tkg9tgohtzIvuvb+DeryiWIKanxyYBWGQEvvsMHzT9U=", "narHash": "sha256-pMOPVZHRz7fJhuj1lfRqyJTWjAbM96vyrc0btDa56Qc=",
"owner": "onny", "owner": "onny",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "10f6fb34be099e8c8a1251a5cc65dbbff36bd9b1", "rev": "28cd3a0d7e4412e337632c1d6666d8de01cf7183",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "onny", "owner": "onny",
"ref": "hmr-enabler", "ref": "composer-update",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View file

@ -11,6 +11,7 @@
outputs = { self, nixpkgs, nixos-shell, ... }@inputs: let outputs = { self, nixpkgs, nixos-shell, ... }@inputs: let
pkgs = nixpkgs.legacyPackages.x86_64-linux; pkgs = nixpkgs.legacyPackages.x86_64-linux;
start = start =
pkgs.writeShellScriptBin "start" '' pkgs.writeShellScriptBin "start" ''
set -e set -e
@ -29,7 +30,8 @@
devShells.x86_64-linux = { devShells.x86_64-linux = {
default = with pkgs; mkShell { default = with pkgs; mkShell {
nativeBuildInputs = with php84Packages; [ # FIXME "composer lint" only works with PHP 8.2 at the moment
nativeBuildInputs = with php82Packages; [
composer composer
php-cs-fixer php-cs-fixer
phpunit phpunit

2
server

@ -1 +1 @@
Subproject commit 7d1ca956a7a09cb3777114d3c8849415382066fd Subproject commit 332b3efdf0df6bd489d83f58e8ffa677749d0774

View file

@ -122,7 +122,7 @@
# Setup mail server # Setup mail server
services.stalwart-mail = { services.stalwart-mail = {
enable = true; enable = false;
# FIXME remove package definition in 24.11 # FIXME remove package definition in 24.11
package = pkgs.stalwart-mail; package = pkgs.stalwart-mail;
settings = { settings = {