gale: 1.10.0 -> 1.13.0 (#495497)
This commit is contained in:
@@ -1,88 +0,0 @@
|
||||
diff --git a/package.json b/package.json
|
||||
index baa5356..d2c5dcf 100644
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -32,7 +32,7 @@
|
||||
},
|
||||
"type": "module",
|
||||
"dependencies": {
|
||||
- "@tauri-apps/api": "^2.6.0",
|
||||
+ "@tauri-apps/api": "2.7.0",
|
||||
"@tauri-apps/plugin-clipboard-manager": "^2.3.0",
|
||||
"@tauri-apps/plugin-deep-link": "^2.4.0",
|
||||
"@tauri-apps/plugin-dialog": "^2.3.0",
|
||||
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
|
||||
index 562bafc..50dac76 100644
|
||||
--- a/pnpm-lock.yaml
|
||||
+++ b/pnpm-lock.yaml
|
||||
@@ -9,8 +9,8 @@ importers:
|
||||
.:
|
||||
dependencies:
|
||||
'@tauri-apps/api':
|
||||
- specifier: ^2.6.0
|
||||
- version: 2.6.0
|
||||
+ specifier: 2.7.0
|
||||
+ version: 2.7.0
|
||||
'@tauri-apps/plugin-clipboard-manager':
|
||||
specifier: ^2.3.0
|
||||
version: 2.3.0
|
||||
@@ -517,8 +517,8 @@ packages:
|
||||
peerDependencies:
|
||||
vite: ^5.2.0 || ^6 || ^7
|
||||
|
||||
- '@tauri-apps/api@2.6.0':
|
||||
- resolution: {integrity: sha512-hRNcdercfgpzgFrMXWwNDBN0B7vNzOzRepy6ZAmhxi5mDLVPNrTpo9MGg2tN/F7JRugj4d2aF7E1rtPXAHaetg==}
|
||||
+ '@tauri-apps/api@2.7.0':
|
||||
+ resolution: {integrity: sha512-v7fVE8jqBl8xJFOcBafDzXFc8FnicoH3j8o8DNNs0tHuEBmXUDqrCOAzMRX0UkfpwqZLqvrvK0GNQ45DfnoVDg==}
|
||||
|
||||
'@tauri-apps/plugin-clipboard-manager@2.3.0':
|
||||
resolution: {integrity: sha512-81NOBA2P+OTY8RLkBwyl9ZR/0CeggLub4F6zxcxUIfFOAqtky7J61+K/MkH2SC1FMxNBxrX0swDuKvkjkHadlA==}
|
||||
@@ -1548,39 +1548,39 @@ snapshots:
|
||||
tailwindcss: 4.1.11
|
||||
vite: 5.4.19(lightningcss@1.30.1)
|
||||
|
||||
- '@tauri-apps/api@2.6.0': {}
|
||||
+ '@tauri-apps/api@2.7.0': {}
|
||||
|
||||
'@tauri-apps/plugin-clipboard-manager@2.3.0':
|
||||
dependencies:
|
||||
- '@tauri-apps/api': 2.6.0
|
||||
+ '@tauri-apps/api': 2.7.0
|
||||
|
||||
'@tauri-apps/plugin-deep-link@2.4.0':
|
||||
dependencies:
|
||||
- '@tauri-apps/api': 2.6.0
|
||||
+ '@tauri-apps/api': 2.7.0
|
||||
|
||||
'@tauri-apps/plugin-dialog@2.3.0':
|
||||
dependencies:
|
||||
- '@tauri-apps/api': 2.6.0
|
||||
+ '@tauri-apps/api': 2.7.0
|
||||
|
||||
'@tauri-apps/plugin-http@2.5.0':
|
||||
dependencies:
|
||||
- '@tauri-apps/api': 2.6.0
|
||||
+ '@tauri-apps/api': 2.7.0
|
||||
|
||||
'@tauri-apps/plugin-os@2.3.0':
|
||||
dependencies:
|
||||
- '@tauri-apps/api': 2.6.0
|
||||
+ '@tauri-apps/api': 2.7.0
|
||||
|
||||
'@tauri-apps/plugin-process@2.3.0':
|
||||
dependencies:
|
||||
- '@tauri-apps/api': 2.6.0
|
||||
+ '@tauri-apps/api': 2.7.0
|
||||
|
||||
'@tauri-apps/plugin-shell@2.3.0':
|
||||
dependencies:
|
||||
- '@tauri-apps/api': 2.6.0
|
||||
+ '@tauri-apps/api': 2.7.0
|
||||
|
||||
'@tauri-apps/plugin-updater@2.9.0':
|
||||
dependencies:
|
||||
- '@tauri-apps/api': 2.6.0
|
||||
+ '@tauri-apps/api': 2.7.0
|
||||
|
||||
'@types/cookie@0.6.0': {}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
fetchurl,
|
||||
|
||||
jq,
|
||||
moreutils,
|
||||
@@ -18,20 +18,35 @@
|
||||
libsoup_3,
|
||||
openssl,
|
||||
webkitgtk_4_1,
|
||||
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
inlangModules = [
|
||||
(fetchurl {
|
||||
name = "plugin-message-format-index.js";
|
||||
url = "https://cdn.jsdelivr.net/npm/@inlang/plugin-message-format@4/dist/index.js";
|
||||
hash = "sha256-IOyECYVo8YqD2jYePrrfWGImn6M1FQzJvVDXmaSP31c=";
|
||||
})
|
||||
(fetchurl {
|
||||
name = "plugin-m-function-matcher-index.js";
|
||||
url = "https://cdn.jsdelivr.net/npm/@inlang/plugin-m-function-matcher@2/dist/index.js";
|
||||
hash = "sha256-hYYvYwV5O1a/2a/lNosJbmP7Kuqzi3eZwFFRe+NJnAs=";
|
||||
})
|
||||
];
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gale";
|
||||
version = "1.10.0";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kesomannen";
|
||||
repo = "gale";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-SnPYuMYdoY69CWMztuDxw0ohRDU2uECNhBs46hLg+eA=";
|
||||
hash = "sha256-q/DBgAOFyIqhagWffJ6z+F7TXAZd7otPOGJI4oid4vM=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-frontend-backend-tauri-version-mismatch.patch ];
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs)
|
||||
pname
|
||||
@@ -40,18 +55,22 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
patches
|
||||
;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-ILhAhpY9a50a0KKWs5Y+G3jDyWuySHw8QcOJlYePzmc=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-bCGiYVmoWjpwneTQUwetna7u29BMIv48qWgZ2gd93hQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
|
||||
|
||||
substituteInPlace project.inlang/settings.json ${
|
||||
lib.concatMapStringsSep " " (m: "--replace-fail ${m.url} ${m}") inlangModules
|
||||
}
|
||||
'';
|
||||
|
||||
cargoRoot = "src-tauri";
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
cargoHash = "sha256-tWQRYD6hMU7cvtelGryLdpfoEnUKYt7yYNwHTFZ4pLw=";
|
||||
cargoHash = "sha256-V8MKgicqHU9kEMTw17xeM2pzzkAlGBZJ2j4W5OEIit0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
|
||||
Reference in New Issue
Block a user