nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-11-03 19:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

yarn-berry_4: 4.14.1 -> 4.18.0

Browse Source
This commit is contained in:
Dimitar Nestorov
2026-09-07 10:30:30 +03:00
parent 8f7ca3386c
commit d251914e23
71 changed files with 791 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/by-name/af/affine/package.nix
View File

@@ -3,6 +3,7 @@
stdenv,
stdenvNoCC,
fetchFromGitHub,
substitute,
rustPlatform,
electron,
nodejs_22,
@@ -51,14 +52,24 @@ stdenv.mkDerivation (finalAttrs: {
owner = "toeverything";
repo = "AFFiNE";
tag = "v${finalAttrs.version}";
hash = "sha256-gtdhWLNZRNY91j9wVVny1bRAjZAwIvNJr11ePQapWYQ=";
};
hash = "sha256-RotC2mNtMig3QKcKo8zr15myAqkPDuBopvV9wLlr2tQ=";
patches = [
# Remove after upstream updates to Yarn 4.14
# https://github.com/toeverything/AFFiNE/blob/canary/package.json#L96
./yarn-4.14-support.patch
];
# Remove when updating since upstream has updated Yarn
# https://github.com/toeverything/AFFiNE/commit/6375f5ab8c389831327284f4795d8397de085153
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry.lockfileVersion
];
})
}
'';
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
@@ -68,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
# keep yarnOfflineCache same output style with offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; hash = "" };
yarnOfflineCache = stdenvNoCC.mkDerivation {
name = "yarn-offline-cache";
inherit (finalAttrs) src patches;
inherit (finalAttrs) src;
nativeBuildInputs = [
yarn-berry
cacert
@@ -112,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
dontInstall = true;
outputHashMode = "recursive";
outputHash = "sha256-mNvvKbj9mUioh5Jw4CcRt0CpX1IcQC8JOxUnyy0Lw9c=";
outputHash = "sha256-gje8iTCiy3N/zYRuf/CGUVfGw0RSVXTPu4SjnE9+OY8=";
};
buildInputs = lib.optionals hostPlatform.isDarwin [

23
pkgs/by-name/af/affine/yarn-4.14-support.patch
View File

@@ -1,23 +0,0 @@
diff --git a/.yarnrc.yml b/.yarnrc.yml
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -12,4 +12,7 @@ npmPublishAccess: public
npmRegistryServer: "https://registry.npmjs.org"
-yarnPath: .yarn/releases/yarn-4.12.0.cjs
+approvedGitRepositories:
+ - "**"
+
+enableScripts: true
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,6 @@
# Manual changes might be lost - proceed with caution!
__metadata:
- version: 8
+ version: 9
cacheKey: 10

58
pkgs/by-name/af/affine/yarn-fix.patch Normal file
View File

@@ -0,0 +1,58 @@
diff --git a/.yarnrc.yml b/.yarnrc.yml
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -12,4 +12,7 @@ npmPublishAccess: public
npmRegistryServer: "https://registry.npmjs.org"
-yarnPath: .yarn/releases/yarn-4.12.0.cjs
+approvedGitRepositories:
+ - "**"
+
+enableScripts: true
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,6 @@
# Manual changes might be lost - proceed with caution!
__metadata:
- version: 8
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -33250,27 +33250,27 @@ __metadata:
"resolve@patch:resolve@npm%3A^1.1.6#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.8#optional!builtin<compat/resolve>":
version: 1.22.11
- resolution: "resolve@patch:resolve@npm%3A1.22.11#optional!builtin<compat/resolve>::version=1.22.11&hash=c3c19d"
+ resolution: "resolve@patch:resolve@npm%3A1.22.11#optional!builtin<compat/resolve>::version=1.22.11&hash=9bd1a5"
dependencies:
is-core-module: "npm:^2.16.1"
path-parse: "npm:^1.0.7"
supports-preserve-symlinks-flag: "npm:^1.0.0"
bin:
resolve: bin/resolve
- checksum: 10/fd342cad25e52cd6f4f3d1716e189717f2522bfd6641109fe7aa372f32b5714a296ed7c238ddbe7ebb0c1ddfe0b7f71c9984171024c97cf1b2073e3e40ff71a8
+ checksum: 10/c990146fed81dd7792c56c1d62c170a8c8330bee86ef5d2524f0b1db79cfd9a6e2b4ad3cd4742b2685e51117b67be5d6f8cfd6ffa9c57bd64a1c8c8c9ff4c965
languageName: node
linkType: hard
"resolve@patch:resolve@npm%3A^2.0.0-next.5#optional!builtin<compat/resolve>":
version: 2.0.0-next.5
- resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#optional!builtin<compat/resolve>::version=2.0.0-next.5&hash=c3c19d"
+ resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#optional!builtin<compat/resolve>::version=2.0.0-next.5&hash=9bd1a5"
dependencies:
is-core-module: "npm:^2.13.0"
path-parse: "npm:^1.0.7"
supports-preserve-symlinks-flag: "npm:^1.0.0"
bin:
resolve: bin/resolve
- checksum: 10/05fa778de9d0347c8b889eb7a18f1f06bf0f801b0eb4610b4871a4b2f22e220900cf0ad525e94f990bb8d8921c07754ab2122c0c225ab4cdcea98f36e64fa4c2
+ checksum: 10/76c221deb1d986c0a80cd576373b0ee09f42871e0085a1f76beda84f73ce04e0d21bab28dffd326eb006a7af83bbc582404566b384aa3b0baa217f56cf7e8618
languageName: node
linkType: hard

16
pkgs/by-name/an/anki/package.nix
View File

@@ -24,6 +24,7 @@
yarn,
yarn-berry_4,
runCommand,
substitute,
wrapGAppsHook3,
@@ -42,7 +43,7 @@ let
srcHash = "sha256-0sqtKiMqw7MLXVFSCT1sKX/VO7q5BY63pJP5OnCE2zo=";
cargoHash = "sha256-LQ5uD86ZOKXy9vGbTqPBi3Q57PZEjwQkbHR94QAIVMg=";
yarnHash = "sha256-bOgiZImraPXR/gVk9MB3o9GScMGvLvdhc9mLAaCA4IE=";
yarnHash = "sha256-mpHGclmQxFqiIuZWFTOYBKQW24ugSVhQiYMTmyyk/n4=";
pythonDeps =
with python3Packages;
[
@@ -155,9 +156,16 @@ python3Packages.buildPythonApplication (finalAttrs: {
# Used in with-addons.nix
./patches/allow-setting-addons-folder.patch
# Remove after upstream updates to Yarn 4.14
# https://github.com/ankitects/anki/blob/main/package.json#L99
./patches/yarn-4.14-support.patch
# Remove after upstream updates to Yarn 4.15
# https://github.com/ankitects/anki/blob/main/package.json#L103
(substitute {
src = ./patches/yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry.lockfileVersion
];
})
];
inherit cargoDeps;

2
pkgs/by-name/an/anki/patches/yarn-4.14-support.patch → pkgs/by-name/an/anki/patches/yarn-fix.patch
View File

@@ -14,6 +14,6 @@ diff --git a/yarn.lock b/yarn.lock
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0

8
pkgs/by-name/aw/aws-cdk-cli/package.nix
View File

@@ -50,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: {
NX_VERBOSE_LOGGING = "true";
# Needed to properly embed version info
CODEBUILD_RESOLVED_SOURCE_VERSION = finalAttrs.version;
YARN_LOCKFILE_VERSION_OVERRIDE = "8";
};
# Regular "build" is very heavy and does things we don't need.
@@ -64,13 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
in
''
echo '${cliVersionJson}' > packages/@aws-cdk/cloud-assembly-schema/cli-version.json
cat >> .yarnrc.yml <<'EOF'
approvedGitRepositories:
- "**"
enableScripts: true
enableNetwork: false
enableHardenedMode: false
EOF
'';
preBuild = ''

23
pkgs/by-name/bi/bitfocus-companion/package.nix
View File

@@ -2,6 +2,7 @@
stdenv,
lib,
fetchFromGitHub,
substitute,
fetchurl,
nodejs,
git,
@@ -50,7 +51,23 @@ stdenv.mkDerivation rec {
owner = "bitfocus";
repo = "companion";
tag = "v${version}";
hash = "sha256-ojSXiWaRKFCjHmAMs/RtzNhgSNUy7RKTZ4CE/wCxEaI=";
hash = "sha256-01zW6IrUgubxDSiGffGajZnWlssNsh8kO5FljVcjyL0=";
# Remove when updating since upstream updated Yarn
# https://github.com/bitfocus/companion/commit/d2ad585c510f328f4bf111b7e489225925882354
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry.lockfileVersion
];
})
}
'';
};
passthru.updateScript = nix-update-script { };
@@ -100,15 +117,13 @@ stdenv.mkDerivation rec {
offlineCache = yarn-berry.fetchYarnBerryDeps {
inherit src missingHashes;
hash = "sha256-XDXxv+LSr9fYhVhwkcvmd56fAL6gY9FK6kiQlXxTWXo=";
hash = "sha256-LKIDfngn7Yia9oRwb8Ze0FOiZqreUMa6vuolqSz2hWo=";
};
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
SKIP_LAUNCH_CHECK = true;
ELECTRON = 0;
# prevent yarn >= 4.14 from triggering a lockfile refresh for v8 lockfiles
YARN_LOCKFILE_VERSION_OVERRIDE = 8;
};
# with dontConfigure it doesn't seem to retrieve node_modules, so empty configurePhase instead

6
pkgs/by-name/el/electron-fiddle/yarn-metadata-version.patch → pkgs/by-name/bi/bitfocus-companion/yarn-fix.patch
View File

@@ -1,13 +1,11 @@
diff --git a/yarn.lock b/yarn.lock
index 365f8b4d..ffa89a3d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,7 +2,7 @@
@@ -2,6 +2,6 @@
# Manual changes might be lost - proceed with caution!
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0
"@aashutoshrathi/word-wrap@npm:^1.2.3":

29
pkgs/by-name/co/cockpit-zfs/package.nix
View File

@@ -1,7 +1,6 @@
{
acl,
bash,
buildPackages,
cockpit,
coreutils,
fetchFromGitHub,
@@ -15,7 +14,7 @@
mbuffer,
msmtp,
nix-update-script,
nodejs_22,
nodejs,
openssh,
samba,
shadow,
@@ -27,22 +26,6 @@
yarn-berry,
zfs,
}:
let
# Pin to Node <24.15.0: Yarn Berry's PnP linker breaks `require.cache` on
# newer Node, which crashes tailwindcss mid-build (and ESLint, per
# yarnpkg/berry#7106). See NixOS/nixpkgs#530137.
#
# `nodejs` is rebound here (rather than touched at every call site below)
# so the rest of this file is unaffected.
#
# yarn-berry's own `yarn` binary gets patchShebang'd against whatever
# `nodejs` *it* was built with, so overriding nativeBuildInputs alone does
# nothing - we have to rebuild yarn-berry itself against nodejs_22, for
# both the host and build-platform (cross-compilation) variants.
nodejs = nodejs_22;
yarnBerry = yarn-berry.override { inherit nodejs; };
yarnBerryForBuild = buildPackages.yarn-berry.override { nodejs = buildPackages.nodejs_22; };
in
stdenv.mkDerivation (finalAttrs: {
pname = "cockpit-zfs";
@@ -59,17 +42,17 @@ stdenv.mkDerivation (finalAttrs: {
missingHashes = ./missing-hashes.json;
# Use buildPackages for cross-compilation support
offlineCache = yarnBerryForBuild.fetchYarnBerryDeps {
offlineCache = yarn-berry.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes;
hash = "sha256-nm3iHf9Rm5JFKzH0HAvglkQPFIV6Fl1e9WvNdqevTug=";
};
nativeBuildInputs = [
makeWrapper
nodejs_22
nodejs
jq
yarnBerry
yarnBerryForBuild.yarnBerryConfigHook
yarn-berry
yarn-berry.yarnBerryConfigHook
];
disallowedRequisites = [ finalAttrs.offlineCache ];
@@ -86,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
lsscsi
mbuffer
msmtp
nodejs_22
nodejs
openssh
samba
shadow

29
pkgs/by-name/ea/eas-cli/package.nix
View File

@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
substitute,
yarn-berry_4,
nodejs,
jq,
@@ -15,14 +16,25 @@ let
owner = "expo";
repo = "eas-cli";
rev = "v${version}";
hash = "sha256-EMN54PR9lhrZcGMq2iNUsdyBP3wVk4G/isjsneIGslI=";
hash = "sha256-WfzCV304xgTqiKBCsZc5rnzaC+UHA6c155FG+HWBY7s=";
# Remove after upstream updates to Yarn 4.15
# https://github.com/expo/eas-cli/blob/main/package.json#L38
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry_4.lockfileVersion
];
})
}
'';
};
missingHashes = ./missing-hashes.json;
patches = [
# Remove after upstream updates to Yarn 4.14
# https://github.com/expo/eas-cli/blob/v18.7.0/package.json#L37
./yarn-4.14-support.patch
];
in
# cc is necessary because of building an npm package without a prebuilt binary
# for ARM. See comment in nativeBuildInputs below.
@@ -32,12 +44,11 @@ stdenv.mkDerivation (finalAttrs: {
src
version
missingHashes
patches
;
yarnOfflineCache = yarn-berry_4.fetchYarnBerryDeps {
inherit src missingHashes patches;
hash = "sha256-dOx4T009+FMFEvTZtlyJpAUo2UYBm1O1hIyBnSbqIgw=";
inherit src missingHashes;
hash = "sha256-Iqdk0MpXeiKm5hgF68XOKvl0a+5LpXsNNcelCcbfj3s=";
};
nativeBuildInputs = [

2
pkgs/by-name/ea/eas-cli/yarn-4.14-support.patch → pkgs/by-name/ea/eas-cli/yarn-fix.patch
View File

@@ -15,6 +15,6 @@ diff --git a/yarn.lock b/yarn.lock
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0

25
pkgs/by-name/el/electron-fiddle/package.nix
View File

@@ -1,7 +1,6 @@
{
buildFHSEnv,
fetchFromGitHub,
fetchYarnDeps,
electron,
git,
lib,
@@ -10,6 +9,7 @@
stdenvNoCC,
util-linux,
yarn-berry_4,
substitute,
zip,
}:
@@ -22,7 +22,23 @@ let
owner = "electron";
repo = "fiddle";
tag = "v${version}";
hash = "sha256-nmmj1PvW9LOoEdwwWRRXe9q9J8z6Fp45Tt038BjWD+k=";
hash = "sha256-5Pw889lHRwWoTUVbLmToPF8/bDz382qFMO9mL/EKLo0=";
# Remove after upstream updates to Yarn 4.15
# https://github.com/electron/fiddle/blob/main/package.json#L163
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry.lockfileVersion
];
})
}
'';
};
patches = [
@@ -31,9 +47,6 @@ let
# zip extraction fails on newer nodejs versions without this fix
./bump-yauzl.patch
# https://github.com/nixos/nixpkgs/issues/542343
./yarn-metadata-version.patch
];
missingHashes = ./missing-hashes.json;
@@ -49,7 +62,7 @@ let
offlineCache = yarn-berry.fetchYarnBerryDeps {
inherit src patches missingHashes;
hash = "sha256-xxguRiyZDGdVt3eYh+KUI/odLZZ/LeScRBfexMxAOVI=";
hash = "sha256-O9zaCL0W8JPYQz8EBWOz0qGjW57Js3oMosUbz72YBc4=";
};
nativeBuildInputs = [

58
pkgs/by-name/el/electron-fiddle/yarn-fix.patch Normal file
View File

@@ -0,0 +1,58 @@
diff --git a/.yarnrc.yml b/.yarnrc.yml
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -1,7 +1,5 @@
nodeLinker: node-modules
-yarnPath: .yarn/releases/yarn-4.10.3.cjs
-
# see package.json for Electron postinstall
enableScripts: false
diff --git a/yarn.lock b/yarn.lock
index 365f8b4d..ffa89a3d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,6 @@
# Manual changes might be lost - proceed with caution!
__metadata:
- version: 8
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -11277,27 +11277,27 @@ __metadata:
"resolve@patch:resolve@npm%3A^1.22.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A~1.22.2#optional!builtin<compat/resolve>":
version: 1.22.11
- resolution: "resolve@patch:resolve@npm%3A1.22.11#optional!builtin<compat/resolve>::version=1.22.11&hash=c3c19d"
+ resolution: "resolve@patch:resolve@npm%3A1.22.11#optional!builtin<compat/resolve>::version=1.22.11&hash=9bd1a5"
dependencies:
is-core-module: "npm:^2.16.1"
path-parse: "npm:^1.0.7"
supports-preserve-symlinks-flag: "npm:^1.0.0"
bin:
resolve: bin/resolve
- checksum: 10c0/ee5b182f2e37cb1165465e58c6abc797fec0a80b5ba3231607beb4677db0c9291ac010c47cf092b6daa2b7f518d69a0e21888e7e2b633f68d501a874212a8c63
+ checksum: 10c0/55f7a298977b1aacf6dbec6dcfc81100ba98675bced193b57d3ac58ced65acc40c3a38927853cea86b7f75edb3c20e1f099a09d48b0d8ceccc25d466993eec47
languageName: node
linkType: hard
"resolve@patch:resolve@npm%3A^2.0.0-next.4#optional!builtin<compat/resolve>":
version: 2.0.0-next.4
- resolution: "resolve@patch:resolve@npm%3A2.0.0-next.4#optional!builtin<compat/resolve>::version=2.0.0-next.4&hash=c3c19d"
+ resolution: "resolve@patch:resolve@npm%3A2.0.0-next.4#optional!builtin<compat/resolve>::version=2.0.0-next.4&hash=9bd1a5"
dependencies:
is-core-module: "npm:^2.9.0"
path-parse: "npm:^1.0.7"
supports-preserve-symlinks-flag: "npm:^1.0.0"
bin:
resolve: bin/resolve
- checksum: 10c0/ed2bb51d616b9cd30fe85cf49f7a2240094d9fa01a221d361918462be81f683d1855b7f192391d2ab5325245b42464ca59690db5bd5dad0a326fc0de5974dd10
+ checksum: 10c0/c86731c5e95ceaa3bf7a0e5d451a9c5e50f7d8c545300de905cda347b5c6d7e23b500b365757673cc884f9be93c23b8aa4dc5c5350b7e6cdfec8149c4b257479
languageName: node
linkType: hard

29
pkgs/by-name/gi/gitbeaker-cli/package.nix
View File

@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
substitute,
nodejs,
gnutar,
makeBinaryWrapper,
@@ -17,14 +18,24 @@ stdenv.mkDerivation (finalAttrs: {
owner = "jdalrymple";
repo = "gitbeaker";
tag = finalAttrs.version;
hash = "sha256-EVxDUEuxCnMiqqsKFs9JpRVJ86d9hW22K4a4we8eoJA=";
};
hash = "sha256-zGcSilIQUKn7iMGFkDZuvPZZM9UcZadczelB7JgVYb4=";
patches = [
# Remove this when updating since upstream migrated to pnpm
# https://github.com/jdalrymple/gitbeaker/blob/main/package.json#L59
./yarn-4.14-support.patch
];
# Remove when updating since upstream migrated to pnpm
# https://github.com/jdalrymple/gitbeaker/blob/main/package.json#L61
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry_4.lockfileVersion
];
})
}
'';
};
# Set for the `nodejsInstall` hooks
npmWorkspace = "@gitbeaker/cli";
@@ -42,8 +53,8 @@ stdenv.mkDerivation (finalAttrs: {
missingHashes = ./missing-hashes.json;
offlineCache = yarn-berry_4.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes patches;
hash = "sha256-RTgdHicbfbJbToif51TchLCfdIPZynvT0n/KwrydLYU=";
inherit (finalAttrs) src missingHashes;
hash = "sha256-OMsa/4pRyZVjgYPfYsaj1D+auKOHRAXKtEDYWenI33I=";
};
buildPhase = ''

2
pkgs/by-name/gi/gitbeaker-cli/yarn-4.14-support.patch → pkgs/by-name/gi/gitbeaker-cli/yarn-fix.patch
View File

@@ -17,6 +17,6 @@ diff --git a/yarn.lock b/yarn.lock
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0

28
pkgs/by-name/he/hedgedoc/package.nix
View File

@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
substitute,
makeBinaryWrapper,
nodejs,
python3,
@@ -17,22 +18,31 @@ stdenv.mkDerivation (finalAttrs: {
owner = "hedgedoc";
repo = "hedgedoc";
tag = finalAttrs.version;
hash = "sha256-QYWDgQuSsMf8xElSK0MpthOMAB6EJXcxfOWcHrR4ODU=";
};
hash = "sha256-sKmy80FO5cp2aKoirtzaPmf2IqTn5yLUkbakIZMa5aQ=";
patches = [
# Remove after upstream updates to Yarn 4.14
# https://github.com/hedgedoc/hedgedoc/blob/develop/package.json#L28
./yarn-4.14-support.patch
];
# Remove after https://github.com/hedgedoc/hedgedoc/commit/6e6536df1b7b8e1ad30a0929be5b851eef98029f is released
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry_4.lockfileVersion
];
})
}
'';
};
# Generate this file with:
# nix run nixpkgs#yarn-berry_4.yarn-berry-fetcher missing-hashes yarn.lock
missingHashes = ./missing-hashes.json;
offlineCache = yarn-berry_4.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes patches;
hash = "sha256-2qwTV9GRKnVIhK6dsSfis+JOTfjcdwW0RVdrJZa/uJc=";
inherit (finalAttrs) src missingHashes;
hash = "sha256-OywEJNs1DwUnPPjW2CzEYKhfHz03EcSEJ1PUWx8DGUI=";
};
nativeBuildInputs = [

2
pkgs/by-name/he/hedgedoc/yarn-4.14-support.patch → pkgs/by-name/he/hedgedoc/yarn-fix.patch
View File

@@ -18,6 +18,6 @@ diff --git a/yarn.lock b/yarn.lock
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10

27
pkgs/by-name/in/insulator2/package.nix
View File

@@ -3,6 +3,7 @@
stdenv,
fetchFromGitHub,
substitute,
yarn-berry_4,
cargo,
@@ -31,19 +32,29 @@ stdenv.mkDerivation (finalAttrs: {
owner = "andrewinci";
repo = "insulator2";
rev = "v${finalAttrs.version}";
hash = "sha256-3eDA+pwchnwWtweGeSDlf+Vt0Hoylmanf4hnvJ2YOGU=";
};
hash = "sha256-QCoDiFEgVuF/+MqgzcMTXqjC/nDA+A2v3l01kZyviDs=";
patches = [
# Remove after upstream updates to Yarn 4.14
# Remove after upstream updates to Yarn 4.15
# https://github.com/andrewinci/insulator2/blob/main/package.json#L105
./yarn-4.14-support.patch
];
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry_4.lockfileVersion
];
})
}
'';
};
missingHashes = ./missing-hashes.json;
offlineCache = yarn-berry_4.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes patches;
hash = "sha256-IechRla3epfANBESCYgti5/8B3QaPCv6Gp2I4eZNiyI=";
inherit (finalAttrs) src missingHashes;
hash = "sha256-2w1fMVwQFClyrpNmJrjJoDqbU2nxRZh9NkBIcMUEjec=";
};
cargoDeps = rustPlatform.fetchCargoVendor {

2
pkgs/by-name/in/insulator2/yarn-4.14-support.patch → pkgs/by-name/in/insulator2/yarn-fix.patch
View File

@@ -16,6 +16,6 @@ diff --git a/yarn.lock b/yarn.lock
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0

28
pkgs/by-name/jo/joplin-cli/package.nix
View File

@@ -3,6 +3,7 @@
stdenv,
nodejs,
fetchFromGitHub,
substitute,
yarn-berry_4,
python3,
pkg-config,
@@ -24,15 +25,23 @@ stdenv.mkDerivation (finalAttrs: {
postFetch = ''
# there's a file with a weird name that causes a hash mismatch on darwin
rm $out/packages/app-cli/tests/support/photo*
'';
hash = "sha256-nWMUvAseKoTOv5ui9uYDUiGlvO+8nNV4ux7JbsnrM5U=";
};
patches = [
# Remove after upstream updates to Yarn 4.14
# https://github.com/laurent22/joplin/blob/dev/package.json#L103
./yarn-4.14-support.patch
];
# Remove when updating since upstream has updated Yarn
# https://github.com/laurent22/joplin/commit/071f205c44da8e2979dcf53a4105648bfa0e7f83
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry_4.lockfileVersion
];
})
}
'';
hash = "sha256-LSkiW3Kwtjsk2LLM/MXo6ErR+G8b7IX3LkEtDJlc7ok=";
};
missingHashes = ./missing-hashes.json;
@@ -40,10 +49,9 @@ stdenv.mkDerivation (finalAttrs: {
inherit (finalAttrs)
src
missingHashes
patches
postPatch
;
hash = "sha256-mdDVYLJ4ZN7zJJdf/2Wh+or+p1uJPTrMCyDYWwc04YM=";
hash = "sha256-EHHAB20syDakpN4TGuLCc1v2AGEJPc3y7uCpS+PVzzQ=";
};
nativeBuildInputs = [

2
pkgs/by-name/jo/joplin-cli/yarn-4.14-support.patch → pkgs/by-name/jo/joplin-cli/yarn-fix.patch
View File

@@ -21,6 +21,6 @@ diff --git a/yarn.lock b/yarn.lock
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10

6
pkgs/by-name/jo/joplin-desktop/package.nix
View File

@@ -45,9 +45,9 @@ stdenv.mkDerivation (finalAttrs: {
# there's a file with a weird name that causes a hash mismatch on darwin
rm $out/packages/app-cli/tests/support/photo*
# Remove after upstream updates to Yarn 4.14
# https://github.com/laurent22/joplin/blob/dev/package.json#L103
sed -i '/__metadata/{n;s/version: 8$/version: 9/;}' $out/yarn.lock
# Remove when updating since upstream updated Yarn
# https://github.com/laurent22/joplin/commit/071f205c44da8e2979dcf53a4105648bfa0e7f83
sed -i '/__metadata/{n;s/version: 8$/version: ${yarn-berry.lockfileVersion}/;}' $out/yarn.lock
'';
inherit (releaseData) hash;
};

4
pkgs/by-name/jo/joplin-desktop/release-data.json
View File

@@ -1,6 +1,6 @@
{
"version": "3.6.16",
"hash": "sha256-0W6xNcEMXIs8XsoY6NqSud9D5fEmc5GKFC8Uo6CEtec=",
"hash": "sha256-S1PIhotA0Y57ZeT9xBcbMInblwFK8LKwXlcnMs2TB3Q=",
"plugins": {
"io.github.jackgruber.backup": {
"name": "joplin-plugin-backup",
@@ -9,5 +9,5 @@
"npmDepsHash": "sha256-xZJ0Oir1A6sLe0ztIyBu39Yy3D6sNrVaciOYG0k85l0="
}
},
"deps_hash": "sha256-ejg0u9Dy3iaBusH248IbtJNpvd/zADyPJ9CplIK1A/w="
"deps_hash": "sha256-mj9s97D/4UJqctl5NtyJRWYTc6fFAC0ueZE78KZVFsQ="
}

2
pkgs/by-name/ko/koito/client.nix
View File

@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
missingHashes = ./missing-hashes.json;
offlineCache = yarn.fetchYarnBerryDeps {
inherit (finalAttrs) src sourceRoot missingHashes;
hash = "sha256-VIlWld21GScJ/2UUkKQISM9jyU9wCVwwDNKkge+K044=";
hash = "sha256-2kWRZBGm7pTpOwZ1Wp+pCU5WWFche1xqGyLL86eGEow=";
};
nativeBuildInputs = [

21
pkgs/by-name/ko/koito/package.nix
View File

@@ -2,6 +2,8 @@
lib,
buildGoModule,
fetchFromGitHub,
substitute,
yarn-berry_4,
callPackage,
pkg-config,
vips,
@@ -15,7 +17,23 @@ buildGoModule (finalAttrs: {
owner = "gabehf";
repo = "koito";
rev = "v${finalAttrs.version}";
hash = "sha256-68+Z4Alzu+4v/PxU1IOboqZkF1pO+y6gswuO+HPS7dk=";
hash = "sha256-z0HeuPYQwkyKkt8K7PKUYseECz2p1C/6UO5sUSxopBQ=";
# Remove when upstream updates to Yarn 4.15
# https://github.com/gabehf/Koito/blob/main/client/package.json#L44
postFetch = ''
cd $out/client
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry_4.lockfileVersion
];
})
}
'';
};
__structuredAttrs = true;
@@ -47,6 +65,7 @@ buildGoModule (finalAttrs: {
passthru = {
client = callPackage ./client.nix {
inherit (finalAttrs) src version;
inherit yarn-berry_4;
};
tests = {

11
pkgs/by-name/ko/koito/yarn-fix.patch Normal file
View File

@@ -0,0 +1,11 @@
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,6 @@
# Manual changes might be lost - proceed with caution!
__metadata:
- version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0

27
pkgs/by-name/le/learn6502/package.nix
View File

@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
substitute,
yarn-berry_4,
nodejs,
meson,
@@ -30,22 +31,34 @@ stdenv.mkDerivation (finalAttrs: {
owner = "JumpLink";
repo = "Learn6502";
tag = "v${finalAttrs.version}";
hash = "sha256-wttNOF1ngEK70u+6bBZkFLzvJCQaL9KMfy7EG+mfHIg=";
hash = "sha256-b91b+H5avQDYknDaKUSPGG+Vq6sxSwuJgSiVzdqlbh8=";
# Remove when updating since upstream migrated to gjsify
# https://github.com/JumpLink/Learn6502/commit/1ae86c179aede8c5785aeda66db334a29d02a7c0
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry_4.lockfileVersion
];
})
}
'';
};
patches = [
./get-yarn-from-path.patch
# Remove after upstream updates to Yarn 4.14
# https://github.com/JumpLink/Learn6502/blob/main/package.json#L36
./yarn-4.14-support.patch
];
missingHashes = ./missing-hashes.json;
offlineCache = yarn-berry.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes patches;
hash = "sha256-fWx1zawU8pJQ3Q7PYWKmJh3Ko7b8wO0m3KS6XCSd9v8=";
inherit (finalAttrs) src missingHashes;
hash = "sha256-BIP2L6EQXKzpiYrA8qpqQEQ/NnjFrQSyHlmFg7vg1Xk=";
};
nativeBuildInputs = [

2
pkgs/by-name/le/learn6502/yarn-4.14-support.patch → pkgs/by-name/le/learn6502/yarn-fix.patch
View File

@@ -18,6 +18,6 @@ diff --git a/yarn.lock b/yarn.lock
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0

27
pkgs/by-name/li/linkwarden/package.nix
View File

@@ -4,6 +4,7 @@
buildNpmPackage,
fetchFromGitHub,
yarn-berry,
substitute,
makeBinaryWrapper,
nixosTests,
stdenv,
@@ -75,7 +76,23 @@ stdenvNoCC.mkDerivation (finalAttrs: {
owner = "linkwarden";
repo = "linkwarden";
tag = "v${finalAttrs.version}";
hash = "sha256-4S2/TRZlMa3KHM+tmrWQsqGFk0TZjMbhdS2b1aNTVow=";
hash = "sha256-/Hnavo98+X0XAULkMKLVO2H4eK548I/d8l/b0NzM88I=";
# Remove after upstream updates to Yarn 4.15
# https://github.com/linkwarden/linkwarden/blob/main/package.json#L3
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry.lockfileVersion
];
})
}
'';
};
patches = [
@@ -89,16 +106,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
pkgs/by-name/ne/nextjs-ollama-llm-ui/0002-use-local-google-fonts.patch
*/
./01-localfont.patch
# Remove after upstream updates to Yarn 4.14
# https://github.com/linkwarden/linkwarden/blob/main/package.json#L3
./02-yarn-4.14-support.patch
];
missingHashes = ./missing-hashes.json;
yarnOfflineCache = yarn-berry.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes patches;
hash = "sha256-f7xIzxN+0JWZeGfeK/3XTiUbxrnnzErbFEukolMMv/s=";
inherit (finalAttrs) src missingHashes;
hash = "sha256-6NiA2gNBk3auIjYqv9TxsbUR/k7ygj6KejrWx+Gy0pg=";
};
nativeBuildInputs = [

2
pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/yarn-4.14-support.patch → pkgs/by-name/li/linkwarden/yarn-fix.patch
View File

@@ -15,6 +15,6 @@ diff --git a/yarn.lock b/yarn.lock
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0

24
pkgs/by-name/lo/losslesscut/package.nix
View File

@@ -1,6 +1,7 @@
{
lib,
fetchFromGitHub,
substitute,
stdenv,
yarn-berry_4,
nodejs_24,
@@ -25,13 +26,28 @@ stdenv.mkDerivation (finalAttrs: {
owner = "mifi";
repo = "lossless-cut";
tag = "v${finalAttrs.version}";
hash = "sha256-LNh9F2aKxVegZTAPuEAqo2f78ynGMgnpwnDXEP1u2+M=";
hash = "sha256-E0Ds2Wpo+JUSfd+hBY7QdJM1cUlWgNWW4zEiB0rdh6w=";
# Remove after upstream updates to Yarn 4.15
# https://github.com/mifi/lossless-cut/blob/master/package.json#L492
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry.lockfileVersion
];
})
}
'';
};
patches = [
# fixes a few things that try to guess whether it's a dev build
./undev.patch
./yarn-4.14-support.patch
./disable-update-check.patch
# LosslessCut will retrieve a URL from mifi.no (the author's domain) and directly embed the HTML in the app.
# This was previously used to show a Ukraine flag, which I don't have strong opinions on.
@@ -121,8 +137,8 @@ stdenv.mkDerivation (finalAttrs: {
missingHashes = ./missing-hashes.json;
offlineCache = yarn-berry.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes patches;
hash = "sha256-o0u9dAoo0sTEV+kjQg8TjRNAIcx8fqfk79HsDwAXriA=";
inherit (finalAttrs) src missingHashes;
hash = "sha256-81pebHUkVLEAe01a5olTP9zzQkTCrGMWUvNTYBsW+Bk=";
};
postConfigure = ''

2
pkgs/by-name/lo/losslesscut/yarn-4.14-support.patch → pkgs/by-name/lo/losslesscut/yarn-fix.patch
View File

@@ -7,7 +7,7 @@ index 1e4550e7..6a2e770c 100644
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10
"7zip-bin@npm:~5.2.0":

21
pkgs/by-name/ma/mastodon/yarn-4.14-support.patch
View File

@@ -1,21 +0,0 @@
diff --git a/.yarnrc.yml b/.yarnrc.yml
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -1 +1,6 @@
nodeLinker: node-modules
+
+approvedGitRepositories:
+ - "**"
+
+enableScripts: true
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,6 @@
# Manual changes might be lost - proceed with caution!
__metadata:
- version: 8
+ version: 9
cacheKey: 10c0

29
pkgs/by-name/ou/outline/package.nix
View File

@@ -2,6 +2,7 @@
stdenv,
lib,
fetchFromGitHub,
substitute,
makeWrapper,
nodejs,
nixosTests,
@@ -16,14 +17,24 @@ stdenv.mkDerivation (finalAttrs: {
owner = "outline";
repo = "outline";
rev = "v${finalAttrs.version}";
hash = "sha256-6w4Pso7I0ojbsbACEZrYuJsW9J2W38jY9uiErMQNeXE=";
};
hash = "sha256-msFMfjNkpXaJisbTpJMQowyD0KZ5zfvSgTutEeLp9Vk=";
patches = [
# Remove after upstream updates to Yarn 4.14
# https://github.com/outline/outline/blob/main/package.json#L398
./yarn-4.14-support.patch
];
# Remove after upstream updates to Yarn 4.15
# https://github.com/outline/outline/blob/main/package.json#L393
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry_4.lockfileVersion
];
})
}
'';
};
missingHashes = ./missing-hashes.json;
@@ -34,8 +45,8 @@ stdenv.mkDerivation (finalAttrs: {
];
offlineCache = yarn-berry_4.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes patches;
hash = "sha256-7nREE+sGd6ZUGfZ+YSIIGUaysMSEdap189koFQcV+hs=";
inherit (finalAttrs) src missingHashes;
hash = "sha256-bEsnu4NL/Dgv6yPXXvV/4uMvQ7Sc9eDfeAD2fhFCB98=";
};
buildPhase = ''

9
pkgs/by-name/ou/outline/yarn-4.14-support.patch → pkgs/by-name/ou/outline/yarn-fix.patch
View File

@@ -1,22 +1,19 @@
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -12,3 +12,8 @@ npmPreapprovedPackages:
@@ -12,3 +12,6 @@ npmPreapprovedPackages:
npmAuditIgnoreAdvisories:
- "1113517" # GHSA-mw96-cpmx-2vgc rollup <2.80.0 path traversal (workbox-build, build-time)
- "1113686" # GHSA-5c6j-r48x-rmvq serialize-javascript RCE (@rollup/plugin-terser, build-time)
+
+approvedGitRepositories:
+ - "**"
+
+enableScripts: true
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,7 +2,7 @@
@@ -2,6 +2,6 @@
# Manual changes might be lost - proceed with caution!
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0
"@antfu/install-pkg@npm:^1.1.0":

29
pkgs/by-name/pe/peacock/package.nix
View File

@@ -1,6 +1,7 @@
{
lib,
fetchFromGitHub,
substitute,
stdenv,
nodejs,
yarn-berry_4,
@@ -19,14 +20,24 @@ stdenv.mkDerivation (finalAttrs: {
owner = "thepeacockproject";
repo = "Peacock";
tag = "v${finalAttrs.version}";
hash = "sha256-uVK9ABA5JoDU9Cmtjo2ZqIRwMvhZdDgdmkIpily/wk8=";
};
hash = "sha256-8Z2UXz/4ecQruy20RykgSXBm3JjMqZH6KVBVCXRzAI4=";
patches = [
# Remove after upstream updates to Yarn 4.14
# https://github.com/thepeacockproject/Peacock/blob/master/package.json#L109
./yarn-4.14-support.patch
];
# Remove after upstream updates to Yarn 4.15
# https://github.com/thepeacockproject/Peacock/blob/master/package.json#L107
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry.lockfileVersion
];
})
}
'';
};
nativeBuildInputs = [
nodejs
@@ -81,8 +92,8 @@ stdenv.mkDerivation (finalAttrs: {
missingHashes = ./missing-hashes.json;
offlineCache = yarn-berry.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes patches;
hash = "sha256-9u/w/zy4f51uPFfkzf0fDZlsj8GFXAfw7RGR9owo5n8=";
inherit (finalAttrs) src missingHashes;
hash = "sha256-O1F/OaVipYyJOIIeNcOEghxTjGYNg8Ba0KMQMnW09EQ=";
};
meta = {

3
pkgs/by-name/pe/peacock/yarn-4.14-support.patch → pkgs/by-name/pe/peacock/yarn-fix.patch
View File

@@ -1,5 +1,4 @@
diff --git a/yarn.lock b/yarn.lock
index 286ec90499..ee9a3a9fd3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,7 +2,7 @@
@@ -7,7 +6,7 @@ index 286ec90499..ee9a3a9fd3 100644
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10
"@aashutoshrathi/word-wrap@npm:^1.2.3":

28
pkgs/by-name/pg/pgadmin4/package.nix
View File

@@ -2,6 +2,7 @@
lib,
python3,
fetchFromGitHub,
substitute,
zlib,
nixosTests,
postgresqlTestHook,
@@ -9,24 +10,36 @@
yarn-berry_4,
nodejs,
stdenv,
pkgsBuildHost,
server-mode ? true,
}:
let
pname = "pgadmin";
version = "9.14";
yarnHash = "sha256-mJa5L8N40JWogQ8/LllSdX/uJHMzKULCow9+e5gFe/A=";
yarnHash = "sha256-uixmtWC588JD6DfM9INeh6LV5L2S9lc+GFNW62FVm+4=";
src = fetchFromGitHub {
owner = "pgadmin-org";
repo = "pgadmin4";
rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
hash = "sha256-NQe1ZN8jQEJE5qSpL5MjgLwWLGrGXCIHaCd8zLpsx3s=";
};
hash = "sha256-ZUJEwTRKG23ztLKAp+hDHKeKxPc6VmC8gnJe4x85R44=";
# Remove after https://github.com/pgadmin-org/pgadmin4/commit/79e490c5fa6031af7baa83f04f751bdc790dc408 is released
yarnPatch = ./yarn-4.14-support.patch;
# Remove when updating since upstream has updated Yarn
# https://github.com/pgadmin-org/pgadmin4/commit/aad2dfd7251f769ce73dd1bc3e17c76831a019ed#diff-b861012a5dd72b8a9f3281b7cf09f5a779c98569d040b1bbc1db50f1b15e7cceR183
postFetch = ''
cd $out/web
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry_4.lockfileVersion
];
})
}
'';
};
# keep the scope, as it is used throughout the derivation and tests
# this also makes potential future overrides easier
@@ -53,7 +66,6 @@ pythonPackages.buildPythonApplication rec {
inherit missingHashes;
src = src + "/web";
hash = yarnHash;
patches = [ yarnPatch ];
};
# from Dockerfile
@@ -115,8 +127,6 @@ pythonPackages.buildPythonApplication rec {
echo Building the web frontend...
cd web
(
PATH=$PATH:${lib.makeBinPath [ pkgsBuildHost.git ]}
git apply ${yarnPatch}
export LD=$CC # https://github.com/imagemin/optipng-bin/issues/108
yarnBerryConfigHook
)

2
pkgs/by-name/pg/pgadmin4/yarn-4.14-support.patch → pkgs/by-name/pg/pgadmin4/yarn-fix.patch
View File

@@ -20,6 +20,6 @@ diff --git a/yarn.lock b/yarn.lock
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0

2
pkgs/by-name/pr/proton-authenticator/package.nix
View File

@@ -74,7 +74,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
offlineCache = yarn-berry.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes yarnLock;
hash = "sha256-FiDuAwEj/AIH/lJRLyuNPvthcoynsFGcUYZyx7DMnFA=";
hash = "sha256-YNW6Hqk3WU0IRCbDQpNOTiIHT9T5zBMhNm5GxX1WqrM=";
};
postUnpack = ''

2
pkgs/by-name/pr/proton-authenticator/yarn.lock generated
View File

@@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!
__metadata:
version: 9
version: 10
cacheKey: 10
"@adobe/css-tools@npm:^4.4.0":

27
pkgs/by-name/r2/r2modman/package.nix
View File

@@ -9,6 +9,7 @@
makeWrapper,
nodejs,
yarn-berry,
substitute,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -19,23 +20,35 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ebkr";
repo = "r2modmanPlus";
tag = "v${finalAttrs.version}";
hash = "sha256-QGs3kF2GkHlISmRb0cIYOKts1b1RvBj5qkc2cUPawwE=";
hash = "sha256-6vSc3Gx0VZJoGSXm70T6rsOLhlv/7CnjK4HWkPOZv2s=";
# Remove when updating since upstream migrated to pnpm
# https://github.com/ebkr/r2modmanPlus/commit/db41dfdf4e4b9059ce0d574a7fab0d2d344e633a
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry.lockfileVersion
];
})
}
'';
};
missingHashes = ./missing-hashes.json;
offlineCache = yarn-berry.fetchYarnBerryDeps {
inherit (finalAttrs) src patches missingHashes;
hash = "sha256-6CwayFhy0ZwdL1ZOZVtCJLlchCv5raX7WF1V4TvVpq4=";
inherit (finalAttrs) src missingHashes;
hash = "sha256-CAtDbWbl9u8tPdPQKxB2qcN7OhDomwO8EqDdRZppgQU=";
};
patches = [
# Make it possible to launch Steam games from r2modman.
./steam-launch-fix.patch
# Remove after upstream updates to Yarn 4.14
# https://github.com/ebkr/r2modmanPlus/blob/develop/package.json#L118
./yarn-4.14-support.patch
# Fix copying of wrapper files to game directory
./wrapper-fix.patch
];

2
pkgs/by-name/r2/r2modman/yarn-4.14-support.patch → pkgs/by-name/r2/r2modman/yarn-fix.patch
View File

@@ -16,6 +16,6 @@ diff --git a/yarn.lock b/yarn.lock
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0

29
pkgs/by-name/ro/rocketchat-desktop/package.nix
View File

@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
substitute,
yarn-berry_4,
nodejs,
pkg-config,
@@ -27,22 +28,32 @@ stdenv.mkDerivation (finalAttrs: {
owner = "RocketChat";
repo = "Rocket.Chat.Electron";
tag = finalAttrs.version;
hash = "sha256-ToAez48+TBcPJUjrh8xYC84HLwbU+rCxGoor5o4gGgo=";
};
hash = "sha256-Z9yTtlpud3nCMVnyCTd0eYM3G/9UjrPu2sfTVirDR0k=";
patches = [
# Remove after upstream updates to Yarn 4.14
# https://github.com/RocketChat/Rocket.Chat.Electron/blob/master/package.json#L182
./yarn-4.14-support.patch
];
# Remove after upstream updates to Yarn 4.15
# https://github.com/RocketChat/Rocket.Chat.Electron/blob/master/package.json#L187
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry.lockfileVersion
];
})
}
'';
};
# This might need to be updated between releases.
# See https://nixos.org/manual/nixpkgs/stable/#javascript-yarnBerry-missing-hashes
missingHashes = ./missing-hashes.json;
offlineCache = yarn-berry.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes patches;
hash = "sha256-7zPiu8kgZbp64ugf229hrjpwZujQHHDLwCxlGRVgH4E=";
inherit (finalAttrs) src missingHashes;
hash = "sha256-VMCLYLuNAZQzfglLS6ncFCLOcmGsuXPR2J+q+Gn/CP4=";
};
nativeBuildInputs = [

2
pkgs/by-name/ro/rocketchat-desktop/yarn-4.14-support.patch → pkgs/by-name/ro/rocketchat-desktop/yarn-fix.patch
View File

@@ -18,6 +18,6 @@ diff --git a/yarn.lock b/yarn.lock
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10

27
pkgs/by-name/sy/synapse-admin/package.nix
View File

@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
substitute,
nodejs,
yarn-berry,
cacert,
@@ -24,19 +25,29 @@ stdenv.mkDerivation (finalAttrs: {
owner = "Awesome-Technologies";
repo = "synapse-admin";
tag = finalAttrs.version;
hash = "sha256-rK1Tc1K3wx6/1J8TEw5Lb9g09gbt/1HoZdDrEFzxTQQ=";
};
hash = "sha256-D7MlFaI49KSNQ7DPj0iGKJqaQ4s5Y6EksB2U3Z5sJXY=";
patches = [
# Remove after upstream updates to Yarn 4.14
# Remove after upstream updates to Yarn 4.15
# https://github.com/Awesome-Technologies/synapse-admin/blob/master/package.json#L13
./yarn-4.14-support.patch
];
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry.lockfileVersion
];
})
}
'';
};
# we cannot use fetchYarnDeps because that doesn't support yarn 2/berry lockfiles
yarnOfflineCache = stdenv.mkDerivation {
pname = "yarn-deps";
inherit (finalAttrs) version src patches;
inherit (finalAttrs) version src;
nativeBuildInputs = [ yarn-berry ];
@@ -84,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
runHook postBuild
'';
outputHash = "sha256-IiViodAB1KAYsRRr8+zw3vrCbUYp7Mdtazi0Y6SEFNU=";
outputHash = "sha256-n5SkXCWOsqdyZkng5EU0HJDKJ0xorfi6SfNvwnuhFTg=";
outputHashMode = "recursive";
};

20
pkgs/by-name/sy/synapse-admin/yarn-4.14-support.patch
View File

@@ -1,20 +0,0 @@
diff --git a/.yarnrc.yml b/.yarnrc.yml
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -1 +1,4 @@
-yarnPath: .yarn/releases/yarn-4.4.1.cjs
+approvedGitRepositories:
+ - "**"
+
+enableScripts: true
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,6 @@
# Manual changes might be lost - proceed with caution!
__metadata:
- version: 8
+ version: 9
cacheKey: 10c0

41
pkgs/by-name/sy/synapse-admin/yarn-fix.patch Normal file
View File

@@ -0,0 +1,41 @@
diff --git a/.yarnrc.yml b/.yarnrc.yml
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -1 +1,4 @@
-yarnPath: .yarn/releases/yarn-4.4.1.cjs
+approvedGitRepositories:
+ - "**"
+
+enableScripts: true
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,6 @@
# Manual changes might be lost - proceed with caution!
__metadata:
- version: 8
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0
diff --git a/yarn.lock b/yarn.lock
index 7ecce1c508a4..6df14e5f4603 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7366,14 +7366,14 @@ __metadata:
"resolve@patch:resolve@npm%3A^1.19.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin<compat/resolve>":
version: 1.22.8
- resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
+ resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin<compat/resolve>::version=1.22.8&hash=9bd1a5"
dependencies:
is-core-module: "npm:^2.13.0"
path-parse: "npm:^1.0.7"
supports-preserve-symlinks-flag: "npm:^1.0.0"
bin:
resolve: bin/resolve
- checksum: 10c0/0446f024439cd2e50c6c8fa8ba77eaa8370b4180f401a96abf3d1ebc770ac51c1955e12764cde449fde3fff480a61f84388e3505ecdbab778f4bef5f8212c729
+ checksum: 10c0/4bc6de64a713422234e0e773bff296767d77d6e545b98042ff90a796d356f2b131853f4fa1d54e2c415aa6efa6dc2eed5b3f501f63164f834619fda900e33b8e
languageName: node
linkType: hard

13
pkgs/by-name/ti/tilt/assets.nix
View File

@@ -8,17 +8,10 @@
src,
}:
let
patches = [
# Remove after upstream updates to Yarn 4.14
# https://github.com/tilt-dev/tilt/blob/master/web/package.json#L94
./yarn-4.14-support.patch
];
in
stdenvNoCC.mkDerivation {
pname = "tilt-assets";
src = "${src}/web";
inherit version patches;
inherit version;
nativeBuildInputs = [
nodejs
@@ -29,8 +22,6 @@ stdenvNoCC.mkDerivation {
name = "tilt-assets-deps";
src = "${src}/web";
inherit patches;
nativeBuildInputs = [ yarn-berry ];
supportedArchitectures = builtins.toJSON {
@@ -77,7 +68,7 @@ stdenvNoCC.mkDerivation {
dontInstall = true;
outputHashAlgo = "sha256";
outputHash = "sha256-MOEf6LZuHoOMX6OWqTn9j7AKIyC2lzt4SUXKWfE8B5A=";
outputHash = "sha256-fJwBXemRFvT5pA0McrXMGeuaCLjyHXwTMf5/Rh+jPvs=";
outputHashMode = "recursive";
};

22
pkgs/by-name/ti/tilt/package.nix
View File

@@ -1,6 +1,8 @@
{
fetchFromGitHub,
substitute,
callPackage,
yarn-berry,
}:
let
args = rec {
@@ -15,10 +17,26 @@ let
owner = "tilt-dev";
repo = "tilt";
tag = "v${version}";
hash = "sha256-tMP3EYgwulyqmuL3yE3CtCBIs2QhoWzW8PnYF+//bgs=";
hash = "sha256-ECECNXxO7fkX3eyNBWMlr9yqgiJKas0XpDA48lQNnr8=";
# Remove after upstream updates to Yarn 4.15
# https://github.com/tilt-dev/tilt/blob/master/web/package.json#L98
postFetch = ''
cd $out/web
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry.lockfileVersion
];
})
}
'';
};
};
tilt-assets = callPackage ./assets.nix args;
tilt-assets = callPackage ./assets.nix (args // { inherit yarn-berry; });
in
callPackage ./binary.nix (args // { inherit tilt-assets; })

23
pkgs/by-name/ti/tilt/yarn-4.14-support.patch
View File

@@ -1,23 +0,0 @@
diff --git a/.yarnrc.yml b/.yarnrc.yml
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -6,4 +6,7 @@ enableGlobalCache: false
nodeLinker: node-modules
-yarnPath: .yarn/releases/yarn-4.9.3.cjs
+approvedGitRepositories:
+ - "**"
+
+enableScripts: true
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,6 @@
# Manual changes might be lost - proceed with caution!
__metadata:
- version: 8
+ version: 9
cacheKey: 10

58
pkgs/by-name/ti/tilt/yarn-fix.patch Normal file
View File

@@ -0,0 +1,58 @@
diff --git a/.yarnrc.yml b/.yarnrc.yml
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -6,4 +6,7 @@ enableGlobalCache: false
nodeLinker: node-modules
-yarnPath: .yarn/releases/yarn-4.9.3.cjs
+approvedGitRepositories:
+ - "**"
+
+enableScripts: true
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,6 @@
# Manual changes might be lost - proceed with caution!
__metadata:
- version: 8
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -18405,27 +18405,27 @@ __metadata:
"resolve@patch:resolve@npm%3A^1.1.7#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.2#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.3.2#optional!builtin<compat/resolve>":
version: 1.22.8
- resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
+ resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin<compat/resolve>::version=1.22.8&hash=9bd1a5"
dependencies:
is-core-module: "npm:^2.13.0"
path-parse: "npm:^1.0.7"
supports-preserve-symlinks-flag: "npm:^1.0.0"
bin:
resolve: bin/resolve
- checksum: 10/f345cd37f56a2c0275e3fe062517c650bb673815d885e7507566df589375d165bbbf4bdb6aa95600a9bc55f4744b81f452b5a63f95b9f10a72787dba3c90890a
+ checksum: 10/b14c82cbce48701a1e963c60f196b91a289186e8b596334e09c881df8069cefcfb0ac9ce85ea768742b361a58005494bf2428a95dc5056d2ba441aa993731b1f
languageName: node
linkType: hard
"resolve@patch:resolve@npm%3A^2.0.0-next.4#optional!builtin<compat/resolve>":
version: 2.0.0-next.5
- resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#optional!builtin<compat/resolve>::version=2.0.0-next.5&hash=c3c19d"
+ resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#optional!builtin<compat/resolve>::version=2.0.0-next.5&hash=9bd1a5"
dependencies:
is-core-module: "npm:^2.13.0"
path-parse: "npm:^1.0.7"
supports-preserve-symlinks-flag: "npm:^1.0.0"
bin:
resolve: bin/resolve
- checksum: 10/05fa778de9d0347c8b889eb7a18f1f06bf0f801b0eb4610b4871a4b2f22e220900cf0ad525e94f990bb8d8921c07754ab2122c0c225ab4cdcea98f36e64fa4c2
+ checksum: 10/76c221deb1d986c0a80cd576373b0ee09f42871e0085a1f76beda84f73ce04e0d21bab28dffd326eb006a7af83bbc582404566b384aa3b0baa217f56cf7e8618
languageName: node
linkType: hard

29
pkgs/by-name/up/uppy-companion/package.nix
View File

@@ -3,6 +3,7 @@
stdenv,
nodejs,
fetchFromGitHub,
substitute,
yarn-berry_4,
}:
@@ -14,14 +15,24 @@ stdenv.mkDerivation (finalAttrs: {
owner = "transloadit";
repo = "uppy";
tag = "@uppy/companion@${finalAttrs.version}";
hash = "sha256-FF5I4D9obRVJqyjucemnxZiPcNHdQdo3S0z/h96Fe6c=";
};
hash = "sha256-4Xbw4d0SaLPk4mmvG9QWkUuVX/SM1SmGtuaK85rLihU=";
patches = [
# Remove after upstream updates to Yarn 4.14
# https://github.com/transloadit/uppy/blob/main/package.json#L39
./yarn-4.14-support.patch
];
# Remove after upstream updates to Yarn 4.15
# https://github.com/transloadit/uppy/blob/main/package.json#L38
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry_4.lockfileVersion
];
})
}
'';
};
nativeBuildInputs = [
nodejs
@@ -36,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
missingHashes = ./missing-hashes.json;
offlineCache = yarn-berry_4.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes patches;
hash = "sha256-vmya3c+ec93T8kNoooUu4risqScY0b4cwML7d2kYz88=";
inherit (finalAttrs) src missingHashes;
hash = "sha256-MQTaNbeJuvWDtRajJQYRtuxiMrLGKtlasyB6sKeOIgs=";
};
buildPhase = ''

2
pkgs/by-name/up/uppy-companion/yarn-4.14-support.patch → pkgs/by-name/up/uppy-companion/yarn-fix.patch
View File

@@ -17,6 +17,6 @@ diff --git a/yarn.lock b/yarn.lock
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10

29
pkgs/by-name/vu/vultisig-cli/package.nix
View File

@@ -4,6 +4,7 @@
fetchFromGitHub,
nodejs,
yarn-berry,
substitute,
makeWrapper,
}:
@@ -15,20 +16,30 @@ stdenv.mkDerivation (finalAttrs: {
owner = "vultisig";
repo = "vultisig-sdk";
tag = "v${finalAttrs.version}";
hash = "sha256-4I+N9uKZBzw0AePjS8CiALye/fuykBtpAoYxp+5iTW8=";
};
hash = "sha256-IFEses2Gs0HdgXVMpNYA6y7PtnMMDVLSoAuyi3a+ZgE=";
patches = [
# Remove after upstream updates to Yarn 4.14
# https://github.com/vultisig/vultisig-sdk/blob/main/package.json#L4
./yarn-4.14-support.patch
];
# Remove when updating since upstream has updated to Yarn 4.16
# https://github.com/vultisig/vultisig-sdk/commit/45611297a55da72d3c56b1a2ffe6522da1b64d7b
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry.lockfileVersion
];
})
}
'';
};
missingHashes = ./missing-hashes.json;
offlineCache = yarn-berry.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes patches;
hash = "sha256-EW0Vc3502xoL4iDr2hPDXQ39McvvsiBWpMKgZRtF44M=";
inherit (finalAttrs) src missingHashes;
hash = "sha256-e5sNNDJVYY4PgbpYtrzxzOL+rtYq1ZwOYglJvZ6OKzo=";
};
nativeBuildInputs = [

2
pkgs/by-name/vu/vultisig-cli/yarn-4.14-support.patch → pkgs/by-name/vu/vultisig-cli/yarn-fix.patch
View File

@@ -17,6 +17,6 @@ diff --git a/yarn.lock b/yarn.lock
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0

2
pkgs/by-name/ya/yarn-berry/fetcher/berry-4-offline.patch
View File

@@ -6,7 +6,7 @@ index 90ba55349..ef5368c1b 100644
for (const rule of LOCKFILE_MIGRATION_RULES) {
if (rule.selector(lockfileLastVersion) && typeof configuration.sources.get(rule.name) === `undefined`) {
+ throw new Error(`Tried to use yarn-berry_4.yarnConfigHook (nixpkgs) which expects lockfile version 8, but found lockfile version ${lockfileLastVersion}`);
+ throw new Error(`Tried to use yarn-berry_4.yarnConfigHook (nixpkgs) which expects lockfile version @YARN_LOCKFILE_VERSION_PLACEHOLDER@, but found lockfile version ${lockfileLastVersion}`);
configuration.use(`<compat>`, {[rule.name]: rule.value}, project.cwd, {overwrite: true});
newSettings[rule.name] = rule.value;
}

1
pkgs/by-name/ya/yarn-berry/fetcher/default.nix
View File

@@ -40,6 +40,7 @@ let
berryOfflinePatches = [
(replaceVars ./berry-4-offline.patch {
yarnv1 = lib.getExe yarn;
YARN_LOCKFILE_VERSION_PLACEHOLDER = yarn-berry.lockfileVersion;
})
];

12
pkgs/by-name/ya/yarn-berry/package.nix
View File

@@ -6,17 +6,17 @@
stdenv,
testers,
yarn,
git,
gitMinimal,
callPackage,
berryVersion ? 4,
}:
let
version_4 = "4.14.1";
version_4 = "4.18.0";
version_3 = "3.8.7";
hash_4 = "sha256-0UnU5jRSUFMw+WowvXqYqaaN1ZbZAdLLJ6LPyuK6iCc=";
hash_4 = "sha256-pO89wh17cW9/RGKjo70yiefr+9nlJAQs4ZEdUnzdgQM=";
hash_3 = "sha256-vRrk+Fs/7dZha3h7yI5NpMfd1xezesnigpFgTRCACZo=";
lockfileVersion_4 = "9";
lockfileVersion_4 = "10";
lockfileVersion_3 = "6";
in
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
nodejs
yarn
git
gitMinimal
];
strictDeps = true;
@@ -81,8 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
'';
passthru = {
lockfileVersion = finalAttrs.lockfileVersion;
updateScript = ./update.sh;
tests =

24
pkgs/by-name/yt/ytmdesktop/package.nix
View File

@@ -9,6 +9,7 @@
makeWrapper,
nodejs,
yarn-berry_4,
substitute,
zip,
electron,
@@ -34,9 +35,22 @@ stdenv.mkDerivation (finalAttrs: {
cd $out
git rev-parse HEAD > .COMMIT
find -name .git -print0 | xargs -0 rm -rf
# Remove after upstream updates to Yarn 4.14
# https://github.com/ytmdesktop/ytmdesktop/blob/v2.0.11/package.json#L77
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry.lockfileVersion
];
})
}
'';
hash = "sha256-3gUEdkTFaO6WT13HyVssVX0qSmluOPm4AAy1dovHw6g=";
hash = "sha256-Frw4Bn9/koeRl6Wl6ykiIdb3+wIMhVRfgHhMZhzgqVc=";
};
patches = [
@@ -44,10 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
# use the .COMMIT file generated in the fetcher FOD
./git-rev-parse.patch
# Remove after upstream updates to Yarn 4.14
# https://github.com/ytmdesktop/ytmdesktop/blob/v2.0.11/package.json#L77
./yarn-4.14-support.patch
# zip extraction fails on newer nodejs versions without this fix
# generated by running `yarn set resolution yauzl@npm:^2.10.0 npm:^3.3.1`
./bump-yauzl.patch
@@ -64,8 +74,8 @@ stdenv.mkDerivation (finalAttrs: {
missingHashes = ./missing-hashes.json;
yarnOfflineCache = yarn-berry.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes patches;
hash = "sha256-VpNK+44/FwHxZ+Hyx0QShpZ9fdP06VhhpoXxMFeLUzE=";
inherit (finalAttrs) src patches missingHashes;
hash = "sha256-YBZRfr6RU4f+9KXgKJcTF0P08er7eyiv8jVULVIYWXI=";
};
nativeBuildInputs = [

2
pkgs/by-name/yt/ytmdesktop/yarn-4.14-support.patch → pkgs/by-name/yt/ytmdesktop/yarn-fix.patch
View File

@@ -17,6 +17,6 @@ diff --git a/yarn.lock b/yarn.lock
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0

22
pkgs/development/python-modules/locust/default.nix
View File

@@ -4,6 +4,7 @@
python,
callPackage,
fetchFromGitHub,
substitute,
hatchling,
hatch-vcs,
pytestCheckHook,
@@ -24,6 +25,7 @@
retry,
tomli,
werkzeug,
yarn-berry,
}:
buildPythonPackage rec {
@@ -35,7 +37,23 @@ buildPythonPackage rec {
owner = "locustio";
repo = "locust";
tag = version;
hash = "sha256-Diz5fGcX8hXQSuNT20LUcjKJZEYNvN+6myrGi5F4Hss=";
hash = "sha256-IFKphE/RuGXsCmddXNppnHzayTSETaFLrOm26+6tyBI=";
# Remove after upstream updates to Yarn 4.15
# https://github.com/locustio/locust/blob/master/locust/webui/package.json#L89
postFetch = ''
cd $out/locust/webui
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry.lockfileVersion
];
})
}
'';
};
postPatch = ''
@@ -47,7 +65,7 @@ buildPythonPackage rec {
'';
webui = callPackage ./webui.nix {
inherit version;
inherit version yarn-berry;
src = "${src}/locust/webui";
};

15
pkgs/development/python-modules/locust/webui.nix
View File

@@ -1,28 +1,19 @@
{
stdenv,
yarn-berry_4,
yarn-berry,
nodejs,
version,
src,
lib,
}:
let
yarn-berry = yarn-berry_4;
in
stdenv.mkDerivation (finalAttrs: {
pname = "locust-ui";
inherit version src;
patches = [
# Remove after upstream updates to Yarn 4.14
# https://github.com/locustio/locust/blob/master/locust/webui/package.json#L89
./yarn-4.14-support.patch
];
missingHashes = ./missing-hashes.json;
yarnOfflineCache = yarn-berry.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes patches;
hash = "sha256-1pAoz/fkxrTCJZsSuAnm1Pfn5qjEbup8utEUoDvYJSE=";
inherit (finalAttrs) src missingHashes;
hash = "sha256-fjvgnXKenRxML1JkpxYIOnVuNZ7BpU9L/XgblcQV0vA=";
};
nativeBuildInputs = [

2
pkgs/development/python-modules/locust/yarn-4.14-support.patch → pkgs/development/python-modules/locust/yarn-fix.patch
View File

@@ -17,6 +17,6 @@ diff --git a/yarn.lock b/yarn.lock
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0

14
pkgs/development/tools/electron/common.nix
View File

@@ -12,6 +12,7 @@
yarn-berry_4,
unzip,
writers,
substitute,
libnotify,
libpulseaudio,
@@ -26,9 +27,16 @@ let
gclientDeps = gclient2nix.importGclientDeps info.deps;
yarn-berry = yarn-berry_4;
# Only apply to old versions after upstream updates to Yarn 4.14
# https://github.com/electron/electron/blob/main/package.json#L148
yarnPatch = ./yarn-4.14-support.patch;
# Only apply to old versions after upstream updates to Yarn 4.15
# https://github.com/electron/electron/blob/main/package.json#L152
yarnPatch = substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry_4.lockfileVersion
];
};
in
((chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {

6
pkgs/development/tools/electron/info.json
View File

@@ -1359,7 +1359,7 @@
}
},
"electron_yarn_data": {
"hash": "sha256-KNbWANdqpF3rypdyGKgj9ykGXQ/+VtkE5L/XR1lqbps=",
"hash": "sha256-tliyfTfe+PwJ9WRxzbfKlSk9dja6U9Luoir+e0Vf0qc=",
"missing_hashes": {
"@oxfmt/binding-android-arm-eabi@npm:0.42.0": "42c08d87ce491086843070241f8777fa2cb968f4a08f67b3f6c33a8f67e0b3eac50eae146daede743e90e3bc32326951c5188814eea02e9c3e4a9764a4b492ba",
"@oxfmt/binding-android-arm64@npm:0.42.0": "73e6609498d05c655c6a435af9f3e4f341137c260c7ae27fbb0377573574ca5200bd9f187aa90d442879733bbd0c4e91ae023c3b4579c9a57413a0b2922c023a",
@@ -2773,7 +2773,7 @@
}
},
"electron_yarn_data": {
"hash": "sha256-0DiQw6UGeZ7BLNvUJihE77Io72AUfgcLMMmV+GxhfVw=",
"hash": "sha256-NRMcHEijch3Z5dfBEF4vC5wYp86StZr+agu/YGfyFEo=",
"missing_hashes": {
"@oxfmt/binding-android-arm-eabi@npm:0.42.0": "42c08d87ce491086843070241f8777fa2cb968f4a08f67b3f6c33a8f67e0b3eac50eae146daede743e90e3bc32326951c5188814eea02e9c3e4a9764a4b492ba",
"@oxfmt/binding-android-arm64@npm:0.42.0": "73e6609498d05c655c6a435af9f3e4f341137c260c7ae27fbb0377573574ca5200bd9f187aa90d442879733bbd0c4e91ae023c3b4579c9a57413a0b2922c023a",
@@ -4203,7 +4203,7 @@
}
},
"electron_yarn_data": {
"hash": "sha256-Y2TE5iMVUgXqqKojb90yzcCfFAhEy7STB53yYQQanPM=",
"hash": "sha256-ZJs1Fg7jsIvghxDXQ4LZfI0VaZPePdXhwasHof8y6f8=",
"missing_hashes": {
"@oxfmt/binding-android-arm-eabi@npm:0.42.0": "42c08d87ce491086843070241f8777fa2cb968f4a08f67b3f6c33a8f67e0b3eac50eae146daede743e90e3bc32326951c5188814eea02e9c3e4a9764a4b492ba",
"@oxfmt/binding-android-arm64@npm:0.42.0": "73e6609498d05c655c6a435af9f3e4f341137c260c7ae27fbb0377573574ca5200bd9f187aa90d442879733bbd0c4e91ae023c3b4579c9a57413a0b2922c023a",

2
pkgs/development/tools/electron/yarn-4.14-support.patch → pkgs/development/tools/electron/yarn-fix.patch
View File

@@ -15,6 +15,6 @@ diff --git a/yarn.lock b/yarn.lock
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0

27
pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix
View File

@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
substitute,
gitMinimal,
yarn-berry_4,
nodejs,
@@ -16,14 +17,26 @@ stdenv.mkDerivation (finalAttrs: {
owner = "dermotduffy";
repo = "advanced-camera-card";
tag = "v${finalAttrs.version}";
hash = "sha256-NdWP2nYzDEzmO4DpwVUpn3/KsungKNOzOQf8FxZ4fGw=";
hash = "sha256-I1dm7TZMK/eRF2Uld3e+r4PQBaL9oJc+NI+/5cxaGUs=";
# Remove after upstream updates to Yarn 4.15
# https://github.com/dermotduffy/advanced-camera-card/blob/main/package.json#L201
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry_4.lockfileVersion
];
})
}
'';
};
patches = [
# Remove after upstream updates to Yarn 4.14
# https://github.com/dermotduffy/advanced-camera-card/blob/main/package.json#L201
./yarn-4.14-support.patch
# Drop hard dependency on .git repo during build
./gitinfo.patch
];
@@ -37,8 +50,8 @@ stdenv.mkDerivation (finalAttrs: {
offlineCache = yarn-berry_4.fetchYarnBerryDeps {
name = "${finalAttrs.pname}-yarn-deps";
inherit (finalAttrs) src missingHashes patches;
hash = "sha256-4fdSeSxSjd8EjPmu7U3ftxB+OJJc2uuvM3Umr5iY/a8=";
inherit (finalAttrs) src missingHashes;
hash = "sha256-vbDX5TkUrNqqWLq465mLyGkQ4L8QWJtKv5aCR98P/SI=";
};
nativeBuildInputs = [

2
pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/yarn-4.14-support.patch → pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/yarn-fix.patch
View File

@@ -16,6 +16,6 @@ diff --git a/yarn.lock b/yarn.lock
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0

27
pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix
View File

@@ -3,6 +3,7 @@
fetchFromGitHub,
stdenvNoCC,
yarn-berry,
substitute,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
@@ -13,14 +14,24 @@ stdenvNoCC.mkDerivation (finalAttrs: {
owner = "rejuvenate";
repo = "lovelace-horizon-card";
tag = "v${finalAttrs.version}";
hash = "sha256-n8UNL5kSwLz1ncGranmbGyIC5mIKGIV2F3cEF0PSwnU=";
};
hash = "sha256-p4GI4R5P1LjiXwzF1Hlk6Kk57i+YUcEEsm8bN+qIYdE=";
patches = [
# Remove after upstream updates to Yarn 4.14
# Remove after upstream updates to Yarn 4.15
# https://github.com/rejuvenate/lovelace-horizon-card/blob/main/package.json#L4
./yarn-4.14-support.patch
];
postFetch = ''
cd $out
patch -p1 < ${
(substitute {
src = ./yarn-fix.patch;
substitutions = [
"--replace-fail"
"YARN_LOCKFILE_VERSION_PLACEHOLDER"
yarn-berry.lockfileVersion
];
})
}
'';
};
nativeBuildInputs = [
yarn-berry
@@ -30,8 +41,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
# nix run nixpkgs#yarn-berry_4.yarn-berry-fetcher missing-hashes yarn.lock
missingHashes = ./missing-hashes.json;
offlineCache = yarn-berry.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes patches;
hash = "sha256-WrBUsho7GZI/Un2zvhqZ970psDeAiESiBGJikgX3E5Q=";
inherit (finalAttrs) src missingHashes;
hash = "sha256-iHMIcnCQEbDkAugB9FO4G++eDq3/ABfp0E7Q6893fVY=";
};
buildPhase = ''

2
pkgs/by-name/li/linkwarden/02-yarn-4.14-support.patch → pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/yarn-fix.patch
View File

@@ -15,6 +15,6 @@ diff --git a/yarn.lock b/yarn.lock
__metadata:
- version: 8
+ version: 9
+ version: YARN_LOCKFILE_VERSION_PLACEHOLDER
cacheKey: 10c0