[25.05] pnpm.fetchDeps: ensure consistent permissions, add versioning #425419
+173
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Also planning to (partially) backport #425149 |
nix-owners
bot
requested review from
hsjobeki,
winterqt,
GetPsyched,
fricklerhandwerk and
gepbird
nixpkgs-ci
bot
added
10.rebuild-linux: 101-500
This was referenced Jul 15, 2025
doronbehar
approved these changes
Jul 17, 2025
nixpkgs-ci
bot
added
12.approvals: 1
|
I am kinda debating backporting the treewide commit that added |
Yeah that makes sense, please do that |
(cherry picked from commit fd61e1c)
Co-authored-by: Oliver Breitwieser <[email protected]> (cherry picked from commit 71e3980)
Signed-off-by: Sefa Eyeoglu <[email protected]> (cherry picked from commit e9d0c4a)
This way we should be able to write tooling to automatically upgrade this version in the future. Signed-off-by: Sefa Eyeoglu <[email protected]> (cherry picked from commit bc888e4)
Scrumplex
force-pushed
the
25.05/pnpm.fetchDeps/fetcherVersion-2
branch
from
3be994b to
1459f0d
Compare
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
This report is automatically generated by the PR / Check / cherry-pick CI workflow.
Some of the commits in this PR require the author's and reviewer's attention.
Please follow the backporting guidelines and cherry-pick with the -x flag.
This requires changes to the unstable master and staging branches first, before backporting them.
Occasionally, it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts or when updating minor versions of packages which have already advanced to the next major on unstable.
If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.
Warning
Difference between a8819e1 and original 09a31a6 may warrant inspection.
Show diff
@@ Metadata
## Commit message ##
treewide: set `pnpm.fetchDeps` `fetcherVersion` to 1
(cherry picked from commit 09a31a6397a080b637a984a2baa81cc83d41f140)
pkgs/applications/audio/youtube-music/default.nix
@@ pkgs/applications/audio/youtube-music/default.nix: stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm.fetchDeps {
@@ pkgs/by-name/au/autobrr/package.nix
@@ pkgs/by-name/au/autobrr/package.nix: let
sourceRoot
;
hash = "sha256-TbdRJqLdNI7wchUsx2Kw1LlDyv50XlCiKyn6rhZyN1U=";
hash = "sha256-XFGxutHWk1RHnrN//WVTr4RyARIkygdG2C1Af5W0dBc=";
fetcherVersion = 1;
};
@@ pkgs/by-name/cd/cdxgen/package.nix: stdenv.mkDerivation (finalAttrs: {
buildPhase = ''
pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
-@@ pkgs/by-name/cl/clash-verge-rev/unwrapped.nix: rustPlatform.buildRustPackage {
pnpmDeps = pnpm_9.fetchDeps {
inherit pname version src;
hash = pnpm-hash;
-+ fetcherVersion = 1;
};
env = {
pkgs/by-name/co/concurrently/package.nix
@@ pkgs/by-name/co/concurrently/package.nix: stdenv.mkDerivation (finalAttrs: {
patches
@@ pkgs/by-name/de/deltachat-desktop/package.nix: stdenv.mkDerivation (finalAttrs:
nativeBuildInputs =
pkgs/by-name/do/dorion/package.nix
-@@ pkgs/by-name/do/dorion/package.nix: rustPlatform.buildRustPackage (finalAttrs: {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-xBonUzA4+1zbViEsKap6CaG6ZRldW1LjNYIB+FmVRFs=";
-+ fetcherVersion = 1;
};
CMake (webkit extension)
pkgs/by-name/em/emmet-language-server/package.nix
@@ pkgs/by-name/em/emmet-language-server/package.nix: stdenvNoCC.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_9.fetchDeps {
@@ pkgs/by-name/et/etherpad-lite/package.nix
@@ pkgs/by-name/et/etherpad-lite/package.nix: stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-n7LolizpKng7zzccytYoCwJ7uGQbMagsgYPDuq0mdxU=";
hash = "sha256-nhiPopGLCeCHiqEQ3solwuLwkDnHTH3otbxIJmbuQAA=";
fetcherVersion = 1;
};
nativeBuildInputs = [
pkgs/by-name/fe/fedistar/package.nix
-@@ pkgs/by-name/fe/fedistar/package.nix: rustPlatform.buildRustPackage (finalAttrs: {
+@@ pkgs/by-name/fe/fedistar/package.nix: let
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
inherit pname version src;
hash = "sha256-xXVsjAXmrsOp+mXrYAxSKz4vX5JApLZ+Rh6hrYlnJDI=";
fetcherVersion = 1;
};
nativeBuildInputs = [
pnpm.configHook
pkgs/by-name/fi/filebrowser/package.nix
@@ pkgs/by-name/fi/filebrowser/package.nix: let
@@ pkgs/by-name/fi/firezone-gui-client/package.nix
@@ pkgs/by-name/fi/firezone-gui-client/package.nix: let
inherit pname version;
src = "${src}/rust/gui-client";
hash = "sha256-ttbTYBuUv0vyiYzrFATF4x/zngsRXjuLPfL3qW2HEe4=";
hash = "sha256-bVWpyGwEaxYi3N6BJqOilnHJDgAykKHgRC2QKlvSm4Q=";
fetcherVersion = 1;
};
pnpmRoot = "rust/gui-client";
@@ pkgs/by-name/gi/gitbutler/package.nix: rustPlatform.buildRustPackage rec {
pkgs/by-name/gi/gitify/package.nix
@@ pkgs/by-name/gi/gitify/package.nix: stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_10.fetchDeps {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-eIvqZ9a+foYH+jXuqGz1m/4C+0Xq8mTvm7ZajKeOw58=";
hash = "sha256-mV0MgJRP5rN+RRTtKlYi29Yq8+8DMO5bMFXRmPcWx6o=";
fetcherVersion = 1;
};
@@ pkgs/by-name/ho/homepage-dashboard/package.nix
@@ pkgs/by-name/ho/homepage-dashboard/package.nix: stdenv.mkDerivation (finalAttrs: {
patches
;
hash = "sha256-aPkXHKG3vDsfYqYx9q9+2wZhuFqmPcXdoBqOfAvW9oA=";
hash = "sha256-1WsiSG+dZVpd28bBjf3EYn95sxMCXsQPd27/otWW0nI=";
fetcherVersion = 1;
};
@@ pkgs/by-name/je/jellyseerr/package.nix
@@ pkgs/by-name/je/jellyseerr/package.nix: stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-Ym16jPHMHKmojMQOuMamDsW/u+oP1UhbCP5dooTUzFQ=";
hash = "sha256-4odVuAhjc9lUxorWOqPd2ODgexk5PDSS2HtFyq0csU0=";
fetcherVersion = 1;
};
@@ pkgs/by-name/ka/karakeep/package.nix
@@ pkgs/by-name/ka/karakeep/package.nix: stdenv.mkDerivation (finalAttrs: {
};
hash = "sha256-yf8A0oZ0Y4A5k7gfinIU02Lbqp/ygyvIBlldS0pv5+0=";
hash = "sha256-2n61uKdT9Q1fobpHunRhC3Eql3fqsV+DcyaEGjYDOyY=";
fetcherVersion = 1;
};
buildPhase = ''
@@ pkgs/by-name/me/metacubexd/package.nix
@@ pkgs/by-name/me/metacubexd/package.nix: stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-Ct/YLnpZb0YBXVaghd5W1bmDcjVRladwQNRoLagHgJo=";
hash = "sha256-PmVMNSYOffo8ExNIoTkDllRXF+Kau/6QBNkYQn1DKXE=";
fetcherVersion = 1;
};
@@ pkgs/by-name/mi/misskey/package.nix
@@ pkgs/by-name/mi/misskey/package.nix: stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-T8LwpEjeWNmkIo3Dn1BCFHBsTzA/Dt6/pk/NMtvT0N4=";
hash = "sha256-YWZhm5eKjB6JGP45WC3UrIkr7vuBUI4Q3oiK8Lst3dI=";
fetcherVersion = 1;
};
@@ pkgs/by-name/n8/n8n/package.nix
@@ pkgs/by-name/n8/n8n/package.nix: stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-HzJej2Mt110n+1KX0wzuAn6j69zQOzI42EGxQB6PYbc=";
hash = "sha256-tYUbCAb2FI9NXyViDEYcpOST2LwZGx66Zwqy9sl2V1A=";
fetcherVersion = 1;
};
@@ pkgs/by-name/oc/ocis/web.nix: stdenvNoCC.mkDerivation rec {
meta = {
pkgs/by-name/op/opencloud/idp-web.nix
-@@ pkgs/by-name/op/opencloud/idp-web.nix: stdenvNoCC.mkDerivation (finalAttrs: {
inherit (finalAttrs) pname version src;
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pnpmRoot}";
hash = "sha256-yseRO1tClLTRpQj5BzMscElUlgLEzj1u8ndT1+di2+Y=";
-+ fetcherVersion = 1;
};
nativeBuildInputs = [
pkgs/by-name/op/opencloud/web.nix
-@@ pkgs/by-name/op/opencloud/web.nix: stdenvNoCC.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-7wwviWveMf+xnYmO05MI3XuPVZ/pcSqQi4sGjrEdjGc=";
-+ fetcherVersion = 1;
};
nativeBuildInputs = [
pkgs/by-name/op/openlist/frontend.nix
-@@ pkgs/by-name/op/openlist/frontend.nix: stdenvNoCC.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-PTZ+Vhg3hNnORnulkzuVg6TF/jY0PvUWYja9z7S4GdM=";
-+ fetcherVersion = 1;
};
buildPhase = ''
pkgs/by-name/ov/overlayed/package.nix
-@@ pkgs/by-name/ov/overlayed/package.nix: rustPlatform.buildRustPackage rec {
pnpmDeps = pnpm_9.fetchDeps {
inherit pname version src;
hash = "sha256-+yyxoodcDfqJ2pkosd6sMk77/71RDsGthedo1Oigwto=";
-+ fetcherVersion = 1;
};
nativeBuildInputs = [
pkgs/by-name/pa/paperless-ngx/package.nix
@@ pkgs/by-name/pa/paperless-ngx/package.nix: let
pnpmDeps = pnpm.fetchDeps {
inherit pname version src;
hash = "sha256-VtYYwpMXPAC3g1OESnw3dzLTwiGqJBQcicFZskEucok=";
hash = "sha256-yoTXlxXLcWD2DMxqjb02ZORJ+E0xE1DbZm1VL7vXM4g=";
fetcherVersion = 1;
};
@@ pkgs/by-name/pa/parca/package.nix
@@ pkgs/by-name/pa/parca/package.nix: let
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname src version;
hash = "sha256-gczEkCU9xESn9T1eVOmGAufh+24mOsYCMO6f5tcbdmQ=";
hash = "sha256-MByoIJtynv38TFNVDdZWjkJJpABCjJU2wBrChxM2rdE=";
fetcherVersion = 1;
};
@@ pkgs/by-name/pd/pds/package.nix
@@ pkgs/by-name/pd/pds/package.nix: stdenv.mkDerivation (finalAttrs: {
sourceRoot
;
hash = "sha256-KyHa7pZaCgyqzivI0Y7E6Y4yBRllYdYLnk1s0o0dyHY=";
hash = "sha256-+ESVGrgXNCQWOhqH4PM5lKQKcxE/5zxRmIboDZxgxcc=";
fetcherVersion = 1;
};
@@ pkgs/by-name/po/podman-desktop/package.nix
@@ pkgs/by-name/po/podman-desktop/package.nix: stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-8lNmCLfuAkXK1Du4iYYasRTozZf0HoAttf8Dfc6Jglw=";
hash = "sha256-IjCO2mLDHhb1fB92plBAFcH1RpmOtiUGlFHEEAAHOJ8=";
fetcherVersion = 1;
};
@@ pkgs/by-name/re/readest/package.nix
@@ pkgs/by-name/re/readest/package.nix: rustPlatform.buildRustPackage (finalAttrs: {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-lez75n3dIM4efpP+qPuDteCfMnC6wPD+L2173iJbTZM=";
hash = "sha256-Bd+7MHYBMo4N7UpwkXGmk4oQBbyBMJOtnv6iTVQgn64=";
fetcherVersion = 1;
};
@@ pkgs/by-name/re/renovate/package.nix
@@ pkgs/by-name/re/renovate/package.nix: stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-XOlFJFFyzbx8Bg92HXhVFFCI51j2GUK7+LJKfqVOQyU=";
hash = "sha256-2F4vcdu2f0yh+hvs1WWM6MsWv2mmUUhzFVWN3BQvfNk=";
fetcherVersion = 1;
};
@@ pkgs/by-name/sh/shadcn/package.nix: stdenvNoCC.mkDerivation (finalAttrs: {
nativeBuildInputs = [
pkgs/by-name/sh/sharkey/package.nix
-@@ pkgs/by-name/sh/sharkey/package.nix: stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-S8LxawbtguFOEZyYbS1FQWw/TcRm4Z6mG7dUhfXbf1c=";
-+ fetcherVersion = 1;
};
nativeBuildInputs =
pkgs/by-name/si/signal-desktop/package.nix
@@ pkgs/by-name/si/signal-desktop/package.nix: let
pnpmDeps = pnpm.fetchDeps {
@@ pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix: stdenv.mkDerivation (finalA
pkgs/by-name/si/siyuan/package.nix
@@ pkgs/by-name/si/siyuan/package.nix: stdenv.mkDerivation (finalAttrs: {
postPatch
sourceRoot
;
hash = "sha256-eSf4mpKBm1G4K9+V6VXEiPrIVQMyru7o9BGVIUycQaQ=";
[...truncated...]Warning
Difference between 7ff9a32 and original a8c9a2a may warrant inspection.
Show diff
@@ Commit message
occurrences.
Signed-off-by: Sefa Eyeoglu <[email protected]>
(cherry picked from commit a8c9a2aa3e2a3fe0762b4b08b12b0f398b2d57b5)
Signed-off-by: Sefa Eyeoglu <[email protected]>
pkgs/applications/audio/youtube-music/default.nix
@@ pkgs/applications/audio/youtube-music/default.nix: stdenv.mkDerivation (finalAttrs: {
@@ pkgs/by-name/au/autobrr/package.nix: let
src
sourceRoot
;
-- hash = "sha256-TbdRJqLdNI7wchUsx2Kw1LlDyv50XlCiKyn6rhZyN1U=";
+- hash = "sha256-XFGxutHWk1RHnrN//WVTr4RyARIkygdG2C1Af5W0dBc=";
fetcherVersion = 1;
-+ hash = "sha256-TbdRJqLdNI7wchUsx2Kw1LlDyv50XlCiKyn6rhZyN1U=";
++ hash = "sha256-XFGxutHWk1RHnrN//WVTr4RyARIkygdG2C1Af5W0dBc=";
};
postBuild = ''
@@ pkgs/by-name/ba/backrest/package.nix: let
buildPhase = ''
pkgs/by-name/ba/bash-language-server/package.nix
-@@ pkgs/by-name/ba/bash-language-server/package.nix: stdenvNoCC.mkDerivation (finalAttrs: {
+@@ pkgs/by-name/ba/bash-language-server/package.nix: stdenv.mkDerivation (finalAttrs: {
src
pnpmWorkspaces
;
-- hash = "sha256-NvyqPv5OKgZi3hW98Da8LhsYatmrzrPX8kLOfLr+BrI=";
+- hash = "sha256-W25xehcxncBs9QgQBt17F5YHK0b+GDEmt27XzTkyYWg=";
fetcherVersion = 1;
-+ hash = "sha256-NvyqPv5OKgZi3hW98Da8LhsYatmrzrPX8kLOfLr+BrI=";
++ hash = "sha256-W25xehcxncBs9QgQBt17F5YHK0b+GDEmt27XzTkyYWg=";
};
nativeBuildInputs = [
@@ pkgs/by-name/cd/cdxgen/package.nix: stdenv.mkDerivation (finalAttrs: {
buildPhase = ''
pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
-@@ pkgs/by-name/cl/clash-verge-rev/unwrapped.nix: rustPlatform.buildRustPackage {
pnpmDeps = pnpm_9.fetchDeps {
inherit pname version src;
-- hash = pnpm-hash;
fetcherVersion = 1;
-+ hash = pnpm-hash;
};
env = {
pkgs/by-name/co/concurrently/package.nix
@@ pkgs/by-name/co/concurrently/package.nix: stdenv.mkDerivation (finalAttrs: {
src
@@ pkgs/by-name/de/deltachat-desktop/package.nix: stdenv.mkDerivation (finalAttrs:
nativeBuildInputs =
pkgs/by-name/do/dorion/package.nix
-@@ pkgs/by-name/do/dorion/package.nix: rustPlatform.buildRustPackage (finalAttrs: {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
-- hash = "sha256-xBonUzA4+1zbViEsKap6CaG6ZRldW1LjNYIB+FmVRFs=";
fetcherVersion = 1;
-+ hash = "sha256-xBonUzA4+1zbViEsKap6CaG6ZRldW1LjNYIB+FmVRFs=";
};
CMake (webkit extension)
pkgs/by-name/em/emmet-language-server/package.nix
@@ pkgs/by-name/em/emmet-language-server/package.nix: stdenvNoCC.mkDerivation (finalAttrs: {
@@ pkgs/by-name/et/etherpad-lite/package.nix: stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
-- hash = "sha256-n7LolizpKng7zzccytYoCwJ7uGQbMagsgYPDuq0mdxU=";
+- hash = "sha256-nhiPopGLCeCHiqEQ3solwuLwkDnHTH3otbxIJmbuQAA=";
fetcherVersion = 1;
-+ hash = "sha256-n7LolizpKng7zzccytYoCwJ7uGQbMagsgYPDuq0mdxU=";
++ hash = "sha256-nhiPopGLCeCHiqEQ3solwuLwkDnHTH3otbxIJmbuQAA=";
};
nativeBuildInputs = [
pkgs/by-name/fe/fedistar/package.nix
-@@ pkgs/by-name/fe/fedistar/package.nix: rustPlatform.buildRustPackage (finalAttrs: {
+@@ pkgs/by-name/fe/fedistar/package.nix: let
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
-- hash = "sha256-xXVsjAXmrsOp+mXrYAxSKz4vX5JApLZ+Rh6hrYlnJDI=";
fetcherVersion = 1;
-+ hash = "sha256-xXVsjAXmrsOp+mXrYAxSKz4vX5JApLZ+Rh6hrYlnJDI=";
inherit pname version src;
hash = "sha256-xXVsjAXmrsOp+mXrYAxSKz4vX5JApLZ+Rh6hrYlnJDI=";
+- fetcherVersion = 1;
};
nativeBuildInputs = [
pnpm.configHook
pkgs/by-name/fi/filebrowser/package.nix
@@ pkgs/by-name/fi/filebrowser/package.nix: let
@@ pkgs/by-name/fi/firezone-gui-client/package.nix: let
pnpmDeps = pnpm_9.fetchDeps {
inherit pname version;
src = "${src}/rust/gui-client";
-- hash = "sha256-ttbTYBuUv0vyiYzrFATF4x/zngsRXjuLPfL3qW2HEe4=";
+- hash = "sha256-bVWpyGwEaxYi3N6BJqOilnHJDgAykKHgRC2QKlvSm4Q=";
fetcherVersion = 1;
-+ hash = "sha256-ttbTYBuUv0vyiYzrFATF4x/zngsRXjuLPfL3qW2HEe4=";
++ hash = "sha256-bVWpyGwEaxYi3N6BJqOilnHJDgAykKHgRC2QKlvSm4Q=";
};
pnpmRoot = "rust/gui-client";
@@ pkgs/by-name/gi/gitbutler/package.nix: rustPlatform.buildRustPackage rec {
pkgs/by-name/gi/gitify/package.nix
@@ pkgs/by-name/gi/gitify/package.nix: stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_10.fetchDeps {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
-- hash = "sha256-eIvqZ9a+foYH+jXuqGz1m/4C+0Xq8mTvm7ZajKeOw58=";
+- hash = "sha256-mV0MgJRP5rN+RRTtKlYi29Yq8+8DMO5bMFXRmPcWx6o=";
fetcherVersion = 1;
-+ hash = "sha256-eIvqZ9a+foYH+jXuqGz1m/4C+0Xq8mTvm7ZajKeOw58=";
++ hash = "sha256-mV0MgJRP5rN+RRTtKlYi29Yq8+8DMO5bMFXRmPcWx6o=";
};
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
@@ pkgs/by-name/ho/homepage-dashboard/package.nix: stdenv.mkDerivation (finalAttrs:
src
patches
;
-- hash = "sha256-aPkXHKG3vDsfYqYx9q9+2wZhuFqmPcXdoBqOfAvW9oA=";
+- hash = "sha256-1WsiSG+dZVpd28bBjf3EYn95sxMCXsQPd27/otWW0nI=";
fetcherVersion = 1;
-+ hash = "sha256-aPkXHKG3vDsfYqYx9q9+2wZhuFqmPcXdoBqOfAvW9oA=";
++ hash = "sha256-1WsiSG+dZVpd28bBjf3EYn95sxMCXsQPd27/otWW0nI=";
};
nativeBuildInputs = [
@@ pkgs/by-name/je/jellyseerr/package.nix: stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
-- hash = "sha256-Ym16jPHMHKmojMQOuMamDsW/u+oP1UhbCP5dooTUzFQ=";
+- hash = "sha256-4odVuAhjc9lUxorWOqPd2ODgexk5PDSS2HtFyq0csU0=";
fetcherVersion = 1;
-+ hash = "sha256-Ym16jPHMHKmojMQOuMamDsW/u+oP1UhbCP5dooTUzFQ=";
++ hash = "sha256-4odVuAhjc9lUxorWOqPd2ODgexk5PDSS2HtFyq0csU0=";
};
buildInputs = [ sqlite ];
@@ pkgs/by-name/ka/karakeep/package.nix: stdenv.mkDerivation (finalAttrs: {
'';
};
-- hash = "sha256-yf8A0oZ0Y4A5k7gfinIU02Lbqp/ygyvIBlldS0pv5+0=";
+- hash = "sha256-2n61uKdT9Q1fobpHunRhC3Eql3fqsV+DcyaEGjYDOyY=";
fetcherVersion = 1;
-+ hash = "sha256-yf8A0oZ0Y4A5k7gfinIU02Lbqp/ygyvIBlldS0pv5+0=";
++ hash = "sha256-2n61uKdT9Q1fobpHunRhC3Eql3fqsV+DcyaEGjYDOyY=";
};
buildPhase = ''
runHook preBuild
@@ pkgs/by-name/me/metacubexd/package.nix: stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
-- hash = "sha256-Ct/YLnpZb0YBXVaghd5W1bmDcjVRladwQNRoLagHgJo=";
+- hash = "sha256-PmVMNSYOffo8ExNIoTkDllRXF+Kau/6QBNkYQn1DKXE=";
fetcherVersion = 1;
-+ hash = "sha256-Ct/YLnpZb0YBXVaghd5W1bmDcjVRladwQNRoLagHgJo=";
++ hash = "sha256-PmVMNSYOffo8ExNIoTkDllRXF+Kau/6QBNkYQn1DKXE=";
};
buildPhase = ''
@@ pkgs/by-name/mi/misskey/package.nix: stdenv.mkDerivation (finalAttrs: {
# https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
-- hash = "sha256-T8LwpEjeWNmkIo3Dn1BCFHBsTzA/Dt6/pk/NMtvT0N4=";
+- hash = "sha256-YWZhm5eKjB6JGP45WC3UrIkr7vuBUI4Q3oiK8Lst3dI=";
fetcherVersion = 1;
-+ hash = "sha256-T8LwpEjeWNmkIo3Dn1BCFHBsTzA/Dt6/pk/NMtvT0N4=";
++ hash = "sha256-YWZhm5eKjB6JGP45WC3UrIkr7vuBUI4Q3oiK8Lst3dI=";
};
buildPhase = ''
@@ pkgs/by-name/n8/n8n/package.nix: stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs) pname version src;
-- hash = "sha256-HzJej2Mt110n+1KX0wzuAn6j69zQOzI42EGxQB6PYbc=";
+- hash = "sha256-tYUbCAb2FI9NXyViDEYcpOST2LwZGx66Zwqy9sl2V1A=";
fetcherVersion = 1;
-+ hash = "sha256-HzJej2Mt110n+1KX0wzuAn6j69zQOzI42EGxQB6PYbc=";
++ hash = "sha256-tYUbCAb2FI9NXyViDEYcpOST2LwZGx66Zwqy9sl2V1A=";
};
nativeBuildInputs =
@@ pkgs/by-name/oc/ocis/web.nix: stdenvNoCC.mkDerivation rec {
meta = {
pkgs/by-name/op/opencloud/idp-web.nix
-@@ pkgs/by-name/op/opencloud/idp-web.nix: stdenvNoCC.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs) pname version src;
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pnpmRoot}";
-- hash = "sha256-NW7HK2B9h5JprK3JcIGi/OHcyoa5VTs/P0s3BZr+4FU=";
fetcherVersion = 1;
-+ hash = "sha256-NW7HK2B9h5JprK3JcIGi/OHcyoa5VTs/P0s3BZr+4FU=";
};
nativeBuildInputs = [
pkgs/by-name/op/opencloud/web.nix
-@@ pkgs/by-name/op/opencloud/web.nix: stdenvNoCC.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs) pname version src;
-- hash = "sha256-vxZxwbJByTk45GDD2FNphMMdeLlF8uxyrlc9x42crNA=";
fetcherVersion = 1;
-+ hash = "sha256-vxZxwbJByTk45GDD2FNphMMdeLlF8uxyrlc9x42crNA=";
};
nativeBuildInputs = [
pkgs/by-name/op/openlist/frontend.nix
-@@ pkgs/by-name/op/openlist/frontend.nix: stdenvNoCC.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs) pname version src;
-- hash = "sha256-PTZ+Vhg3hNnORnulkzuVg6TF/jY0PvUWYja9z7S4GdM=";
fetcherVersion = 1;
-+ hash = "sha256-PTZ+Vhg3hNnORnulkzuVg6TF/jY0PvUWYja9z7S4GdM=";
};
buildPhase = ''
pkgs/by-name/ov/overlayed/package.nix
-@@ pkgs/by-name/ov/overlayed/package.nix: rustPlatform.buildRustPackage rec {
pnpmDeps = pnpm_9.fetchDeps {
inherit pname version src;
-- hash = "sha256-+yyxoodcDfqJ2pkosd6sMk77/71RDsGthedo1Oigwto=";
fetcherVersion = 1;
-+ hash = "sha256-+yyxoodcDfqJ2pkosd6sMk77/71RDsGthedo1Oigwto=";
};
nativeBuildInputs = [
pkgs/by-name/pa/paperless-ngx/package.nix
@@ pkgs/by-name/pa/paperless-ngx/package.nix: let
pnpmDeps = pnpm.fetchDeps {
inherit pname version src;
-- hash = "sha256-VtYYwpMXPAC3g1OESnw3dzLTwiGqJBQcicFZskEucok=";
+- hash = "sha256-yoTXlxXLcWD2DMxqjb02ZORJ+E0xE1DbZm1VL7vXM4g=";
fetcherVersion = 1;
-+ hash = "sha256-VtYYwpMXPAC3g1OESnw3dzLTwiGqJBQcicFZskEucok=";
[...truncated...]Hint: The full diffs are also available in the runner logs with slightly better highlighting.
(cherry picked from commit 09a31a6)
It is more common to specify hash as the last attribute of fetcher function args. Let's move fetcherVersion right above hash for all occurrences. Signed-off-by: Sefa Eyeoglu <[email protected]> (cherry picked from commit a8c9a2a) Signed-off-by: Sefa Eyeoglu <[email protected]>
Scrumplex
force-pushed
the
25.05/pnpm.fetchDeps/fetcherVersion-2
branch
from
1459f0d to
7ff9a32
Compare
|
I was using Mergiraf and it seems like it did an incorrect merge for pkgs/by-name/ov/overlayed/package.nix |
nixpkgs-ci
bot
added
the
6.topic: python
gepbird
approved these changes
Jul 18, 2025
nixpkgs-ci
bot
added
12.approvals: 2
13 tasks
nixpkgs-ci
bot
added
the
2.status: merge conflict
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Partial backport of #422975
Intentionally omitted 25f7b29, as that would make this a breaking change.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.