joplin-desktop: fix for Yarn 4.14
This commit is contained in:
@@ -47,10 +47,21 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit (releaseData) hash;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove after upstream updates to Yarn 4.14
|
||||
# https://github.com/laurent22/joplin/blob/dev/package.json#L103
|
||||
./yarn-4.14-support.patch
|
||||
];
|
||||
|
||||
missingHashes = ./missing-hashes.json;
|
||||
|
||||
offlineCache = yarn-berry.fetchYarnBerryDeps {
|
||||
inherit (finalAttrs) src missingHashes postPatch;
|
||||
inherit (finalAttrs)
|
||||
src
|
||||
missingHashes
|
||||
patches
|
||||
postPatch
|
||||
;
|
||||
hash = releaseData.deps_hash;
|
||||
};
|
||||
|
||||
|
||||
@@ -9,5 +9,5 @@
|
||||
"npmDepsHash": "sha256-xZJ0Oir1A6sLe0ztIyBu39Yy3D6sNrVaciOYG0k85l0="
|
||||
}
|
||||
},
|
||||
"deps_hash": "sha256-iDclcCwzgmKOMxO4ZdmPyTKPoGY24+6gm19E4+pCB50="
|
||||
"deps_hash": "sha256-77uC3QvYzAI6GIBL7uAuf+p6i/M4VptN27NFY/zmeUg="
|
||||
}
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
diff --git a/.yarnrc.yml b/.yarnrc.yml
|
||||
--- a/.yarnrc.yml
|
||||
+++ b/.yarnrc.yml
|
||||
@@ -5,7 +5,10 @@ nodeLinker: node-modules
|
||||
compressionLevel: mixed
|
||||
enableGlobalCache: false
|
||||
|
||||
-yarnPath: .yarn/releases/yarn-4.9.2.cjs
|
||||
+approvedGitRepositories:
|
||||
+ - "**"
|
||||
+
|
||||
+enableScripts: true
|
||||
|
||||
logFilters:
|
||||
# Disable useless non-actionable warnings.
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user