diff --git a/flake.nix b/flake.nix index 7e5b432..e88529c 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,6 @@ devShells.x86_64-linux = { default = with pkgs; mkShell { - # FIXME "composer lint" only works with PHP 8.2 at the moment nativeBuildInputs = with php84Packages; [ php84 composer @@ -43,30 +42,31 @@ 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; - # }; - #})) + # FIXME nextcloud should support latest eslint version + (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; + }; + })) ]; }; };