From 3fb3c0acb38340e168bcb76c35df11091076c3c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Koutensk=C3=BD?= Date: Tue, 27 May 2025 20:23:56 +0200 Subject: [PATCH] anytype: 0.46.5 -> 0.49.2 0001-fix-single-instance-detection-when-not-packaged.patch is now included upstream (cherry picked from commit 327eae33cd776a8bb7f1ab07682edb52a7aa4c56) --- ...instance-detection-when-not-packaged.patch | 25 ------------------- .../anytype/0002-remove-grpc-devtools.patch | 12 +++++++++ pkgs/by-name/an/anytype/package.nix | 12 ++++----- 3 files changed, 18 insertions(+), 31 deletions(-) delete mode 100644 pkgs/by-name/an/anytype/0001-fix-single-instance-detection-when-not-packaged.patch create mode 100644 pkgs/by-name/an/anytype/0002-remove-grpc-devtools.patch diff --git a/pkgs/by-name/an/anytype/0001-fix-single-instance-detection-when-not-packaged.patch b/pkgs/by-name/an/anytype/0001-fix-single-instance-detection-when-not-packaged.patch deleted file mode 100644 index 6e09070d72eb..000000000000 --- a/pkgs/by-name/an/anytype/0001-fix-single-instance-detection-when-not-packaged.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0622b4b5497d8bd923eb0d6dd3f917dfcbda9d53 Mon Sep 17 00:00:00 2001 -From: Axel Karjalainen -Date: Thu, 22 May 2025 22:38:14 +0300 -Subject: [PATCH] fix: single instance detection when not packaged - ---- - electron.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/electron.js b/electron.js -index d70f20f..158bb93 100644 ---- a/electron.js -+++ b/electron.js -@@ -76,7 +76,7 @@ if (is.development && !port) { - return; - }; - --if (app.isPackaged && !app.requestSingleInstanceLock()) { -+if (!is.development && !app.requestSingleInstanceLock()) { - Api.exit(mainWindow, '' ,false); - return; - }; --- -2.49.0 - diff --git a/pkgs/by-name/an/anytype/0002-remove-grpc-devtools.patch b/pkgs/by-name/an/anytype/0002-remove-grpc-devtools.patch new file mode 100644 index 000000000000..b0dad3b73d7b --- /dev/null +++ b/pkgs/by-name/an/anytype/0002-remove-grpc-devtools.patch @@ -0,0 +1,12 @@ +diff --git a/electron.js b/electron.js +index c5d6760882..17afc05e26 100644 +--- a/electron.js ++++ b/electron.js +@@ -15,7 +15,6 @@ const store = new Store({ name: [ 'localStorage', suffix ].join('-') }); + + // gRPC DevTools extension ID + const GRPC_DEVTOOLS_ID = 'fohdnlaeecihjiendkfhifhlgldpeopm'; +-const { installExtension } = require('@tomjs/electron-devtools-installer'); + + // Fix notifications app name + if (is.windows) { diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index d59a40637481..9cf0ecc60314 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -13,27 +13,27 @@ let pname = "anytype"; - version = "0.46.5"; + version = "0.49.2"; src = fetchFromGitHub { owner = "anyproto"; repo = "anytype-ts"; tag = "v${version}"; - hash = "sha256-gDlxyHxBLWVBLnaI6rFclfjwqkw9gneBEC7ssmWDKYU="; + hash = "sha256-8+x2FmyR5x9Zrm3t71RSyxAKcJCvnR98+fqHXjBE7aU="; }; description = "P2P note-taking tool"; locales = fetchFromGitHub { owner = "anyproto"; repo = "l10n-anytype-ts"; - rev = "1d7ca0073bdd02d0145b8da3b1b956ca0652a108"; - hash = "sha256-aL79DOIFH3CocbcLW0SJ472mYPZJXrPJyRKy8zXiF4o="; + rev = "873b42df7320ebbbc80d7e2477914dac70363ef7"; + hash = "sha256-Mr0KfXn9NO86QqgBhVjSs2przN/GtjuhJHJ9djo8Feg="; }; in buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-WEw3RCi7dWs2eMYxLH7DcmWBrN4T8T6beIyplcXgJAA="; + npmDepsHash = "sha256-fuNTSZl+4DG/YL34f/+bYK26ruRFAc1hyHVAm256LiE="; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -52,7 +52,7 @@ buildNpmPackage { patches = [ ./0001-feat-update-Disable-auto-checking-for-updates-and-updating-manually.patch - ./0001-fix-single-instance-detection-when-not-packaged.patch + ./0002-remove-grpc-devtools.patch ]; buildPhase = ''