diff --git a/pkgs/by-name/fi/filebrowser/package.nix b/pkgs/by-name/fi/filebrowser/package.nix index 47524bc3b457..6322707f1ef9 100644 --- a/pkgs/by-name/fi/filebrowser/package.nix +++ b/pkgs/by-name/fi/filebrowser/package.nix @@ -1,64 +1,61 @@ { lib, - stdenv, fetchFromGitHub, - buildGo123Module, - nodejs_22, + buildGoModule, + buildNpmPackage, pnpm_9, - + nix-update-script, nixosTests, }: let - version = "2.40.1"; + version = "2.42.5"; pnpm = pnpm_9; - nodejs = nodejs_22; src = fetchFromGitHub { owner = "filebrowser"; repo = "filebrowser"; rev = "v${version}"; - hash = "sha256-UsY5pJU0eVeYQVi7Wqf4RrBfPLQv78zHi96mTLJJS1o="; + hash = "sha256-6AZwWdYQlaQ30Q5ohi9ovlUJZZ+u7Wqc5mfRW/3t7Zs="; }; - frontend = stdenv.mkDerivation (finalAttrs: { + frontend = buildNpmPackage rec { pname = "filebrowser-frontend"; inherit version src; - nativeBuildInputs = [ - nodejs - pnpm.configHook - ]; + sourceRoot = "${src.name}/frontend"; - pnpmRoot = "frontend"; + npmConfigHook = pnpm.configHook; + npmDeps = pnpmDeps; pnpmDeps = pnpm.fetchDeps { - inherit (finalAttrs) pname version src; + inherit + pname + version + src + sourceRoot + ; fetcherVersion = 2; - sourceRoot = "${src.name}/frontend"; - hash = "sha256-AwjMQ9LDJ72x5JYdtLF4V3nxJTYiCb8e/RVyK3IwPY4="; + hash = "sha256-uGEw6Wt6hXEcYQzXYzfgo3fcCX7Hj39bLHsT1rsGy74="; }; installPhase = '' runHook preInstall - pnpm install -C frontend --frozen-lockfile - pnpm run -C frontend build - mkdir $out - mv frontend/dist $out + mv dist $out runHook postInstall ''; - }); + }; in -buildGo123Module { +buildGoModule { pname = "filebrowser"; inherit version src; - vendorHash = "sha256-FY5rPzWAzkrDaFktTM7VxO/hMk17/x21PL1sKq0zlxg="; + vendorHash = "sha256-aVtL64Cm+nqum/qHFvplpEawgMXM2S6l8QFrJBzLVtU="; excludedPackages = [ "tools" ]; @@ -71,6 +68,7 @@ buildGo123Module { ]; passthru = { + updateScript = nix-update-script { }; inherit frontend; tests = { inherit (nixosTests) filebrowser;