en-croissant: 1.12.2 -> 1.13.0 (#486341)

This commit is contained in:
Antoine du Hamel
2026-02-02 23:11:58 +00:00
committed by GitHub
2 changed files with 5 additions and 176 deletions
@@ -1,166 +0,0 @@
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index f4bc16e..cae6562 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -545,6 +545,17 @@ dependencies = [
"brotli-decompressor",
]
+[[package]]
+name = "brotli"
+version = "7.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+ "brotli-decompressor",
+]
+
[[package]]
name = "brotli-decompressor"
version = "4.0.1"
@@ -690,16 +701,16 @@ dependencies = [
[[package]]
name = "cargo_metadata"
-version = "0.18.1"
+version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
+checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba"
dependencies = [
"camino",
"cargo-platform",
"semver",
"serde",
"serde_json",
- "thiserror 1.0.63",
+ "thiserror 2.0.17",
]
[[package]]
@@ -2661,7 +2672,19 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc"
dependencies = [
- "jsonptr",
+ "jsonptr 0.4.7",
+ "serde",
+ "serde_json",
+ "thiserror 1.0.63",
+]
+
+[[package]]
+name = "json-patch"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08"
+dependencies = [
+ "jsonptr 0.6.3",
"serde",
"serde_json",
"thiserror 1.0.63",
@@ -2678,6 +2701,16 @@ dependencies = [
"serde_json",
]
+[[package]]
+name = "jsonptr"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dea2b27dd239b2556ed7a25ba842fe47fd602e7fc7433c2a8d6106d4d9edd70"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
[[package]]
name = "keyboard-types"
version = "0.7.0"
@@ -4614,13 +4647,15 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.114"
+version = "1.0.149"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
dependencies = [
"itoa 1.0.10",
- "ryu",
+ "memchr",
"serde",
+ "serde_core",
+ "zmij",
]
[[package]]
@@ -5237,7 +5272,7 @@ dependencies = [
"dirs",
"glob",
"heck 0.5.0",
- "json-patch",
+ "json-patch 2.0.0",
"schemars",
"semver",
"serde",
@@ -5255,9 +5290,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95d7443dd4f0b597704b6a14b964ee2ed16e99928d8e6292ae9825f09fbcd30e"
dependencies = [
"base64 0.22.1",
- "brotli",
+ "brotli 6.0.0",
"ico",
- "json-patch",
+ "json-patch 2.0.0",
"plist",
"png",
"proc-macro2",
@@ -5573,18 +5608,19 @@ dependencies = [
[[package]]
name = "tauri-utils"
-version = "2.0.1"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c38b0230d6880cf6dd07b6d7dd7789a0869f98ac12146e0d18d1c1049215a045"
+checksum = "96fb10e7cc97456b2d5b9c03e335b5de5da982039a303a20d10006885e4523a0"
dependencies = [
- "brotli",
+ "brotli 7.0.0",
"cargo_metadata",
"ctor",
"dunce",
"glob",
"html5ever",
+ "http 1.1.0",
"infer",
- "json-patch",
+ "json-patch 3.0.1",
"kuchikiki",
"log",
"memchr",
@@ -5599,7 +5635,7 @@ dependencies = [
"serde_json",
"serde_with",
"swift-rs",
- "thiserror 1.0.63",
+ "thiserror 2.0.17",
"toml 0.8.2",
"url",
"urlpattern",
@@ -7031,6 +7067,12 @@ dependencies = [
"zstd",
]
+[[package]]
+name = "zmij"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fc5a66a20078bf1251bde995aa2fdcc4b800c70b5d92dd2c62abc5c60f679f8"
+
[[package]]
name = "zopfli"
version = "0.8.1"
+5 -10
View File
@@ -27,13 +27,13 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "en-croissant";
version = "0.12.2";
version = "0.13.0";
src = fetchFromGitHub {
owner = "franciscoBSalgueiro";
repo = "en-croissant";
tag = "v${finalAttrs.version}";
hash = "sha256-Ef6O8C1PPjCmF5lashpBQXWwjsEEKCl5R98QMOFDIBM=";
hash = "sha256-+s774MtqbfOhL2qco+i9uBMQPn30EGvOYtqw1nZ9KkY=";
};
pnpmDeps = fetchPnpmDeps {
@@ -43,22 +43,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
src
;
inherit pnpm;
fetcherVersion = 2;
hash = "sha256-p2j886NRBw/8c2UJ94o6w7YtKnOfm7hU9SgEUrzAwco=";
fetcherVersion = 3;
hash = "sha256-/gue4iQG8xySxsH3l5ri+GjmNr/9sow20CLVxxQo7Gs=";
};
cargoPatches = [
# Bump the tauri-utils package to at least 2.1.0, to fix resource path resolution on NixOS.
./en-croissant-update-tauri-utils.patch
];
postPatch = ''
jq '.plugins.updater.endpoints = [ ] | .bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
'';
cargoRoot = "src-tauri";
cargoHash = "sha256-cTb6nKHlazyOu3cpwAAp20j3QmrDxC507ZRpYT5fgQs=";
cargoHash = "sha256-4gtGHexyR6TkI8tmtLMT2xUAn9+Bd9l3hRq43aL94yI=";
buildAndTestSubdir = finalAttrs.cargoRoot;