mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-02 04:50:21 +00:00
joplin-desktop: fix package, partially revert merge f83b24d5df
This commit is contained in:
@@ -44,10 +44,6 @@ 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*
|
||||
|
||||
# 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;
|
||||
};
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"version": "3.6.16",
|
||||
"hash": "sha256-S1PIhotA0Y57ZeT9xBcbMInblwFK8LKwXlcnMs2TB3Q=",
|
||||
"version": "3.7.18",
|
||||
"hash": "sha256-12ZRoEutQsNJlrPypNrsffeIj+2ekqB/s6HN9ks/+rU=",
|
||||
"plugins": {
|
||||
"io.github.jackgruber.backup": {
|
||||
"name": "joplin-plugin-backup",
|
||||
@@ -9,5 +9,5 @@
|
||||
"npmDepsHash": "sha256-xZJ0Oir1A6sLe0ztIyBu39Yy3D6sNrVaciOYG0k85l0="
|
||||
}
|
||||
},
|
||||
"deps_hash": "sha256-mj9s97D/4UJqctl5NtyJRWYTc6fFAC0ueZE78KZVFsQ="
|
||||
"deps_hash": "sha256-W5hXh1i1rTe4OkhTvHPpDQgPSvRqTZ/GsJnHXE2D/2Y="
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user