rclone-ui: 2.8.1 -> 3.2.0 (#475239)
This commit is contained in:
@@ -20,29 +20,31 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rclone-ui";
|
||||
version = "2.8.1";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rclone-ui";
|
||||
repo = "rclone-ui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-z8SAXYK3HgtJSiFTJopo+zVZw2kd8ByUXufyauoUNFM=";
|
||||
hash = "sha256-j4smtUCgHRwTlp2wt9xZjkMN7taYvb2QC6NUJD/nHT4=";
|
||||
};
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
|
||||
inherit (finalAttrs) src;
|
||||
forceGitDeps = true;
|
||||
hash = "sha256-8Os5mFILRpe8tROQdDAW6y/RTp/X0X/5z+Psf/lQpi4=";
|
||||
hash = "sha256-a0GzIIGmfv2EkfEPsQNXr4XN0CGw172FDb5h19j2trM=";
|
||||
};
|
||||
|
||||
cargoRoot = "src-tauri";
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
cargoHash = "sha256-c/BHtHWj8F6mCmIpxDPIVy/5bRBCUFACWZEpsDO6CTU=";
|
||||
cargoHash = "sha256-dO7jkxkY1tinR100H1nfi+0JD2amMsA9BFHl7CeXpXI=";
|
||||
|
||||
# Disable tauri bundle updater, can be removed when #389107 is merged
|
||||
patches = [ ./remove_updater.patch ];
|
||||
# Remove duplicate tao-macros dependency causing fetchCargoVendor failure.
|
||||
cargoPatches = [ ./remove_duplicate_dependency.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src-tauri/tauri.conf.json \
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
|
||||
index a6862ca..ab56106 100644
|
||||
--- a/src-tauri/Cargo.lock
|
||||
+++ b/src-tauri/Cargo.lock
|
||||
@@ -5890,17 +5890,6 @@ dependencies = [
|
||||
"x11-dl",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "tao-macros"
|
||||
-version = "0.1.3"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd"
|
||||
-dependencies = [
|
||||
- "proc-macro2",
|
||||
- "quote",
|
||||
- "syn 2.0.111",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "tao-macros"
|
||||
version = "0.1.3"
|
||||
@@ -1,40 +1,24 @@
|
||||
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
|
||||
index 5200821..8994d35 100644
|
||||
index 60bc177..4693e3c 100644
|
||||
--- a/src-tauri/src/lib.rs
|
||||
+++ b/src-tauri/src/lib.rs
|
||||
@@ -673,7 +673,7 @@ async fn update_system_rclone() -> Result<i32, String> {
|
||||
// Fallback to sudo with custom prompt (works if the user has NOPASSWD or cached credentials)
|
||||
let mut sudo_env = std::collections::HashMap::new();
|
||||
sudo_env.insert("SUDO_PROMPT", "Rclone UI needs permission to run rclone selfupdate. Please enter your password: ");
|
||||
-
|
||||
+
|
||||
let mut sudo_args: Vec<String> = Vec::new();
|
||||
sudo_args.push("-n".to_string());
|
||||
sudo_args.push("env".to_string());
|
||||
@@ -735,11 +735,10 @@ pub fn run() {
|
||||
));
|
||||
|
||||
let _guard = tauri_plugin_sentry::minidump::init(&client);
|
||||
-
|
||||
+
|
||||
let mut app = tauri::Builder::default()
|
||||
.plugin(tauri_plugin_sentry::init_with_no_injection(&client))
|
||||
@@ -629,7 +629,6 @@ pub fn run() {
|
||||
.plugin(tauri_plugin_deep_link::init())
|
||||
.plugin(tauri_plugin_sentry::init_with_no_injection(&client))
|
||||
.plugin(tauri_plugin_clipboard_manager::init())
|
||||
- .plugin(tauri_plugin_updater::Builder::new().build())
|
||||
.plugin(tauri_plugin_os::init())
|
||||
.plugin(tauri_plugin_notification::init())
|
||||
.plugin(tauri_plugin_process::init())
|
||||
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
|
||||
index 933f067..bbb69fc 100644
|
||||
index 68778ef..d8103c4 100644
|
||||
--- a/src-tauri/tauri.conf.json
|
||||
+++ b/src-tauri/tauri.conf.json
|
||||
@@ -87,16 +87,9 @@
|
||||
"rpm": {
|
||||
@@ -87,15 +87,8 @@
|
||||
"depends": ["(libappindicator-gtk3 or libayatana-appindicator-gtk3)"]
|
||||
}
|
||||
- },
|
||||
},
|
||||
- "createUpdaterArtifacts": true
|
||||
+ }
|
||||
},
|
||||
"plugins": {
|
||||
- "updater": {
|
||||
@@ -43,6 +27,6 @@ index 933f067..bbb69fc 100644
|
||||
- "https://github.com/rclone-ui/rclone-ui/releases/latest/download/latest.json"
|
||||
- ]
|
||||
- },
|
||||
"fs": {
|
||||
"requireLiteralLeadingDot": false
|
||||
}
|
||||
"deep-link": {
|
||||
"desktop": {
|
||||
"schemes": ["rclone"]
|
||||
|
||||
Reference in New Issue
Block a user