mirror of
https://github.com/CHN-beta/nixpkgs.git
synced 2026-01-11 10:22:54 +08:00
[Backport release-25.05] anytype: 0.46.5 -> 0.49.2 (#441083)
This commit is contained in:
@@ -13,12 +13,12 @@ let
|
||||
pname = "anytype-heart";
|
||||
# Use only versions specified in anytype-ts middleware.version file:
|
||||
# https://github.com/anyproto/anytype-ts/blob/v<anytype-ts-version>/middleware.version
|
||||
version = "0.40.21";
|
||||
version = "0.43.0-rc02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "anyproto";
|
||||
repo = "anytype-heart";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-53LSaETzxwhKkI9is6N6G1+f5Cnf7KStvHA9qeaWUNo=";
|
||||
hash = "sha256-hqDwzW1Tl44ipL1EAwlXUoKaQ0Wvfa2rtZMQy4pgQ8k=";
|
||||
};
|
||||
|
||||
arch =
|
||||
@@ -36,7 +36,7 @@ in
|
||||
buildGoModule {
|
||||
inherit pname version src;
|
||||
|
||||
vendorHash = "sha256-WsYRkAIYDkKWkQpq843dD7Rqc993eHSgee2IX6PomcU=";
|
||||
vendorHash = "sha256-Rs+CusvMksyXUplGk09J4CiFgl/D4KtsI9C15dSCjOI=";
|
||||
|
||||
subPackages = [ "cmd/grpcserver" ];
|
||||
tags = [
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From 0622b4b5497d8bd923eb0d6dd3f917dfcbda9d53 Mon Sep 17 00:00:00 2001
|
||||
From: Axel Karjalainen <axel@axka.fi>
|
||||
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
|
||||
|
||||
12
pkgs/by-name/an/anytype/0002-remove-grpc-devtools.patch
Normal file
12
pkgs/by-name/an/anytype/0002-remove-grpc-devtools.patch
Normal file
@@ -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) {
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
buildNpmPackage,
|
||||
pkg-config,
|
||||
@@ -13,27 +14,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 +53,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 = ''
|
||||
@@ -133,5 +134,6 @@ buildNpmPackage {
|
||||
"x86_64-darwin"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tantivy-go";
|
||||
version = "1.0.1";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anyproto";
|
||||
repo = "tantivy-go";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-iTGIm5C7SMBZv2OcKCQCyEZS/eeMJQ5nFSpuFJbTEXU=";
|
||||
hash = "sha256-ksHw+62JwQrzxLuXwYfTLOkC22Miz1Rpl5XX8+vPBcM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-f8xI4g6MK4NUn0DpxD+miaCzBe8FSSqaL5rpjoqUGfY=";
|
||||
cargoHash = "sha256-GKbQFWXKEgYmoTyFCQ/SAgFB7UJpYN2SWwZEiUxd260=";
|
||||
|
||||
cargoPatches = [
|
||||
./add-Cargo.lock.patch
|
||||
|
||||
Reference in New Issue
Block a user