diff --git a/pkgs/by-name/bl/bluesky-pds/package.nix b/pkgs/by-name/bl/bluesky-pds/package.nix index cd0355d27cb7..3c990477451a 100644 --- a/pkgs/by-name/bl/bluesky-pds/package.nix +++ b/pkgs/by-name/bl/bluesky-pds/package.nix @@ -8,7 +8,7 @@ fetchPnpmDeps, pnpmConfigHook, fetchFromGitHub, - nodejs_22, + nodejs_24, vips, pkg-config, nixosTests, @@ -18,22 +18,22 @@ }: let - # build failure against better-sqlite3, so we use nodejs_22; upstream - # bluesky-pds uses 20 - nodejs = nodejs_22; + # upstream bluesky-social/atproto uses nodejs 22+ + nodejs = nodejs_24; nodeSources = srcOnly nodejs; pythonEnv = python3.withPackages (p: [ p.setuptools ]); + pnpm = pnpm_9; in stdenv.mkDerivation (finalAttrs: { pname = "pds"; - version = "0.4.219"; + version = "0.4.5001"; src = fetchFromGitHub { owner = "bluesky-social"; repo = "pds"; tag = "v${finalAttrs.version}"; - hash = "sha256-zXNg1rtXN9qdTBvRlSiPlRu6k1Pv3T8nhROsEarev5U="; + hash = "sha256-j7XNZYZHHj5HdtEuTAhNU9TD7S7eMILMflZJn0nDVaY="; }; sourceRoot = "${finalAttrs.src.name}/service"; @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { pythonEnv pkg-config pnpmConfigHook - pnpm_9 + pnpm removeReferencesTo ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ @@ -61,9 +61,9 @@ stdenv.mkDerivation (finalAttrs: { src sourceRoot ; - pnpm = pnpm_9; - fetcherVersion = 3; - hash = "sha256-rZpimxX4oDXIaUdAkkNPEff6qYJ9C8KptsPWJKwPiFo="; + inherit pnpm; + fetcherVersion = 4; + hash = "sha256-3/gjhQIMxI/mwqmKV1wZ6oMiCGHutXuDY2CFSN3QnE4="; }; buildPhase = '' @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper "${lib.getExe nodejs}" "$out/bin/pds" \ --add-flags --enable-source-maps \ - --add-flags "$out/lib/pds/index.js" \ + --add-flags "$out/lib/pds/index.ts" \ --set-default NODE_ENV production runHook postBuild @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/{bin,lib/pds} mv node_modules $out/lib/pds - mv index.js $out/lib/pds + mv index.ts $out/lib/pds runHook postInstall '';