diff --git a/pkgs/by-name/jo/joplin-desktop/package.nix b/pkgs/by-name/jo/joplin-desktop/package.nix index c0f31bf541f7..ce1c3589d199 100644 --- a/pkgs/by-name/jo/joplin-desktop/package.nix +++ b/pkgs/by-name/jo/joplin-desktop/package.nix @@ -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; }; diff --git a/pkgs/by-name/jo/joplin-desktop/release-data.json b/pkgs/by-name/jo/joplin-desktop/release-data.json index 31c0c409db70..71f8e781c5b7 100644 --- a/pkgs/by-name/jo/joplin-desktop/release-data.json +++ b/pkgs/by-name/jo/joplin-desktop/release-data.json @@ -9,5 +9,5 @@ "npmDepsHash": "sha256-xZJ0Oir1A6sLe0ztIyBu39Yy3D6sNrVaciOYG0k85l0=" } }, - "deps_hash": "sha256-iDclcCwzgmKOMxO4ZdmPyTKPoGY24+6gm19E4+pCB50=" + "deps_hash": "sha256-77uC3QvYzAI6GIBL7uAuf+p6i/M4VptN27NFY/zmeUg=" } diff --git a/pkgs/by-name/jo/joplin-desktop/yarn-4.14-support.patch b/pkgs/by-name/jo/joplin-desktop/yarn-4.14-support.patch new file mode 100644 index 000000000000..dfcc07f08841 --- /dev/null +++ b/pkgs/by-name/jo/joplin-desktop/yarn-4.14-support.patch @@ -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 +