Skip to content

Commit 25fe576

Browse files
nixpkgs-ci[bot]nixpkgs-ci[bot]
authored
lrcget: 0.9.3 -> 1.0.2 (NixOS#487142)
2 parents d24d8dd + defb9b9 commit 25fe576

2 files changed

Lines changed: 262 additions & 5 deletions

File tree

‎pkgs/by-name/lr/lrcget/fix-tauri-version-mismatch.patch‎

Lines changed: 254 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,254 @@
1+
diff --git a/package-lock.json b/package-lock.json
2+
index 5ddd914..8d4a12a 100644
3+
--- a/package-lock.json
4+
+++ b/package-lock.json
5+
@@ -9,11 +9,11 @@
6+
"version": "0.0.0",
7+
"dependencies": {
8+
"@tanstack/vue-virtual": "^3.1.2",
9+
- "@tauri-apps/api": "^2.1.1",
10+
- "@tauri-apps/plugin-dialog": "^2.2.0",
11+
- "@tauri-apps/plugin-global-shortcut": "^2.2.0",
12+
- "@tauri-apps/plugin-os": "^2.2.0",
13+
- "@tauri-apps/plugin-shell": "^2.2.0",
14+
+ "@tauri-apps/api": "2.8.0",
15+
+ "@tauri-apps/plugin-dialog": "2.4.0",
16+
+ "@tauri-apps/plugin-global-shortcut": "^2.3.0",
17+
+ "@tauri-apps/plugin-os": "^2.3.0",
18+
+ "@tauri-apps/plugin-shell": "^2.3.0",
19+
"codemirror": "^6.0.1",
20+
"floating-vue": "^5.2.2",
21+
"lodash": "^4.17.21",
22+
@@ -381,9 +381,9 @@
23+
}
24+
},
25+
"node_modules/@tauri-apps/api": {
26+
- "version": "2.1.1",
27+
- "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.1.1.tgz",
28+
- "integrity": "sha512-fzUfFFKo4lknXGJq8qrCidkUcKcH2UHhfaaCNt4GzgzGaW2iS26uFOg4tS3H4P8D6ZEeUxtiD5z0nwFF0UN30A==",
29+
+ "version": "2.8.0",
30+
+ "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.8.0.tgz",
31+
+ "integrity": "sha512-ga7zdhbS2GXOMTIZRT0mYjKJtR9fivsXzsyq5U3vjDL0s6DTMwYRm0UHNjzTY5dh4+LSC68Sm/7WEiimbQNYlw==",
32+
"license": "Apache-2.0 OR MIT",
33+
"funding": {
34+
"type": "opencollective",
35+
@@ -590,39 +590,39 @@
36+
}
37+
},
38+
"node_modules/@tauri-apps/plugin-dialog": {
39+
- "version": "2.2.0",
40+
- "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.2.0.tgz",
41+
- "integrity": "sha512-6bLkYK68zyK31418AK5fNccCdVuRnNpbxquCl8IqgFByOgWFivbiIlvb79wpSXi0O+8k8RCSsIpOquebusRVSg==",
42+
+ "version": "2.4.0",
43+
+ "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.4.0.tgz",
44+
+ "integrity": "sha512-OvXkrEBfWwtd8tzVCEXIvRfNEX87qs2jv6SqmVPiHcJjBhSF/GUvjqUNIDmKByb5N8nvDqVUM7+g1sXwdC/S9w==",
45+
"license": "MIT OR Apache-2.0",
46+
"dependencies": {
47+
- "@tauri-apps/api": "^2.0.0"
48+
+ "@tauri-apps/api": "^2.8.0"
49+
}
50+
},
51+
"node_modules/@tauri-apps/plugin-global-shortcut": {
52+
- "version": "2.2.0",
53+
- "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-global-shortcut/-/plugin-global-shortcut-2.2.0.tgz",
54+
- "integrity": "sha512-clI9Bg/BcxWXNDK+ij601o1qC2WxMEy8ovhGgEW5Ai17oPy0KK8uwzmc59KiVnOYKpBWHCUPqBxG+KBNUFXgzw==",
55+
+ "version": "2.3.1",
56+
+ "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-global-shortcut/-/plugin-global-shortcut-2.3.1.tgz",
57+
+ "integrity": "sha512-vr40W2N6G63dmBPaha1TsBQLLURXG538RQbH5vAm0G/ovVZyXJrmZR1HF1W+WneNloQvwn4dm8xzwpEXRW560g==",
58+
"license": "MIT OR Apache-2.0",
59+
"dependencies": {
60+
- "@tauri-apps/api": "^2.0.0"
61+
+ "@tauri-apps/api": "^2.8.0"
62+
}
63+
},
64+
"node_modules/@tauri-apps/plugin-os": {
65+
- "version": "2.2.0",
66+
- "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.2.0.tgz",
67+
- "integrity": "sha512-HszbCdbisMlu5QhCNAN8YIWyz2v33abAWha6+uvV2CKX8P5VSct/y+kEe22JeyqrxCnWlQ3DRx7s49Byg7/0EA==",
68+
+ "version": "2.3.2",
69+
+ "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.3.2.tgz",
70+
+ "integrity": "sha512-n+nXWeuSeF9wcEsSPmRnBEGrRgOy6jjkSU+UVCOV8YUGKb2erhDOxis7IqRXiRVHhY8XMKks00BJ0OAdkpf6+A==",
71+
"license": "MIT OR Apache-2.0",
72+
"dependencies": {
73+
- "@tauri-apps/api": "^2.0.0"
74+
+ "@tauri-apps/api": "^2.8.0"
75+
}
76+
},
77+
"node_modules/@tauri-apps/plugin-shell": {
78+
- "version": "2.2.0",
79+
- "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.2.0.tgz",
80+
- "integrity": "sha512-iC3Ic1hLmasoboG7BO+7p+AriSoqAwKrIk+Hpk+S/bjTQdXqbl2GbdclghI4gM32X0bls7xHzIFqhRdrlvJeaA==",
81+
+ "version": "2.3.4",
82+
+ "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.3.4.tgz",
83+
+ "integrity": "sha512-ktsRWf8wHLD17aZEyqE8c5x98eNAuTizR1FSX475zQ4TxaiJnhwksLygQz+AGwckJL5bfEP13nWrlTNQJUpKpA==",
84+
"license": "MIT OR Apache-2.0",
85+
"dependencies": {
86+
- "@tauri-apps/api": "^2.0.0"
87+
+ "@tauri-apps/api": "^2.8.0"
88+
}
89+
},
90+
"node_modules/@types/web-bluetooth": {
91+
@@ -1043,6 +1043,7 @@
92+
"url": "https://tidelift.com/funding/github/npm/browserslist"
93+
}
94+
],
95+
+ "peer": true,
96+
"dependencies": {
97+
"caniuse-lite": "^1.0.30001400",
98+
"electron-to-chromium": "^1.4.251",
99+
@@ -1124,6 +1125,7 @@
100+
"version": "6.0.1",
101+
"resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
102+
"integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
103+
+ "peer": true,
104+
"dependencies": {
105+
"@codemirror/autocomplete": "^6.0.0",
106+
"@codemirror/commands": "^6.0.0",
107+
@@ -1681,6 +1683,7 @@
108+
"version": "7.6.2",
109+
"resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.2.tgz",
110+
"integrity": "sha512-9FhUxK1hVju2+AiQIDJ5Dd//9R2n2RAfJ0qfhF4IHGHgcoEUTMpbTeG/zbEuwaiYXfuAH6XE0/aCyxDdRM+W5w==",
111+
+ "peer": true,
112+
"dependencies": {
113+
"tabbable": "^6.2.0"
114+
}
115+
@@ -2147,6 +2150,7 @@
116+
"url": "https://github.com/sponsors/ai"
117+
}
118+
],
119+
+ "peer": true,
120+
"dependencies": {
121+
"nanoid": "^3.3.7",
122+
"picocolors": "^1.1.0",
123+
@@ -2721,6 +2725,7 @@
124+
"resolved": "https://registry.npmjs.org/vite/-/vite-3.1.8.tgz",
125+
"integrity": "sha512-m7jJe3nufUbuOfotkntGFupinL/fmuTNuQmiVE7cH2IZMuf4UbfbGYMUT3jVWgGYuRVLY9j8NnrRqgw5rr5QTg==",
126+
"dev": true,
127+
+ "peer": true,
128+
"dependencies": {
129+
"esbuild": "^0.15.9",
130+
"postcss": "^8.4.16",
131+
@@ -2761,6 +2766,7 @@
132+
"version": "3.5.10",
133+
"resolved": "https://registry.npmjs.org/vue/-/vue-3.5.10.tgz",
134+
"integrity": "sha512-Vy2kmJwHPlouC/tSnIgXVg03SG+9wSqT1xu1Vehc+ChsXsRd7jLkKgMltVEFOzUdBr3uFwBCG+41LJtfAcBRng==",
135+
+ "peer": true,
136+
"dependencies": {
137+
"@vue/compiler-dom": "3.5.10",
138+
"@vue/compiler-sfc": "3.5.10",
139+
@@ -3221,9 +3227,9 @@
140+
}
141+
},
142+
"@tauri-apps/api": {
143+
- "version": "2.1.1",
144+
- "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.1.1.tgz",
145+
- "integrity": "sha512-fzUfFFKo4lknXGJq8qrCidkUcKcH2UHhfaaCNt4GzgzGaW2iS26uFOg4tS3H4P8D6ZEeUxtiD5z0nwFF0UN30A=="
146+
+ "version": "2.8.0",
147+
+ "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.8.0.tgz",
148+
+ "integrity": "sha512-ga7zdhbS2GXOMTIZRT0mYjKJtR9fivsXzsyq5U3vjDL0s6DTMwYRm0UHNjzTY5dh4+LSC68Sm/7WEiimbQNYlw=="
149+
},
150+
"@tauri-apps/cli": {
151+
"version": "2.1.0",
152+
@@ -3314,35 +3320,35 @@
153+
"optional": true
154+
},
155+
"@tauri-apps/plugin-dialog": {
156+
- "version": "2.2.0",
157+
- "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.2.0.tgz",
158+
- "integrity": "sha512-6bLkYK68zyK31418AK5fNccCdVuRnNpbxquCl8IqgFByOgWFivbiIlvb79wpSXi0O+8k8RCSsIpOquebusRVSg==",
159+
+ "version": "2.4.0",
160+
+ "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.4.0.tgz",
161+
+ "integrity": "sha512-OvXkrEBfWwtd8tzVCEXIvRfNEX87qs2jv6SqmVPiHcJjBhSF/GUvjqUNIDmKByb5N8nvDqVUM7+g1sXwdC/S9w==",
162+
"requires": {
163+
- "@tauri-apps/api": "^2.0.0"
164+
+ "@tauri-apps/api": "^2.8.0"
165+
}
166+
},
167+
"@tauri-apps/plugin-global-shortcut": {
168+
- "version": "2.2.0",
169+
- "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-global-shortcut/-/plugin-global-shortcut-2.2.0.tgz",
170+
- "integrity": "sha512-clI9Bg/BcxWXNDK+ij601o1qC2WxMEy8ovhGgEW5Ai17oPy0KK8uwzmc59KiVnOYKpBWHCUPqBxG+KBNUFXgzw==",
171+
+ "version": "2.3.1",
172+
+ "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-global-shortcut/-/plugin-global-shortcut-2.3.1.tgz",
173+
+ "integrity": "sha512-vr40W2N6G63dmBPaha1TsBQLLURXG538RQbH5vAm0G/ovVZyXJrmZR1HF1W+WneNloQvwn4dm8xzwpEXRW560g==",
174+
"requires": {
175+
- "@tauri-apps/api": "^2.0.0"
176+
+ "@tauri-apps/api": "^2.8.0"
177+
}
178+
},
179+
"@tauri-apps/plugin-os": {
180+
- "version": "2.2.0",
181+
- "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.2.0.tgz",
182+
- "integrity": "sha512-HszbCdbisMlu5QhCNAN8YIWyz2v33abAWha6+uvV2CKX8P5VSct/y+kEe22JeyqrxCnWlQ3DRx7s49Byg7/0EA==",
183+
+ "version": "2.3.2",
184+
+ "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.3.2.tgz",
185+
+ "integrity": "sha512-n+nXWeuSeF9wcEsSPmRnBEGrRgOy6jjkSU+UVCOV8YUGKb2erhDOxis7IqRXiRVHhY8XMKks00BJ0OAdkpf6+A==",
186+
"requires": {
187+
- "@tauri-apps/api": "^2.0.0"
188+
+ "@tauri-apps/api": "^2.8.0"
189+
}
190+
},
191+
"@tauri-apps/plugin-shell": {
192+
- "version": "2.2.0",
193+
- "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.2.0.tgz",
194+
- "integrity": "sha512-iC3Ic1hLmasoboG7BO+7p+AriSoqAwKrIk+Hpk+S/bjTQdXqbl2GbdclghI4gM32X0bls7xHzIFqhRdrlvJeaA==",
195+
+ "version": "2.3.4",
196+
+ "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.3.4.tgz",
197+
+ "integrity": "sha512-ktsRWf8wHLD17aZEyqE8c5x98eNAuTizR1FSX475zQ4TxaiJnhwksLygQz+AGwckJL5bfEP13nWrlTNQJUpKpA==",
198+
"requires": {
199+
- "@tauri-apps/api": "^2.0.0"
200+
+ "@tauri-apps/api": "^2.8.0"
201+
}
202+
},
203+
"@types/web-bluetooth": {
204+
@@ -3586,6 +3592,7 @@
205+
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
206+
"integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
207+
"dev": true,
208+
+ "peer": true,
209+
"requires": {
210+
"caniuse-lite": "^1.0.30001400",
211+
"electron-to-chromium": "^1.4.251",
212+
@@ -3636,6 +3643,7 @@
213+
"version": "6.0.1",
214+
"resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
215+
"integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
216+
+ "peer": true,
217+
"requires": {
218+
"@codemirror/autocomplete": "^6.0.0",
219+
"@codemirror/commands": "^6.0.0",
220+
@@ -3965,6 +3973,7 @@
221+
"version": "7.6.2",
222+
"resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.2.tgz",
223+
"integrity": "sha512-9FhUxK1hVju2+AiQIDJ5Dd//9R2n2RAfJ0qfhF4IHGHgcoEUTMpbTeG/zbEuwaiYXfuAH6XE0/aCyxDdRM+W5w==",
224+
+ "peer": true,
225+
"requires": {
226+
"tabbable": "^6.2.0"
227+
}
228+
@@ -4285,6 +4294,7 @@
229+
"version": "8.4.47",
230+
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
231+
"integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
232+
+ "peer": true,
233+
"requires": {
234+
"nanoid": "^3.3.7",
235+
"picocolors": "^1.1.0",
236+
@@ -4638,6 +4648,7 @@
237+
"resolved": "https://registry.npmjs.org/vite/-/vite-3.1.8.tgz",
238+
"integrity": "sha512-m7jJe3nufUbuOfotkntGFupinL/fmuTNuQmiVE7cH2IZMuf4UbfbGYMUT3jVWgGYuRVLY9j8NnrRqgw5rr5QTg==",
239+
"dev": true,
240+
+ "peer": true,
241+
"requires": {
242+
"esbuild": "^0.15.9",
243+
"fsevents": "~2.3.2",
244+
@@ -4650,6 +4661,7 @@
245+
"version": "3.5.10",
246+
"resolved": "https://registry.npmjs.org/vue/-/vue-3.5.10.tgz",
247+
"integrity": "sha512-Vy2kmJwHPlouC/tSnIgXVg03SG+9wSqT1xu1Vehc+ChsXsRd7jLkKgMltVEFOzUdBr3uFwBCG+41LJtfAcBRng==",
248+
+ "peer": true,
249+
"requires": {
250+
"@vue/compiler-dom": "3.5.10",
251+
"@vue/compiler-sfc": "3.5.10",
252+
--
253+
2.51.2
254+

‎pkgs/by-name/lr/lrcget/package.nix‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,33 +22,36 @@
2222

2323
rustPlatform.buildRustPackage rec {
2424
pname = "lrcget";
25-
version = "0.9.3";
25+
version = "1.0.2";
2626

2727
src = fetchFromGitHub {
2828
owner = "tranxuanthang";
2929
repo = "lrcget";
3030
tag = version;
31-
hash = "sha256-3dBjQ1fO1q8JCQFvvV8LWBCD8cKFkFmm8ufC/Xihmj4=";
31+
hash = "sha256-4XeOIOV8QyJheVN98u/jo8H+n9AIzvVJITCk9d+kpFA=";
3232
};
3333

3434
patches = [
3535
# needed to not attempt codesigning on darwin
3636
./remove-signing-identity.patch
37+
38+
# Update NPM package versions to fix https://github.com/tranxuanthang/lrcget/issues/309
39+
./fix-tauri-version-mismatch.patch
3740
];
3841

3942
cargoRoot = "src-tauri";
4043
buildAndTestSubdir = "src-tauri";
4144

42-
cargoHash = "sha256-Nu1N96OrLG/D2/1vbU229jLVNZuKIiCSwDJA25hlqFM=";
45+
cargoHash = "sha256-EjciD794MqUnp3CVloOPugbSfcxgfy7TdCUOlK6P+sk=";
4346

4447
# FIXME: This is a workaround, because we have a git dependency node_modules/lrc-kit contains install scripts
4548
# but has no lockfile, which is something that will probably break.
4649
forceGitDeps = true;
4750

4851
npmDeps = fetchNpmDeps {
4952
name = "lrcget-${version}-npm-deps";
50-
inherit src forceGitDeps;
51-
hash = "sha256-N48+C3NNPYg/rOpnRNmkZfZU/ZHp8imrG/tiDaMGsCE=";
53+
inherit src forceGitDeps patches;
54+
hash = "sha256-iaxNrZLcb9qM5EPRtzoXw6izZBeS/rqgGaZpA2A2oho=";
5255
};
5356

5457
nativeBuildInputs = [

0 commit comments

Comments
 (0)