pyrox.dev
lol
gg-jj: patch lockfile to fix mismatched NPM/Cargo versions of Tauri
After https://github.com/NixOS/nixpkgs/pull/438726 updated `tauri` to >=2.8.0, it now checks for mismatched versions (https://github.com/tauri-apps/tauri/pull/13993). This was always a problem, it just wasn't checked until now. This patch bumps the NPM versions to match the newer Cargo versions.
authored by
Mitchell Skaggs
and committed by
Alyssa Ross
e67134f8
e07cb675
+12
-2
pkgs/by-name/gg/gg-jj/package.nix
+12
-2
pkgs/by-name/gg/gg-jj/package.nix
···
33
33
cargoHash = "sha256-AdatJNDqIoRHfaf81iFhOs2JGLIxy7agFJj96bFPj00=";
34
34
35
35
npmDeps = fetchNpmDeps {
36
-
inherit (finalAttrs) pname version src;
37
-
hash = "sha256-izCl3pE15ocEGYOYCUR1iTR+82nDB06Ed4YOGRGByfI=";
36
+
inherit (finalAttrs)
37
+
pname
38
+
version
39
+
src
40
+
patches
41
+
;
42
+
hash = "sha256-ehXGLpCCN+BNqtwjEatcfR0kQHj5WOofTDR5mLSVW0U=";
38
43
};
44
+
45
+
patches = [
46
+
# Remove after https://github.com/gulbanana/gg/pull/68 is released
47
+
./update-tauri-npm-to-match-cargo.patch
48
+
];
39
49
40
50
nativeBuildInputs = [
41
51
cargo-tauri.hook
+81
pkgs/by-name/gg/gg-jj/update-tauri-npm-to-match-cargo.patch
+81
pkgs/by-name/gg/gg-jj/update-tauri-npm-to-match-cargo.patch
···
1
+
From 627de4bd148229a1feb327262b9f0b2a75077ed3 Mon Sep 17 00:00:00 2001
2
+
From: Mitchell Skaggs <skaggsm333@gmail.com>
3
+
Date: Mon, 1 Sep 2025 19:02:19 -0500
4
+
Subject: [PATCH] update `@tauri-apps/api` and `@tauri-apps/plugin-shell` to
5
+
match Cargo versions
6
+
7
+
In Tauri *CLI* versions >=2.8.0, the build fails if NPM and Cargo versions
8
+
are not aligned. This is not a new requirement, this merely verifies an
9
+
existing requirement. The CLI version in Nixpkgs was updated and now
10
+
detects this already-existing error.
11
+
12
+
This pulls the NPM versions up to match the existing Cargo versions
13
+
without touching any other dependencies.
14
+
---
15
+
package-lock.json | 18 +++++++++---------
16
+
package.json | 4 ++--
17
+
2 files changed, 11 insertions(+), 11 deletions(-)
18
+
19
+
diff --git a/package-lock.json b/package-lock.json
20
+
index 3affe19..ebe27e7 100644
21
+
--- a/package-lock.json
22
+
+++ b/package-lock.json
23
+
@@ -9,8 +9,8 @@
24
+
"version": "0.29.0",
25
+
"dependencies": {
26
+
"@catppuccin/palette": "^1.0.3",
27
+
- "@tauri-apps/api": "^2.0.0-beta.0",
28
+
- "@tauri-apps/plugin-shell": "^2.0.0-beta.0",
29
+
+ "@tauri-apps/api": "^2.4.1",
30
+
+ "@tauri-apps/plugin-shell": "2.2.1",
31
+
"feather-icons": "^4.29.1",
32
+
"modern-normalize": "^2.0.0"
33
+
},
34
+
@@ -793,9 +793,9 @@
35
+
}
36
+
},
37
+
"node_modules/@tauri-apps/api": {
38
+
- "version": "2.1.1",
39
+
- "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.1.1.tgz",
40
+
- "integrity": "sha512-fzUfFFKo4lknXGJq8qrCidkUcKcH2UHhfaaCNt4GzgzGaW2iS26uFOg4tS3H4P8D6ZEeUxtiD5z0nwFF0UN30A==",
41
+
+ "version": "2.4.1",
42
+
+ "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.4.1.tgz",
43
+
+ "integrity": "sha512-5sYwZCSJb6PBGbBL4kt7CnE5HHbBqwH+ovmOW6ZVju3nX4E3JX6tt2kRklFEH7xMOIwR0btRkZktuLhKvyEQYg==",
44
+
"license": "Apache-2.0 OR MIT",
45
+
"funding": {
46
+
"type": "opencollective",
47
+
@@ -1002,9 +1002,9 @@
48
+
}
49
+
},
50
+
"node_modules/@tauri-apps/plugin-shell": {
51
+
- "version": "2.0.1",
52
+
- "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.0.1.tgz",
53
+
- "integrity": "sha512-akU1b77sw3qHiynrK0s930y8zKmcdrSD60htjH+mFZqv5WaakZA/XxHR3/sF1nNv9Mgmt/Shls37HwnOr00aSw==",
54
+
+ "version": "2.2.1",
55
+
+ "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.2.1.tgz",
56
+
+ "integrity": "sha512-G1GFYyWe/KlCsymuLiNImUgC8zGY0tI0Y3p8JgBCWduR5IEXlIJS+JuG1qtveitwYXlfJrsExt3enhv5l2/yhA==",
57
+
"license": "MIT OR Apache-2.0",
58
+
"dependencies": {
59
+
"@tauri-apps/api": "^2.0.0"
60
+
@@ -2054,4 +2054,4 @@
61
+
"license": "ISC"
62
+
}
63
+
}
64
+
-}
65
+
\ No newline at end of file
66
+
+}
67
+
diff --git a/package.json b/package.json
68
+
index 6000620..9d61871 100644
69
+
--- a/package.json
70
+
+++ b/package.json
71
+
@@ -14,8 +14,8 @@
72
+
},
73
+
"dependencies": {
74
+
"@catppuccin/palette": "^1.0.3",
75
+
- "@tauri-apps/api": "^2.0.0-beta.0",
76
+
- "@tauri-apps/plugin-shell": "^2.0.0-beta.0",
77
+
+ "@tauri-apps/api": "^2.4.1",
78
+
+ "@tauri-apps/plugin-shell": "2.2.1",
79
+
"feather-icons": "^4.29.1",
80
+
"modern-normalize": "^2.0.0"
81
+
},