neohtop: fix tauri version mismatch (#441436)

authored by

Aleksana and committed by
GitHub
c75de008 5097cd69

+256 -2
+6 -2
pkgs/by-name/ne/neohtop/package.nix
··· 31 hash = "sha256-t0REXcsy9XIIARiI7lkOc5lO/ZSL50KOUK+SMsXpjdM="; 32 }; 33 34 - cargoHash = "sha256-nFWF1ER3vk1G/MBw8to+lDJAv6HJNobhdPXV0hVERFE="; 35 36 cargoRoot = "src-tauri"; 37 ··· 60 mainProgram = "NeoHtop"; 61 license = lib.licenses.mit; 62 platforms = lib.platforms.linux ++ lib.platforms.darwin; 63 - maintainers = with lib.maintainers; [ ]; 64 }; 65 })
··· 31 hash = "sha256-t0REXcsy9XIIARiI7lkOc5lO/ZSL50KOUK+SMsXpjdM="; 32 }; 33 34 + cargoPatches = [ 35 + # Remove when https://github.com/Abdenasser/neohtop/pull/187 is released 36 + ./tauri-version.patch 37 + ]; 38 + cargoHash = "sha256-fl/slVYr5RExI9ab8YeX2Q8mF+cnR1R1rUg5i11ao4M="; 39 40 cargoRoot = "src-tauri"; 41 ··· 64 mainProgram = "NeoHtop"; 65 license = lib.licenses.mit; 66 platforms = lib.platforms.linux ++ lib.platforms.darwin; 67 + maintainers = with lib.maintainers; [ sandarukasa ]; 68 }; 69 })
+250
pkgs/by-name/ne/neohtop/tauri-version.patch
···
··· 1 + diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock 2 + index 7e91351..16af8fb 100644 3 + --- a/src-tauri/Cargo.lock 4 + +++ b/src-tauri/Cargo.lock 5 + @@ -379,6 +379,16 @@ version = "0.4.0" 6 + source = "registry+https://github.com/rust-lang/crates.io-index" 7 + checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" 8 + 9 + +[[package]] 10 + +name = "cookie" 11 + +version = "0.18.1" 12 + +source = "registry+https://github.com/rust-lang/crates.io-index" 13 + +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" 14 + +dependencies = [ 15 + + "time", 16 + + "version_check", 17 + +] 18 + + 19 + [[package]] 20 + name = "core-foundation" 21 + version = "0.10.0" 22 + @@ -762,15 +772,6 @@ dependencies = [ 23 + "miniz_oxide", 24 + ] 25 + 26 + -[[package]] 27 + -name = "fluent-uri" 28 + -version = "0.1.4" 29 + -source = "registry+https://github.com/rust-lang/crates.io-index" 30 + -checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d" 31 + -dependencies = [ 32 + - "bitflags 1.3.2", 33 + -] 34 + - 35 + [[package]] 36 + name = "fnv" 37 + version = "1.0.7" 38 + @@ -1507,41 +1508,18 @@ dependencies = [ 39 + "wasm-bindgen", 40 + ] 41 + 42 + -[[package]] 43 + -name = "json-patch" 44 + -version = "2.0.0" 45 + -source = "registry+https://github.com/rust-lang/crates.io-index" 46 + -checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc" 47 + -dependencies = [ 48 + - "jsonptr 0.4.7", 49 + - "serde", 50 + - "serde_json", 51 + - "thiserror 1.0.65", 52 + -] 53 + - 54 + [[package]] 55 + name = "json-patch" 56 + version = "3.0.1" 57 + source = "registry+https://github.com/rust-lang/crates.io-index" 58 + checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08" 59 + dependencies = [ 60 + - "jsonptr 0.6.3", 61 + + "jsonptr", 62 + "serde", 63 + "serde_json", 64 + "thiserror 1.0.65", 65 + ] 66 + 67 + -[[package]] 68 + -name = "jsonptr" 69 + -version = "0.4.7" 70 + -source = "registry+https://github.com/rust-lang/crates.io-index" 71 + -checksum = "1c6e529149475ca0b2820835d3dce8fcc41c6b943ca608d32f35b449255e4627" 72 + -dependencies = [ 73 + - "fluent-uri", 74 + - "serde", 75 + - "serde_json", 76 + -] 77 + - 78 + [[package]] 79 + name = "jsonptr" 80 + version = "0.6.3" 81 + @@ -3146,9 +3124,9 @@ dependencies = [ 82 + 83 + [[package]] 84 + name = "tao" 85 + -version = "0.30.5" 86 + +version = "0.30.8" 87 + source = "registry+https://github.com/rust-lang/crates.io-index" 88 + -checksum = "63f1f6b2017cc33d7f6fc9c6186a2c0f5dfc985899a7b4fe9e64985c17533db3" 89 + +checksum = "6682a07cf5bab0b8a2bd20d0a542917ab928b5edb75ebd4eda6b05cbaab872da" 90 + dependencies = [ 91 + "bitflags 2.6.0", 92 + "cocoa", 93 + @@ -3202,9 +3180,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" 94 + 95 + [[package]] 96 + name = "tauri" 97 + -version = "2.0.6" 98 + +version = "2.1.1" 99 + source = "registry+https://github.com/rust-lang/crates.io-index" 100 + -checksum = "d3889b392db6d32a105d3757230ea0220090b8f94c90d3e60b6c5eb91178ab1b" 101 + +checksum = "e545de0a2dfe296fa67db208266cd397c5a55ae782da77973ef4c4fac90e9f2c" 102 + dependencies = [ 103 + "anyhow", 104 + "bytes", 105 + @@ -3239,7 +3217,7 @@ dependencies = [ 106 + "tauri-runtime", 107 + "tauri-runtime-wry", 108 + "tauri-utils", 109 + - "thiserror 1.0.65", 110 + + "thiserror 2.0.1", 111 + "tokio", 112 + "tray-icon", 113 + "url", 114 + @@ -3252,16 +3230,16 @@ dependencies = [ 115 + 116 + [[package]] 117 + name = "tauri-build" 118 + -version = "2.0.2" 119 + +version = "2.0.3" 120 + source = "registry+https://github.com/rust-lang/crates.io-index" 121 + -checksum = "9f96827ccfb1aa40d55d0ded79562d18ba18566657a553f992a982d755148376" 122 + +checksum = "7bd2a4bcfaf5fb9f4be72520eefcb61ae565038f8ccba2a497d8c28f463b8c01" 123 + dependencies = [ 124 + "anyhow", 125 + "cargo_toml", 126 + "dirs", 127 + "glob", 128 + "heck 0.5.0", 129 + - "json-patch 3.0.1", 130 + + "json-patch", 131 + "schemars", 132 + "semver", 133 + "serde", 134 + @@ -3274,14 +3252,14 @@ dependencies = [ 135 + 136 + [[package]] 137 + name = "tauri-codegen" 138 + -version = "2.0.2" 139 + +version = "2.0.3" 140 + source = "registry+https://github.com/rust-lang/crates.io-index" 141 + -checksum = "8947f16f47becd9e9cd39b74ee337fd1981574d78819be18e4384d85e5a0b82f" 142 + +checksum = "bf79faeecf301d3e969b1fae977039edb77a4c1f25cc0a961be298b54bff97cf" 143 + dependencies = [ 144 + "base64 0.22.1", 145 + "brotli", 146 + "ico", 147 + - "json-patch 2.0.0", 148 + + "json-patch", 149 + "plist", 150 + "png", 151 + "proc-macro2", 152 + @@ -3292,7 +3270,7 @@ dependencies = [ 153 + "sha2", 154 + "syn 2.0.87", 155 + "tauri-utils", 156 + - "thiserror 1.0.65", 157 + + "thiserror 2.0.1", 158 + "time", 159 + "url", 160 + "uuid", 161 + @@ -3301,9 +3279,9 @@ dependencies = [ 162 + 163 + [[package]] 164 + name = "tauri-macros" 165 + -version = "2.0.2" 166 + +version = "2.0.3" 167 + source = "registry+https://github.com/rust-lang/crates.io-index" 168 + -checksum = "8bd1c8d4a66799d3438747c3a79705cd665a95d6f24cb5f315413ff7a981fe2a" 169 + +checksum = "c52027c8c5afb83166dacddc092ee8fff50772f9646d461d8c33ee887e447a03" 170 + dependencies = [ 171 + "heck 0.5.0", 172 + "proc-macro2", 173 + @@ -3371,9 +3349,9 @@ dependencies = [ 174 + 175 + [[package]] 176 + name = "tauri-runtime" 177 + -version = "2.1.1" 178 + +version = "2.2.0" 179 + source = "registry+https://github.com/rust-lang/crates.io-index" 180 + -checksum = "a1ef7363e7229ac8d04e8a5d405670dbd43dde8fc4bc3bc56105c35452d03784" 181 + +checksum = "cce18d43f80d4aba3aa8a0c953bbe835f3d0f2370aca75e8dbb14bd4bab27958" 182 + dependencies = [ 183 + "dpi", 184 + "gtk", 185 + @@ -3383,16 +3361,16 @@ dependencies = [ 186 + "serde", 187 + "serde_json", 188 + "tauri-utils", 189 + - "thiserror 1.0.65", 190 + + "thiserror 2.0.1", 191 + "url", 192 + "windows", 193 + ] 194 + 195 + [[package]] 196 + name = "tauri-runtime-wry" 197 + -version = "2.1.2" 198 + +version = "2.2.0" 199 + source = "registry+https://github.com/rust-lang/crates.io-index" 200 + -checksum = "62fa2068e8498ad007b54d5773d03d57c3ff6dd96f8c8ce58beff44d0d5e0d30" 201 + +checksum = "9f442a38863e10129ffe2cec7bd09c2dcf8a098a3a27801a476a304d5bb991d2" 202 + dependencies = [ 203 + "gtk", 204 + "http", 205 + @@ -3428,7 +3406,7 @@ dependencies = [ 206 + "html5ever", 207 + "http", 208 + "infer", 209 + - "json-patch 3.0.1", 210 + + "json-patch", 211 + "kuchikiki", 212 + "log", 213 + "memchr", 214 + @@ -4429,12 +4407,13 @@ dependencies = [ 215 + 216 + [[package]] 217 + name = "wry" 218 + -version = "0.46.3" 219 + +version = "0.47.2" 220 + source = "registry+https://github.com/rust-lang/crates.io-index" 221 + -checksum = "cd5cdf57c66813d97601181349c63b96994b3074fc3d7a31a8cce96e968e3bbd" 222 + +checksum = "61ce51277d65170f6379d8cda935c80e3c2d1f0ff712a123c8bddb11b31a4b73" 223 + dependencies = [ 224 + "base64 0.22.1", 225 + "block2", 226 + + "cookie", 227 + "crossbeam-channel", 228 + "dpi", 229 + "dunce", 230 + @@ -4459,6 +4438,7 @@ dependencies = [ 231 + "soup3", 232 + "tao-macros", 233 + "thiserror 1.0.65", 234 + + "url", 235 + "webkit2gtk", 236 + "webkit2gtk-sys", 237 + "webview2-com", 238 + diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml 239 + index 3af22fb..9bff78d 100644 240 + --- a/src-tauri/Cargo.toml 241 + +++ b/src-tauri/Cargo.toml 242 + @@ -11,7 +11,7 @@ tauri-build = { version = "2", features = [] } 243 + [dependencies] 244 + serde_json = "1.0" 245 + serde = { version = "1.0", features = ["derive"] } 246 + -tauri = { version = "2", features = ["macos-private-api"] } 247 + +tauri = { version = "2.1.1", features = ["macos-private-api"] } 248 + sysinfo = "0.29.0" 249 + tauri-plugin-shell = "2" 250 + tauri-plugin-os = "2"