From 0ed130bfcba6cb537837ee5076f6e1e615c56bfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 16 Oct 2024 19:15:33 +0200 Subject: [PATCH 1/6] pnpm: 9.12.1 -> 9.12.2 --- pkgs/development/tools/pnpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 67e90744c5d0d..997d7e62bdba2 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -8,8 +8,8 @@ let hash = "sha256-2qJ6C1QbxjUyP/lsLe2ZVGf/n+bWn/ZwIVWKqa2dzDY="; }; "9" = { - version = "9.12.1"; - hash = "sha256-kUUv36RiNK5EfUbVxPxOfgpwWPkElcS293+L7ruxVOM="; + version = "9.12.2"; + hash = "sha256-LvblR7CwfYQdYFJA3OTWNWd4MRSM0w9tVkuPT5KPc9I="; }; }; From 1cd839c46b83f0e41dc3284496b2d589a580e3c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 19 Oct 2024 09:37:56 +0200 Subject: [PATCH 2/6] pnpm: add maintainer gepbird --- pkgs/development/tools/pnpm/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/pnpm/generic.nix b/pkgs/development/tools/pnpm/generic.nix index 7050df4489709..e3a0055ec3184 100644 --- a/pkgs/development/tools/pnpm/generic.nix +++ b/pkgs/development/tools/pnpm/generic.nix @@ -73,7 +73,7 @@ homepage = "https://pnpm.io/"; changelog = "https://github.com/pnpm/pnpm/releases/tag/v${finalAttrs.version}"; license = licenses.mit; - maintainers = with maintainers; [ Scrumplex ]; + maintainers = with maintainers; [ Scrumplex gepbird ]; platforms = platforms.all; mainProgram = "pnpm"; }; From c261249cad27481d868215e174a8c3c1330896dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 19 Oct 2024 09:42:56 +0200 Subject: [PATCH 3/6] OWNERS: add Scrumplex and gepbird to pnpm tools --- ci/OWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/OWNERS b/ci/OWNERS index 8decab10834db..96ba4f85b0ef7 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -351,6 +351,7 @@ pkgs/by-name/fo/forgejo/ @adamcstephens @bendlas @emilylange /pkgs/build-support/node/build-npm-package @winterqt /pkgs/build-support/node/fetch-npm-deps @winterqt /doc/languages-frameworks/javascript.section.md @winterqt +/pkgs/development/tools/pnpm @Scrumplex @gepbird # OCaml /pkgs/build-support/ocaml @ulrikstrid From b6f2a8b54a18ce449efe9410fa5fba7a9dc74b41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 19 Oct 2024 09:47:53 +0200 Subject: [PATCH 4/6] pnpm: format --- pkgs/development/tools/pnpm/default.nix | 8 +- .../tools/pnpm/fetch-deps/default.nix | 118 +++++++++--------- .../tools/pnpm/fetch-deps/serve.nix | 7 +- pkgs/development/tools/pnpm/generic.nix | 70 ++++++----- 4 files changed, 114 insertions(+), 89 deletions(-) diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 997d7e62bdba2..4e4753eff8cd0 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -1,4 +1,8 @@ -{ lib, callPackage }: +{ + lib, + callPackage, +}: + let inherit (lib) mapAttrs' nameValuePair; @@ -13,7 +17,7 @@ let }; }; - callPnpm = variant: callPackage ./generic.nix {inherit (variant) version hash;}; + callPnpm = variant: callPackage ./generic.nix { inherit (variant) version hash; }; mkPnpm = versionSuffix: variant: nameValuePair "pnpm_${versionSuffix}" (callPnpm variant); in diff --git a/pkgs/development/tools/pnpm/fetch-deps/default.nix b/pkgs/development/tools/pnpm/fetch-deps/default.nix index 4ef68fdd50c8f..d891600644069 100644 --- a/pkgs/development/tools/pnpm/fetch-deps/default.nix +++ b/pkgs/development/tools/pnpm/fetch-deps/default.nix @@ -9,6 +9,7 @@ pnpm, yq, }: + { fetchDeps = { @@ -31,76 +32,79 @@ outputHash = ""; outputHashAlgo = "sha256"; }; - installFlags = lib.optionalString (pnpmWorkspace != "") "--filter=${pnpmWorkspace}"; + installFlags = lib.optionalString (pnpmWorkspace != "") "--filter=${pnpmWorkspace}"; in - stdenvNoCC.mkDerivation (finalAttrs: ( - args' - // { - name = "${pname}-pnpm-deps"; + stdenvNoCC.mkDerivation ( + finalAttrs: + ( + args' + // { + name = "${pname}-pnpm-deps"; - nativeBuildInputs = [ - cacert - jq - moreutils - pnpm - yq - ]; + nativeBuildInputs = [ + cacert + jq + moreutils + pnpm + yq + ]; - impureEnvVars = lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - lockfileVersion="$(yq -r .lockfileVersion pnpm-lock.yaml)" - if [[ ''${lockfileVersion:0:1} -gt ${lib.versions.major pnpm.version} ]]; then - echo "ERROR: lockfileVersion $lockfileVersion in pnpm-lock.yaml is too new for the provided pnpm version ${lib.versions.major pnpm.version}!" - exit 1 - fi + lockfileVersion="$(yq -r .lockfileVersion pnpm-lock.yaml)" + if [[ ''${lockfileVersion:0:1} -gt ${lib.versions.major pnpm.version} ]]; then + echo "ERROR: lockfileVersion $lockfileVersion in pnpm-lock.yaml is too new for the provided pnpm version ${lib.versions.major pnpm.version}!" + exit 1 + fi - export HOME=$(mktemp -d) - pnpm config set store-dir $out - # Some packages produce platform dependent outputs. We do not want to cache those in the global store - pnpm config set side-effects-cache false - # As we pin pnpm versions, we don't really care about updates - pnpm config set update-notifier false - # Run any additional pnpm configuration commands that users provide. - ${prePnpmInstall} - # pnpm is going to warn us about using --force - # --force allows us to fetch all dependencies including ones that aren't meant for our host platform - pnpm install \ - --force \ - --ignore-scripts \ - ${installFlags} \ - --frozen-lockfile + export HOME=$(mktemp -d) + pnpm config set store-dir $out + # Some packages produce platform dependent outputs. We do not want to cache those in the global store + pnpm config set side-effects-cache false + # As we pin pnpm versions, we don't really care about updates + pnpm config set update-notifier false + # Run any additional pnpm configuration commands that users provide. + ${prePnpmInstall} + # pnpm is going to warn us about using --force + # --force allows us to fetch all dependencies including ones that aren't meant for our host platform + pnpm install \ + --force \ + --ignore-scripts \ + ${installFlags} \ + --frozen-lockfile - runHook postInstall - ''; + runHook postInstall + ''; - fixupPhase = '' - runHook preFixup + fixupPhase = '' + runHook preFixup - # Remove timestamp and sort the json files - rm -rf $out/v3/tmp - for f in $(find $out -name "*.json"); do - jq --sort-keys "del(.. | .checkedAt?)" $f | sponge $f - done + # Remove timestamp and sort the json files + rm -rf $out/v3/tmp + for f in $(find $out -name "*.json"); do + jq --sort-keys "del(.. | .checkedAt?)" $f | sponge $f + done - runHook postFixup - ''; + runHook postFixup + ''; - passthru = { - serve = callPackage ./serve.nix { - inherit pnpm; - pnpmDeps = finalAttrs.finalPackage; + passthru = { + serve = callPackage ./serve.nix { + inherit pnpm; + pnpmDeps = finalAttrs.finalPackage; + }; }; - }; - dontConfigure = true; - dontBuild = true; - outputHashMode = "recursive"; - } - // hash' - )); + dontConfigure = true; + dontBuild = true; + outputHashMode = "recursive"; + } + // hash' + ) + ); configHook = makeSetupHook { name = "pnpm-config-hook"; diff --git a/pkgs/development/tools/pnpm/fetch-deps/serve.nix b/pkgs/development/tools/pnpm/fetch-deps/serve.nix index a44022d841dc5..a60aaa3b928fc 100644 --- a/pkgs/development/tools/pnpm/fetch-deps/serve.nix +++ b/pkgs/development/tools/pnpm/fetch-deps/serve.nix @@ -1,4 +1,9 @@ -{ writeShellApplication, pnpm, pnpmDeps }: +{ + writeShellApplication, + pnpm, + pnpmDeps, +}: + writeShellApplication { name = "serve-pnpm-store"; diff --git a/pkgs/development/tools/pnpm/generic.nix b/pkgs/development/tools/pnpm/generic.nix index e3a0055ec3184..1c6c1dfec6d39 100644 --- a/pkgs/development/tools/pnpm/generic.nix +++ b/pkgs/development/tools/pnpm/generic.nix @@ -7,10 +7,11 @@ nodejs, testers, withNode ? true, - version, hash, -}: stdenvNoCC.mkDerivation (finalAttrs: { +}: + +stdenvNoCC.mkDerivation (finalAttrs: { pname = "pnpm"; inherit version; @@ -26,7 +27,10 @@ buildInputs = lib.optionals withNode [ nodejs ]; - nativeBuildInputs = [ installShellFiles nodejs ]; + nativeBuildInputs = [ + installShellFiles + nodejs + ]; installPhase = '' runHook preInstall @@ -40,40 +44,48 @@ ''; postInstall = - if lib.toInt (lib.versions.major version) < 9 then '' - export HOME="$PWD" - node $out/bin/pnpm install-completion bash - node $out/bin/pnpm install-completion fish - node $out/bin/pnpm install-completion zsh - sed -i '1 i#compdef pnpm' .config/tabtab/zsh/pnpm.zsh - installShellCompletion \ - .config/tabtab/bash/pnpm.bash \ - .config/tabtab/fish/pnpm.fish \ - .config/tabtab/zsh/pnpm.zsh - '' else '' - node $out/bin/pnpm completion bash >pnpm.bash - node $out/bin/pnpm completion fish >pnpm.fish - node $out/bin/pnpm completion zsh >pnpm.zsh - sed -i '1 i#compdef pnpm' pnpm.zsh - installShellCompletion pnpm.{bash,fish,zsh} - ''; + if lib.toInt (lib.versions.major version) < 9 then + '' + export HOME="$PWD" + node $out/bin/pnpm install-completion bash + node $out/bin/pnpm install-completion fish + node $out/bin/pnpm install-completion zsh + sed -i '1 i#compdef pnpm' .config/tabtab/zsh/pnpm.zsh + installShellCompletion \ + .config/tabtab/bash/pnpm.bash \ + .config/tabtab/fish/pnpm.fish \ + .config/tabtab/zsh/pnpm.zsh + '' + else + '' + node $out/bin/pnpm completion bash >pnpm.bash + node $out/bin/pnpm completion fish >pnpm.fish + node $out/bin/pnpm completion zsh >pnpm.zsh + sed -i '1 i#compdef pnpm' pnpm.zsh + installShellCompletion pnpm.{bash,fish,zsh} + ''; - passthru = let - fetchDepsAttrs = callPackages ./fetch-deps { pnpm = finalAttrs.finalPackage; }; - in { - inherit (fetchDepsAttrs) fetchDeps configHook; + passthru = + let + fetchDepsAttrs = callPackages ./fetch-deps { pnpm = finalAttrs.finalPackage; }; + in + { + inherit (fetchDepsAttrs) fetchDeps configHook; - tests.version = lib.optionalAttrs withNode ( - testers.testVersion { package = finalAttrs.finalPackage; } - ); - }; + tests.version = lib.optionalAttrs withNode ( + testers.testVersion { package = finalAttrs.finalPackage; } + ); + }; meta = with lib; { description = "Fast, disk space efficient package manager for JavaScript"; homepage = "https://pnpm.io/"; changelog = "https://github.com/pnpm/pnpm/releases/tag/v${finalAttrs.version}"; license = licenses.mit; - maintainers = with maintainers; [ Scrumplex gepbird ]; + maintainers = with maintainers; [ + Scrumplex + gepbird + ]; platforms = platforms.all; mainProgram = "pnpm"; }; From 02c8c757b84d9fed12354a49b463a30324b17577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 19 Oct 2024 10:17:45 +0200 Subject: [PATCH 5/6] pnpm: remove `with lib;` --- pkgs/development/tools/pnpm/generic.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/pnpm/generic.nix b/pkgs/development/tools/pnpm/generic.nix index 1c6c1dfec6d39..0eb8467a42746 100644 --- a/pkgs/development/tools/pnpm/generic.nix +++ b/pkgs/development/tools/pnpm/generic.nix @@ -77,16 +77,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { ); }; - meta = with lib; { + meta = { description = "Fast, disk space efficient package manager for JavaScript"; homepage = "https://pnpm.io/"; changelog = "https://github.com/pnpm/pnpm/releases/tag/v${finalAttrs.version}"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Scrumplex gepbird ]; - platforms = platforms.all; + platforms = lib.platforms.all; mainProgram = "pnpm"; }; }) From 9744efc3b0b81a8a71855869136d40820878662b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 19 Oct 2024 00:31:36 +0200 Subject: [PATCH 6/6] treewide: update pnpmDeps hashes --- pkgs/applications/audio/youtube-music/default.nix | 2 +- pkgs/applications/virtualization/podman-desktop/default.nix | 2 +- pkgs/by-name/as/astro-language-server/package.nix | 2 +- pkgs/by-name/au/autoprefixer/package.nix | 2 +- pkgs/by-name/cl/clash-verge-rev/webui.nix | 2 +- pkgs/by-name/en/en-croissant/package.nix | 2 +- pkgs/by-name/fo/follow/package.nix | 2 +- pkgs/by-name/gi/gitbutler/package.nix | 2 +- pkgs/by-name/go/goofcord/package.nix | 2 +- pkgs/by-name/ho/homebox/package.nix | 2 +- pkgs/by-name/le/legcord/package.nix | 2 +- pkgs/by-name/me/metacubexd/package.nix | 2 +- pkgs/by-name/mi/misskey/package.nix | 2 +- pkgs/by-name/n8/n8n/package.nix | 2 +- pkgs/by-name/ov/overlayed/webui.nix | 2 +- pkgs/by-name/pg/pgrok/package.nix | 2 +- pkgs/by-name/re/renovate/package.nix | 2 +- pkgs/by-name/rs/rsshub/package.nix | 2 +- pkgs/by-name/si/siyuan/package.nix | 2 +- pkgs/by-name/sk/sketchybar-app-font/package.nix | 2 +- pkgs/by-name/st/stylelint-lsp/package.nix | 2 +- pkgs/by-name/su/surrealist/package.nix | 2 +- pkgs/by-name/sy/syncyomi/package.nix | 2 +- pkgs/by-name/ta/taler-wallet-core/package.nix | 2 +- pkgs/by-name/ve/vencord/package.nix | 2 +- pkgs/by-name/ve/vesktop/package.nix | 2 +- pkgs/by-name/vi/vikunja/package.nix | 2 +- pkgs/by-name/wr/wrangler/package.nix | 2 +- pkgs/by-name/ze/zenn-cli/package.nix | 2 +- pkgs/games/heroic/default.nix | 2 +- pkgs/servers/authelia/sources.nix | 2 +- pkgs/servers/teleport/16/default.nix | 2 +- pkgs/servers/web-apps/lemmy/pin.json | 2 +- pkgs/tools/security/cdxgen/default.nix | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index 046203416a032..a3f45fee24a2f 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-lxqBmtHkyk4mnM/AJQmpyCmvhW2e96vZBkgtoREjEXY="; + hash = "sha256-6Fh1fbl7Y33EyWbWUhe70CGzhc4y+I59vPbzZydoJ18="; }; nativeBuildInputs = [ makeWrapper python3 nodejs pnpm.configHook ] diff --git a/pkgs/applications/virtualization/podman-desktop/default.nix b/pkgs/applications/virtualization/podman-desktop/default.nix index 1762e96e2a046..947def308f7ab 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/applications/virtualization/podman-desktop/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-mkWbFFv0IdLtog6uZM6xgTNlQPC+ytUQD8po8yiv/6Y="; + hash = "sha256-LPsNRd1c/cQeyBn3LZKnKeAsZ981sOkLYTnXIZL82LA="; }; patches = [ diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix index 33d0b5aedc5e6..d51829c07858b 100644 --- a/pkgs/by-name/as/astro-language-server/package.nix +++ b/pkgs/by-name/as/astro-language-server/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmWorkspace prePnpmInstall ; - hash = "sha256-zCCDlwsKPZQVEYrv85WcMY2JlWgz0tD6iHLSJg1RkRU="; + hash = "sha256-WSnXMVWuE6VC75a1bhZHGyUg6r1yMBvoQZeKdIYE7QI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/au/autoprefixer/package.nix b/pkgs/by-name/au/autoprefixer/package.nix index b9f036ee0cf0f..b1977eba41e85 100644 --- a/pkgs/by-name/au/autoprefixer/package.nix +++ b/pkgs/by-name/au/autoprefixer/package.nix @@ -24,7 +24,7 @@ pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-AKOcKly8uBohhxx9nSo8rMrm0Ebk06LHZ1Yt9yoZj7g="; + hash = "sha256-Gu2DRDx0YRlSb+EInOfmAOYKvOba6Lq1wkOW9t9fnbA="; }; installPhase = '' diff --git a/pkgs/by-name/cl/clash-verge-rev/webui.nix b/pkgs/by-name/cl/clash-verge-rev/webui.nix index c35dca01a34c6..792fbc5be8b81 100644 --- a/pkgs/by-name/cl/clash-verge-rev/webui.nix +++ b/pkgs/by-name/cl/clash-verge-rev/webui.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { pname = "${pname}-webui"; pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-DYsx1X1yXYEPFuMlvZtbJdefcCR8/wSUidFwsMy8oLk="; + hash = "sha256-ZKDhBdVyLIPf7CQaYUvj9dJd3lA3zsqroSjTyvOmunQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix index 71b2de66590cb..31bd99b51b8f1 100644 --- a/pkgs/by-name/en/en-croissant/package.nix +++ b/pkgs/by-name/en/en-croissant/package.nix @@ -37,7 +37,7 @@ buildRustPackage rec { pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; - hash = "sha256-hjSioKpvrGyo5UKvBrwln0S3aIpnJZ2PUdzBfbT7IC4="; + hash = "sha256-hvWXSegUWJvwCU5NLb2vqnl+FIWpCLxw96s9NUIgJTI="; }; cargoLock = { diff --git a/pkgs/by-name/fo/follow/package.nix b/pkgs/by-name/fo/follow/package.nix index dba8ba8eb2cc2..cb09cd001e850 100644 --- a/pkgs/by-name/fo/follow/package.nix +++ b/pkgs/by-name/fo/follow/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-JFAONU1C8pB2Hu4PJqqdqcXk9Ec+iPiAL8J+dk4oPj0="; + hash = "sha256-e9Ui3oIS0wbDLgntF7PQZCll12yvWeKLISXVoK6BjuE="; }; env = { diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix index af81f5021fca7..ea4ee4717e53c 100644 --- a/pkgs/by-name/gi/gitbutler/package.nix +++ b/pkgs/by-name/gi/gitbutler/package.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; - hash = "sha256-r2PkNDvOofginL5Y0K+7Qhnsev2zle1q9qraG/ub7Wo="; + hash = "sha256-rlEwFwN6DrOJZm1Hzy6qu7rLKQx69rRIqrScx9FExZM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/go/goofcord/package.nix b/pkgs/by-name/go/goofcord/package.nix index 16ba288e1daa9..92d46adbd7d6b 100644 --- a/pkgs/by-name/go/goofcord/package.nix +++ b/pkgs/by-name/go/goofcord/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm'.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-8i/ip0ZIo80bLb7UNO/h856CD7i3DV9QaPaNrxhViqE="; + hash = "sha256-8dSyU9arSvISc2kDWbg/CP6L4sZjZi/Zv7TZN4ONOjQ="; }; env = { diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix index a0bb01845f2e6..c24e35ba112d4 100644 --- a/pkgs/by-name/ho/homebox/package.nix +++ b/pkgs/by-name/ho/homebox/package.nix @@ -38,7 +38,7 @@ buildGo123Module { pnpmDeps = pnpm.fetchDeps { inherit pname version; src = "${src}/frontend"; - hash = "sha256-SyKET+W9Fn1WETzF4KlAtLOzNI/DOavHUbC7Yfv6kFw="; + hash = "sha256-fOb3oboNlOv/TpIrs3BsSlxIqNbbtSCE8zLMia2RIDw="; }; pnpmRoot = "../frontend"; diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix index 30d3aea41e161..b980a418cbe02 100644 --- a/pkgs/by-name/le/legcord/package.nix +++ b/pkgs/by-name/le/legcord/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-UCErcNNGAVOe1CvbYc1OSwPQzXVM5tpUUtBpLXoaQdY="; + hash = "sha256-73v8xkidY9IBUFz/M0BYEVGnoVsr3uh3jP0p6T8QBbA="; }; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; diff --git a/pkgs/by-name/me/metacubexd/package.nix b/pkgs/by-name/me/metacubexd/package.nix index fedf5ae5fd1dc..85b7083f15b97 100644 --- a/pkgs/by-name/me/metacubexd/package.nix +++ b/pkgs/by-name/me/metacubexd/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-yH7L3lb/7mfz73pWBvPCSvAlQ8hlZu+u6yLEZql8D/4="; + hash = "sha256-OFcXsAFMwY6BnyEVK9Px1g17CHCQWyPpr1My7u3XPpU="; }; buildPhase = '' diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index bc63c78924ef3..6c23db3922792 100644 --- a/pkgs/by-name/mi/misskey/package.nix +++ b/pkgs/by-name/mi/misskey/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { # https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-ZEBrYqLc0+yKbroSWk01UZwA97CyOVPhqgqFArM2U8g="; + hash = "sha256-oH4raw+zIQKY+mydteKkY0LqW+13u1408ibm30j1Wss="; }; buildPhase = '' diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index 48081b49f2f63..00df6946c213e 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-OUZpPXXGWW7ceWxpHqjQolCr+OVeVO4DgRwsU8VvgWo="; + hash = "sha256-lZLWqlR6xq7DYpnydgJK8gL7WdfZcRU+8Autzh6e7kY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ov/overlayed/webui.nix b/pkgs/by-name/ov/overlayed/webui.nix index 7105dc8eae747..80263ab64072d 100644 --- a/pkgs/by-name/ov/overlayed/webui.nix +++ b/pkgs/by-name/ov/overlayed/webui.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) src pname version; - hash = "sha256-FBJrVXTgKh8Op7TiZjA/i2LY2OOIKmqGR+GwGUecqVI="; + hash = "sha256-YTZ6uT1hcNSh+xhRvOq4q/opMOEksXT/MH3BgCnccrA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pg/pgrok/package.nix b/pkgs/by-name/pg/pgrok/package.nix index 0aed3b49f8075..5da13036fe687 100644 --- a/pkgs/by-name/pg/pgrok/package.nix +++ b/pkgs/by-name/pg/pgrok/package.nix @@ -29,7 +29,7 @@ buildGoModule { pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-1PUcISW1pC9+5HZyI9SIDRyhos5f/6aW1wa2z0OKams="; + hash = "sha256-xObDEkNGMXcUqX9thAJoE45yzd7f15k2odDWv9X3RRE="; }; vendorHash = "sha256-X5FjzliIJdfJnNaUXBjv1uq5tyjMVjBbnLCBH/P0LFM="; diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index 6f20acf9d03ee..2d47c1e879491 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -43,7 +43,7 @@ stdenv'.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-zTbwivYqNeArgwA6tePe2vExKoT/iLV3TS5ag8PlRgQ="; + hash = "sha256-AdNleEe1wVBfhhoM6xit06ql1xEz/TLhZ7qpofwQ874="; }; env.COREPACK_ENABLE_STRICT = 0; diff --git a/pkgs/by-name/rs/rsshub/package.nix b/pkgs/by-name/rs/rsshub/package.nix index 469d3531e522e..147c0bbb680d4 100644 --- a/pkgs/by-name/rs/rsshub/package.nix +++ b/pkgs/by-name/rs/rsshub/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-+tlBJGJTkxjsXS0zj6rsn2j4FIQNh70gj8pVdOa3mlU="; + hash = "sha256-mAAo4SdJ8cj8aqnbm+azcnxq8lFBvOy3BlSEKz9MA0Q="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 888707fcf63d8..5d889a6c4e81f 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { src sourceRoot ; - hash = "sha256-g6O6YE1irE3Hy+Xu7MeH97Oc4bq32IDnfP1VLSiF/U4="; + hash = "sha256-ZaurLQlM81lCGdMwvl/1YDzpC/mU08Wlgx4/MAm6un4="; }; sourceRoot = "${finalAttrs.src.name}/app"; diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix index 0a5ff82c90aea..143339093140f 100644 --- a/pkgs/by-name/sk/sketchybar-app-font/package.nix +++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-u0Rr086p6gotS+p9365+P8uKEqxDNGnWCsZDCaj8eEE="; + hash = "sha256-gS1/n4UimdPi79/a1itsh172YtBr2jvRSu+u2C4NZ70="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/st/stylelint-lsp/package.nix b/pkgs/by-name/st/stylelint-lsp/package.nix index 1a2c67b3f49ad..1cd0340220f46 100644 --- a/pkgs/by-name/st/stylelint-lsp/package.nix +++ b/pkgs/by-name/st/stylelint-lsp/package.nix @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-/QJ4buPOt5KFJxwsQp7L9WYE1RtODj4LMq21l99QwhA="; + hash = "sha256-PVA6sXbiuxqvi9u3sPoeVIJSSpSbFQHQQnTFO3w31WE="; }; buildPhase = '' diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix index 849294960b47e..82d872ea1f7b1 100644 --- a/pkgs/by-name/su/surrealist/package.nix +++ b/pkgs/by-name/su/surrealist/package.nix @@ -85,7 +85,7 @@ in stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-zGs1MWJ8TEFuHOoekCNIKQo2PBnp95xLz+R8mzeJXh8="; + hash = "sha256-Y14wBYiAsctMf4Ljt7G/twGEQP2nCSDQZVG8otImnIE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sy/syncyomi/package.nix b/pkgs/by-name/sy/syncyomi/package.nix index 81f2982a05be4..103bc58319579 100644 --- a/pkgs/by-name/sy/syncyomi/package.nix +++ b/pkgs/by-name/sy/syncyomi/package.nix @@ -27,7 +27,7 @@ buildGoModule rec { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src sourceRoot; - hash = "sha256-25Bg8sTeH/w25KdfwgZNoqBXz2d5c1QD5vGb33xpTCA="; + hash = "sha256-edcZIqshnvM3jJpZWIR/UncI0VCMLq26h/n3VvV/384="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix index fac4947858559..cdd30749f2c26 100644 --- a/pkgs/by-name/ta/taler-wallet-core/package.nix +++ b/pkgs/by-name/ta/taler-wallet-core/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-7az1wJ6BK9nPKirtW/fmXo3013JCPf+TNk/aG/mGTfo="; + hash = "sha256-+RxTTm5t0/0hLKxhWILzb0qf6aZzbOZJYJenRpX8UdA="; }; buildInputs = [ nodejs ]; diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index 7ca50671c419c..58b5d8da8aea2 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname src; - hash = "sha256-bosCE9gBFCcM3Ww6sJmhps/cl4lovXKMieYpkqAMst8="; + hash = "sha256-YBWe4MEmFu8cksOIxuTK0deO7q0QuqgOUc9WkUNBwp0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 4979bd32bd800..bfe9354534897 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { src patches ; - hash = "sha256-rizJu6v04wFEpJtakC2tfPg/uylz7gAOzJiXvUwdDI4="; + hash = "sha256-BOVjbaDbZw6H6X8o945M0Bx6fqnRQjFBviOLkTYVJ1I="; }; nativeBuildInputs = diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix index a62595242c3ea..150b1abc8fb93 100644 --- a/pkgs/by-name/vi/vikunja/package.nix +++ b/pkgs/by-name/vi/vikunja/package.nix @@ -17,7 +17,7 @@ let pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src sourceRoot; - hash = "sha256-pp4AZnoI7gON/meZalfXmaliKR/wSjkj9GTX3My678s="; + hash = "sha256-D2dOyYsdsNV1ZSQdjpy6rfoix7yBACEHj/2XyHb7HWE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix index c18ef2dd972b2..65845f5dc131e 100644 --- a/pkgs/by-name/wr/wrangler/package.nix +++ b/pkgs/by-name/wr/wrangler/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-ld2+WUVJ2DtiwWmsxkYsU3ft3knHJvjMwSwZlk7reG8="; + hash = "sha256-8EItfBV2n2rnXPCTYjDZlr/tdlEn8YOdIzOsj35w5gQ="; }; buildInputs = [ diff --git a/pkgs/by-name/ze/zenn-cli/package.nix b/pkgs/by-name/ze/zenn-cli/package.nix index e6fbacccaf7be..865f0bcd8d111 100644 --- a/pkgs/by-name/ze/zenn-cli/package.nix +++ b/pkgs/by-name/ze/zenn-cli/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-FfqBe1WQc6ditizjxYLmjb8mvCjQJMpvyUDdaW29sXY="; + hash = "sha256-AjdXclrNl1AHJ4LXq9I5Rk6KGyDaWXW187o2uLwRy/o="; }; preBuild = diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index 131dea9c0285e..ad68279740d60 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-3PiB8CT7wxGmvRuQQ5FIAmBqBm9+R55ry+N/qUYWzuk="; + hash = "sha256-/7JIeQZt3QsKrjujSucRLiHfhfSllK7FeumNA4eHqSY="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/authelia/sources.nix b/pkgs/servers/authelia/sources.nix index 66dda073909b2..c9a677b41dfcd 100644 --- a/pkgs/servers/authelia/sources.nix +++ b/pkgs/servers/authelia/sources.nix @@ -10,5 +10,5 @@ rec { hash = "sha256-brgA485sst/jXjdhKrhQilreCYBhESro9j/63g8qQg4="; }; vendorHash = "sha256-kSuIyL+6ue8voTzHTfnAYr9q4hUzIv/lkRopGSFaLv8="; - pnpmDepsHash = "sha256-NAn7ExVmN6Sk2hOFHfBYvbNgXPQDhkFmvF1sZeTMomE="; + pnpmDepsHash = "sha256-fufxoAL0z6bhRnBI4Gu61hBeUnyFYROmfResHJforfE="; } diff --git a/pkgs/servers/teleport/16/default.nix b/pkgs/servers/teleport/16/default.nix index 1b8d89fb0fe03..75104b03d1174 100644 --- a/pkgs/servers/teleport/16/default.nix +++ b/pkgs/servers/teleport/16/default.nix @@ -3,7 +3,7 @@ import ../generic.nix (args // { version = "16.2.0"; hash = "sha256-3LLoO7SNJfEfDEU7JnAhmAOIdRO+TkgiJKjT8sqzelo="; vendorHash = "sha256-iyYfht0aB9Vv2hsaqrieFHXbDhlotKQYfLn4JFqpve8="; - pnpmHash = "sha256-phDrOSFQsgA+I4PDK9LJasUBXBO8EkVtQIMx9M4v8u0="; + pnpmHash = "sha256-lcev7VwTcuCuced8uZzLoobREWtNRDFRFdfmabJPLtc="; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json index 36c61ba3d92b1..d5cb6756cc985 100644 --- a/pkgs/servers/web-apps/lemmy/pin.json +++ b/pkgs/servers/web-apps/lemmy/pin.json @@ -4,5 +4,5 @@ "serverHash": "sha256-ellHimZdbB5EQSHVsppBNYyZOODpUADvUn7u6JOu1ns=", "serverCargoHash": "sha256-UdFw8RPKYLqY98So8z9kiaVCl3b8KaqIoUMK/EV2uNM=", "uiHash": "sha256-bhbZQ8tDnJ6TWYj+ki/JQW8cbVjRfLzxaXRDX9JAIm4=", - "uiPNPMDepsHash": "sha256-aJPa46a2W8xHlDzFt0QMFQtEoUSkFQtN9VhaQOvoVio=" + "uiPNPMDepsHash": "sha256-+L6evDPMlEwWk/5qedvITHYRzu1jzB1cLiCTsauPbUI=" } diff --git a/pkgs/tools/security/cdxgen/default.nix b/pkgs/tools/security/cdxgen/default.nix index c9f85d0327fc5..8909dab33951e 100644 --- a/pkgs/tools/security/cdxgen/default.nix +++ b/pkgs/tools/security/cdxgen/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-skgRkj6LrzRN5diQVbGU0KeJBklGWM6dksbr2njMDk0="; + hash = "sha256-GdFU8mx9H3daxziprIOQWZWEBcz9y9Qk88sus838Xlk="; }; buildPhase = ''