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

55
flake.nix
View file

@ -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;
# };
#}))
];
};
};