Skip to content

Commit 4c47246

Browse files
nathanregnernathanregner
committed
fix: external-deps example
1 parent ac4fe76 commit 4c47246

File tree

3 files changed

+58
-141
lines changed

3 files changed

+58
-141
lines changed

‎examples/external-deps/package.nix‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
gnumake,
3+
libarchive,
34
makePlatformIOSetupHook,
45
platformio,
56
stdenv,
@@ -11,7 +12,14 @@ let
1112
setupHook = makePlatformIOSetupHook {
1213
lockfile = ./platformio2nix.lock;
1314
overrides = (
14-
final: prev: { SlowSoftWire = prev.SlowSoftWire.overrideAttrs { dontUnpack = true; }; }
15+
final: prev: {
16+
SlowSoftWire = prev.SlowSoftWire.overrideAttrs {
17+
nativeBuildInputs = [ libarchive ];
18+
unpackPhase = ''
19+
bsdtar xf $src --strip-components=1
20+
'';
21+
};
22+
}
1523
);
1624
};
1725
in

‎examples/external-deps/platformio.ini‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ board = uno
1414
framework = arduino
1515
lib_deps =
1616
https://github.com/felias-fogg/SlowSoftWire/archive/f34d777f39.zip
17+
felias-fogg/SlowSoftI2CMaster@^1.0.0

‎examples/external-deps/platformio2nix.lock‎

Lines changed: 48 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,83 @@
11
{
22
"version": "V1",
33
"dependencies": {
4-
"SlowSoftWire": {
5-
"name": "SlowSoftWire",
6-
"install_path": "lib/SlowSoftWire",
7-
"version": "0.0.0+20240705183635",
8-
"manifest": "{\"type\":\"library\",\"version\":\"0.0.0+20240705183635\",\"spec\":{\"name\":\"SlowSoftWire\",\"uri\":\"https://github.com/felias-fogg/SlowSoftWire/archive/f34d777f39.zip\",\"id\":null,\"owner\":null,\"requirements\":null},\"name\":\"SlowSoftWire\"}",
4+
"SlowSoftI2CMaster": {
5+
"name": "SlowSoftI2CMaster",
6+
"install_path": "libdeps/SlowSoftI2CMaster",
7+
"version": "1.0.0",
8+
"manifest": "{\"type\":\"library\",\"version\":\"1.0.0\",\"spec\":{\"owner\":\"felias-fogg\",\"name\":\"SlowSoftI2CMaster\",\"id\":7005,\"requirements\":null,\"uri\":null},\"name\":\"SlowSoftI2CMaster\"}",
99
"systems": {
1010
"aarch64-linux": {
11-
"url": "https://github.com/felias-fogg/SlowSoftWire/archive/f34d777f39.zip",
12-
"hash": "sha256-FhoHDjfPYRlWeJZig5cz12iPYbL6j0bEivR1+qNmXLc="
11+
"url": "https://dl.registry.platformio.org/download/felias-fogg/library/SlowSoftI2CMaster/1.0.0/SlowSoftI2CMaster-1.0.0.tar.gz",
12+
"hash": "sha256-DVPlZAOtAd0/zMgiKk76A0pGyI2MHGSbZsgvJAjt/bY="
1313
},
1414
"aarch64-darwin": {
15-
"url": "https://github.com/felias-fogg/SlowSoftWire/archive/f34d777f39.zip",
16-
"hash": "sha256-FhoHDjfPYRlWeJZig5cz12iPYbL6j0bEivR1+qNmXLc="
15+
"url": "https://dl.registry.platformio.org/download/felias-fogg/library/SlowSoftI2CMaster/1.0.0/SlowSoftI2CMaster-1.0.0.tar.gz",
16+
"hash": "sha256-DVPlZAOtAd0/zMgiKk76A0pGyI2MHGSbZsgvJAjt/bY="
1717
},
1818
"x86_64-linux": {
19-
"url": "https://github.com/felias-fogg/SlowSoftWire/archive/f34d777f39.zip",
20-
"hash": "sha256-FhoHDjfPYRlWeJZig5cz12iPYbL6j0bEivR1+qNmXLc="
19+
"url": "https://dl.registry.platformio.org/download/felias-fogg/library/SlowSoftI2CMaster/1.0.0/SlowSoftI2CMaster-1.0.0.tar.gz",
20+
"hash": "sha256-DVPlZAOtAd0/zMgiKk76A0pGyI2MHGSbZsgvJAjt/bY="
2121
},
2222
"x86_64-darwin": {
23-
"url": "https://github.com/felias-fogg/SlowSoftWire/archive/f34d777f39.zip",
24-
"hash": "sha256-FhoHDjfPYRlWeJZig5cz12iPYbL6j0bEivR1+qNmXLc="
23+
"url": "https://dl.registry.platformio.org/download/felias-fogg/library/SlowSoftI2CMaster/1.0.0/SlowSoftI2CMaster-1.0.0.tar.gz",
24+
"hash": "sha256-DVPlZAOtAd0/zMgiKk76A0pGyI2MHGSbZsgvJAjt/bY="
2525
}
2626
}
2727
},
28-
"U8glib-HAL": {
29-
"name": "U8glib-HAL",
30-
"install_path": "lib/U8glib-HAL",
31-
"version": "0.5.4",
32-
"manifest": "{\"type\":\"library\",\"version\":\"0.5.4\",\"spec\":{\"owner\":\"marlinfirmware\",\"name\":\"U8glib-HAL\",\"uri\":null,\"requirements\":null,\"id\":1932},\"name\":\"U8glib-HAL\"}",
28+
"SlowSoftWire": {
29+
"name": "SlowSoftWire",
30+
"install_path": "libdeps/SlowSoftWire",
31+
"version": "0.0.0+20241026221146",
32+
"manifest": "{\"type\":\"library\",\"version\":\"0.0.0+20241026221146\",\"spec\":{\"name\":\"SlowSoftWire\",\"uri\":\"https://github.com/felias-fogg/SlowSoftWire/archive/f34d777f39.zip\",\"id\":null,\"owner\":null,\"requirements\":null},\"name\":\"SlowSoftWire\"}",
3333
"systems": {
3434
"aarch64-linux": {
35-
"url": "https://dl.registry.platformio.org/download/marlinfirmware/library/U8glib-HAL/0.5.4/U8glib-HAL-0.5.4.tar.gz",
36-
"hash": "sha256-DKdiN3zS2NXY94fY4IRwm/5SiI0xeGiJdahXb7X9Sak="
35+
"url": "https://github.com/felias-fogg/SlowSoftWire/archive/f34d777f39.zip",
36+
"hash": "sha256-FhoHDjfPYRlWeJZig5cz12iPYbL6j0bEivR1+qNmXLc="
3737
},
3838
"aarch64-darwin": {
39-
"url": "https://dl.registry.platformio.org/download/marlinfirmware/library/U8glib-HAL/0.5.4/U8glib-HAL-0.5.4.tar.gz",
40-
"hash": "sha256-DKdiN3zS2NXY94fY4IRwm/5SiI0xeGiJdahXb7X9Sak="
39+
"url": "https://github.com/felias-fogg/SlowSoftWire/archive/f34d777f39.zip",
40+
"hash": "sha256-FhoHDjfPYRlWeJZig5cz12iPYbL6j0bEivR1+qNmXLc="
4141
},
4242
"x86_64-linux": {
43-
"url": "https://dl.registry.platformio.org/download/marlinfirmware/library/U8glib-HAL/0.5.4/U8glib-HAL-0.5.4.tar.gz",
44-
"hash": "sha256-DKdiN3zS2NXY94fY4IRwm/5SiI0xeGiJdahXb7X9Sak="
43+
"url": "https://github.com/felias-fogg/SlowSoftWire/archive/f34d777f39.zip",
44+
"hash": "sha256-FhoHDjfPYRlWeJZig5cz12iPYbL6j0bEivR1+qNmXLc="
4545
},
4646
"x86_64-darwin": {
47-
"url": "https://dl.registry.platformio.org/download/marlinfirmware/library/U8glib-HAL/0.5.4/U8glib-HAL-0.5.4.tar.gz",
48-
"hash": "sha256-DKdiN3zS2NXY94fY4IRwm/5SiI0xeGiJdahXb7X9Sak="
47+
"url": "https://github.com/felias-fogg/SlowSoftWire/archive/f34d777f39.zip",
48+
"hash": "sha256-FhoHDjfPYRlWeJZig5cz12iPYbL6j0bEivR1+qNmXLc="
4949
}
5050
}
5151
},
5252
"atmelavr": {
5353
"name": "atmelavr",
5454
"install_path": "platforms/atmelavr",
55-
"version": "5.0.0",
56-
"manifest": "{\"type\":\"platform\",\"version\":\"5.0.0\",\"spec\":{\"owner\":\"platformio\",\"name\":\"atmelavr\",\"uri\":null,\"id\":8006,\"requirements\":null},\"name\":\"atmelavr\"}",
55+
"version": "5.1.0",
56+
"manifest": "{\"type\":\"platform\",\"version\":\"5.1.0\",\"spec\":{\"owner\":\"platformio\",\"name\":\"atmelavr\",\"id\":8006,\"requirements\":null,\"uri\":null},\"name\":\"atmelavr\"}",
5757
"systems": {
5858
"aarch64-linux": {
59-
"url": "https://dl.registry.platformio.org/download/platformio/platform/atmelavr/5.0.0/atmelavr-5.0.0.tar.gz",
60-
"hash": "sha256-9PIuBFDJT7XZLWKGTm/nFCgbuFWAzZO8sVmthopmsWw="
59+
"url": "https://dl.registry.platformio.org/download/platformio/platform/atmelavr/5.1.0/atmelavr-5.1.0.tar.gz",
60+
"hash": "sha256-0XGSJi0KwN04/98qUTlzkmYtm1K95fc4JWJoYIhLQhk="
6161
},
6262
"aarch64-darwin": {
63-
"url": "https://dl.registry.platformio.org/download/platformio/platform/atmelavr/5.0.0/atmelavr-5.0.0.tar.gz",
64-
"hash": "sha256-9PIuBFDJT7XZLWKGTm/nFCgbuFWAzZO8sVmthopmsWw="
63+
"url": "https://dl.registry.platformio.org/download/platformio/platform/atmelavr/5.1.0/atmelavr-5.1.0.tar.gz",
64+
"hash": "sha256-0XGSJi0KwN04/98qUTlzkmYtm1K95fc4JWJoYIhLQhk="
6565
},
6666
"x86_64-linux": {
67-
"url": "https://dl.registry.platformio.org/download/platformio/platform/atmelavr/5.0.0/atmelavr-5.0.0.tar.gz",
68-
"hash": "sha256-9PIuBFDJT7XZLWKGTm/nFCgbuFWAzZO8sVmthopmsWw="
67+
"url": "https://dl.registry.platformio.org/download/platformio/platform/atmelavr/5.1.0/atmelavr-5.1.0.tar.gz",
68+
"hash": "sha256-0XGSJi0KwN04/98qUTlzkmYtm1K95fc4JWJoYIhLQhk="
6969
},
7070
"x86_64-darwin": {
71-
"url": "https://dl.registry.platformio.org/download/platformio/platform/atmelavr/5.0.0/atmelavr-5.0.0.tar.gz",
72-
"hash": "sha256-9PIuBFDJT7XZLWKGTm/nFCgbuFWAzZO8sVmthopmsWw="
71+
"url": "https://dl.registry.platformio.org/download/platformio/platform/atmelavr/5.1.0/atmelavr-5.1.0.tar.gz",
72+
"hash": "sha256-0XGSJi0KwN04/98qUTlzkmYtm1K95fc4JWJoYIhLQhk="
7373
}
7474
}
7575
},
7676
"framework-arduino-avr": {
7777
"name": "framework-arduino-avr",
7878
"install_path": "packages/framework-arduino-avr",
7979
"version": "5.2.0",
80-
"manifest": "{\"type\":\"tool\",\"version\":\"5.2.0\",\"spec\":{\"owner\":\"platformio\",\"name\":\"framework-arduino-avr\",\"requirements\":null,\"uri\":null,\"id\":8039},\"name\":\"framework-arduino-avr\"}",
80+
"manifest": "{\"type\":\"tool\",\"version\":\"5.2.0\",\"spec\":{\"owner\":\"platformio\",\"name\":\"framework-arduino-avr\",\"id\":8039,\"requirements\":null,\"uri\":null},\"name\":\"framework-arduino-avr\"}",
8181
"systems": {
8282
"aarch64-linux": {
8383
"url": "https://dl.registry.platformio.org/download/platformio/tool/framework-arduino-avr/5.2.0/framework-arduino-avr-5.2.0.tar.gz",
@@ -97,107 +97,35 @@
9797
}
9898
}
9999
},
100-
"framework-arduinoststm32": {
101-
"name": "framework-arduinoststm32",
102-
"install_path": "packages/framework-arduinoststm32",
103-
"version": "4.10900.200819",
104-
"manifest": "{\"type\":\"tool\",\"version\":\"4.10900.200819\",\"spec\":{\"owner\":\"platformio\",\"name\":\"framework-arduinoststm32\",\"requirements\":null,\"uri\":null,\"id\":8080},\"name\":\"framework-arduinoststm32\"}",
105-
"systems": {
106-
"aarch64-linux": {
107-
"url": "https://dl.registry.platformio.org/download/platformio/tool/framework-arduinoststm32/4.10900.200819/framework-arduinoststm32-4.10900.200819.tar.gz",
108-
"hash": "sha256-ztdXAF7AS6v44rvprXky+0CuZczhhYVN6QniL9jlM00="
109-
},
110-
"aarch64-darwin": {
111-
"url": "https://dl.registry.platformio.org/download/platformio/tool/framework-arduinoststm32/4.10900.200819/framework-arduinoststm32-4.10900.200819.tar.gz",
112-
"hash": "sha256-ztdXAF7AS6v44rvprXky+0CuZczhhYVN6QniL9jlM00="
113-
},
114-
"x86_64-linux": {
115-
"url": "https://dl.registry.platformio.org/download/platformio/tool/framework-arduinoststm32/4.10900.200819/framework-arduinoststm32-4.10900.200819.tar.gz",
116-
"hash": "sha256-ztdXAF7AS6v44rvprXky+0CuZczhhYVN6QniL9jlM00="
117-
},
118-
"x86_64-darwin": {
119-
"url": "https://dl.registry.platformio.org/download/platformio/tool/framework-arduinoststm32/4.10900.200819/framework-arduinoststm32-4.10900.200819.tar.gz",
120-
"hash": "sha256-ztdXAF7AS6v44rvprXky+0CuZczhhYVN6QniL9jlM00="
121-
}
122-
}
123-
},
124-
"framework-cmsis": {
125-
"name": "framework-cmsis",
126-
"install_path": "packages/framework-cmsis",
127-
"version": "2.50501.200527",
128-
"manifest": "{\"type\":\"tool\",\"version\":\"2.50501.200527\",\"spec\":{\"owner\":\"platformio\",\"name\":\"framework-cmsis\",\"requirements\":null,\"id\":8086,\"uri\":null},\"name\":\"framework-cmsis\"}",
129-
"systems": {
130-
"aarch64-linux": {
131-
"url": "https://dl.registry.platformio.org/download/platformio/tool/framework-cmsis/2.50501.200527/framework-cmsis-2.50501.200527.tar.gz",
132-
"hash": "sha256-3ErJUB7dfsV0aUt7UhFD7eCng8TO42TuwlW0GGa+7Po="
133-
},
134-
"aarch64-darwin": {
135-
"url": "https://dl.registry.platformio.org/download/platformio/tool/framework-cmsis/2.50501.200527/framework-cmsis-2.50501.200527.tar.gz",
136-
"hash": "sha256-3ErJUB7dfsV0aUt7UhFD7eCng8TO42TuwlW0GGa+7Po="
137-
},
138-
"x86_64-linux": {
139-
"url": "https://dl.registry.platformio.org/download/platformio/tool/framework-cmsis/2.50501.200527/framework-cmsis-2.50501.200527.tar.gz",
140-
"hash": "sha256-3ErJUB7dfsV0aUt7UhFD7eCng8TO42TuwlW0GGa+7Po="
141-
},
142-
"x86_64-darwin": {
143-
"url": "https://dl.registry.platformio.org/download/platformio/tool/framework-cmsis/2.50501.200527/framework-cmsis-2.50501.200527.tar.gz",
144-
"hash": "sha256-3ErJUB7dfsV0aUt7UhFD7eCng8TO42TuwlW0GGa+7Po="
145-
}
146-
}
147-
},
148-
"ststm32": {
149-
"name": "ststm32",
150-
"install_path": "platforms/ststm32",
151-
"version": "12.1.1",
152-
"manifest": "{\"type\":\"platform\",\"version\":\"12.1.1\",\"spec\":{\"owner\":\"platformio\",\"name\":\"ststm32\",\"uri\":null,\"id\":8020,\"requirements\":null},\"name\":\"ststm32\"}",
153-
"systems": {
154-
"aarch64-linux": {
155-
"url": "https://dl.registry.platformio.org/download/platformio/platform/ststm32/12.1.1/ststm32-12.1.1.tar.gz",
156-
"hash": "sha256-TYRfQCSqDtztp4yT9wNX+fGxpjyFwrL36TCOVv+XJxg="
157-
},
158-
"aarch64-darwin": {
159-
"url": "https://dl.registry.platformio.org/download/platformio/platform/ststm32/12.1.1/ststm32-12.1.1.tar.gz",
160-
"hash": "sha256-TYRfQCSqDtztp4yT9wNX+fGxpjyFwrL36TCOVv+XJxg="
161-
},
162-
"x86_64-linux": {
163-
"url": "https://dl.registry.platformio.org/download/platformio/platform/ststm32/12.1.1/ststm32-12.1.1.tar.gz",
164-
"hash": "sha256-TYRfQCSqDtztp4yT9wNX+fGxpjyFwrL36TCOVv+XJxg="
165-
},
166-
"x86_64-darwin": {
167-
"url": "https://dl.registry.platformio.org/download/platformio/platform/ststm32/12.1.1/ststm32-12.1.1.tar.gz",
168-
"hash": "sha256-TYRfQCSqDtztp4yT9wNX+fGxpjyFwrL36TCOVv+XJxg="
169-
}
170-
}
171-
},
172100
"tool-scons": {
173101
"name": "tool-scons",
174102
"install_path": "packages/tool-scons",
175-
"version": "4.40502.0",
176-
"manifest": "{\"type\":\"tool\",\"version\":\"4.40502.0\",\"spec\":{\"owner\":\"platformio\",\"name\":\"tool-scons\",\"requirements\":null,\"id\":8192,\"uri\":null},\"name\":\"tool-scons\"}",
103+
"version": "4.40700.0",
104+
"manifest": "{\"type\":\"tool\",\"version\":\"4.40700.0\",\"spec\":{\"owner\":\"platformio\",\"name\":\"tool-scons\",\"id\":8192,\"requirements\":null,\"uri\":null},\"name\":\"tool-scons\"}",
177105
"systems": {
178106
"aarch64-linux": {
179-
"url": "https://dl.registry.platformio.org/download/platformio/tool/tool-scons/4.40502.0/tool-scons-4.40502.0.tar.gz",
180-
"hash": "sha256-6WGOHHj5JnIJXfiEm5Kj4Hyg/BFv8jH/FRRwAjhs2zU="
107+
"url": "https://dl.registry.platformio.org/download/platformio/tool/tool-scons/4.40700.0/tool-scons-4.40700.0.tar.gz",
108+
"hash": "sha256-AtWAJ9UsR99TNBJ6rb6YZvp+Ega/IZIGb4mx/qIP2VM="
181109
},
182110
"aarch64-darwin": {
183-
"url": "https://dl.registry.platformio.org/download/platformio/tool/tool-scons/4.40502.0/tool-scons-4.40502.0.tar.gz",
184-
"hash": "sha256-6WGOHHj5JnIJXfiEm5Kj4Hyg/BFv8jH/FRRwAjhs2zU="
111+
"url": "https://dl.registry.platformio.org/download/platformio/tool/tool-scons/4.40700.0/tool-scons-4.40700.0.tar.gz",
112+
"hash": "sha256-AtWAJ9UsR99TNBJ6rb6YZvp+Ega/IZIGb4mx/qIP2VM="
185113
},
186114
"x86_64-linux": {
187-
"url": "https://dl.registry.platformio.org/download/platformio/tool/tool-scons/4.40502.0/tool-scons-4.40502.0.tar.gz",
188-
"hash": "sha256-6WGOHHj5JnIJXfiEm5Kj4Hyg/BFv8jH/FRRwAjhs2zU="
115+
"url": "https://dl.registry.platformio.org/download/platformio/tool/tool-scons/4.40700.0/tool-scons-4.40700.0.tar.gz",
116+
"hash": "sha256-AtWAJ9UsR99TNBJ6rb6YZvp+Ega/IZIGb4mx/qIP2VM="
189117
},
190118
"x86_64-darwin": {
191-
"url": "https://dl.registry.platformio.org/download/platformio/tool/tool-scons/4.40502.0/tool-scons-4.40502.0.tar.gz",
192-
"hash": "sha256-6WGOHHj5JnIJXfiEm5Kj4Hyg/BFv8jH/FRRwAjhs2zU="
119+
"url": "https://dl.registry.platformio.org/download/platformio/tool/tool-scons/4.40700.0/tool-scons-4.40700.0.tar.gz",
120+
"hash": "sha256-AtWAJ9UsR99TNBJ6rb6YZvp+Ega/IZIGb4mx/qIP2VM="
193121
}
194122
}
195123
},
196124
"toolchain-atmelavr": {
197125
"name": "toolchain-atmelavr",
198126
"install_path": "packages/toolchain-atmelavr",
199127
"version": "1.70300.191015",
200-
"manifest": "{\"type\":\"tool\",\"version\":\"1.70300.191015\",\"spec\":{\"owner\":\"platformio\",\"name\":\"toolchain-atmelavr\",\"uri\":null,\"id\":8203,\"requirements\":null},\"name\":\"toolchain-atmelavr\"}",
128+
"manifest": "{\"type\":\"tool\",\"version\":\"1.70300.191015\",\"spec\":{\"owner\":\"platformio\",\"name\":\"toolchain-atmelavr\",\"id\":8203,\"requirements\":null,\"uri\":null},\"name\":\"toolchain-atmelavr\"}",
201129
"systems": {
202130
"aarch64-linux": {
203131
"url": "https://dl.registry.platformio.org/download/platformio/tool/toolchain-atmelavr/1.70300.191015/toolchain-atmelavr-linux_aarch64-1.70300.191015.tar.gz",
@@ -216,26 +144,6 @@
216144
"hash": "sha256-ZbvIZjFjRU9nj5WSqnRdLvfjvphlS1kIMAmvVmSKBvI="
217145
}
218146
}
219-
},
220-
"toolchain-gccarmnoneeabi": {
221-
"name": "toolchain-gccarmnoneeabi",
222-
"install_path": "packages/toolchain-gccarmnoneeabi",
223-
"version": "1.90201.191206",
224-
"manifest": "{\"type\":\"tool\",\"version\":\"1.90201.191206\",\"spec\":{\"owner\":\"platformio\",\"name\":\"toolchain-gccarmnoneeabi\",\"requirements\":null,\"id\":8207,\"uri\":null},\"name\":\"toolchain-gccarmnoneeabi\"}",
225-
"systems": {
226-
"aarch64-darwin": {
227-
"url": "https://dl.registry.platformio.org/download/platformio/tool/toolchain-gccarmnoneeabi/1.90201.191206/toolchain-gccarmnoneeabi-darwin_x86_64-1.90201.191206.tar.gz",
228-
"hash": "sha256-MJ+3zVwbEvG6japvdVTMlclqgSRrb/SDPLsxQ2+Pat0="
229-
},
230-
"x86_64-linux": {
231-
"url": "https://dl.registry.platformio.org/download/platformio/tool/toolchain-gccarmnoneeabi/1.90201.191206/toolchain-gccarmnoneeabi-linux_x86_64-1.90201.191206.tar.gz",
232-
"hash": "sha256-FA+yY3mLncGVCzgxxE2asBGW+IMBK3hlix4AK5A10mw="
233-
},
234-
"x86_64-darwin": {
235-
"url": "https://dl.registry.platformio.org/download/platformio/tool/toolchain-gccarmnoneeabi/1.90201.191206/toolchain-gccarmnoneeabi-darwin_x86_64-1.90201.191206.tar.gz",
236-
"hash": "sha256-MJ+3zVwbEvG6japvdVTMlclqgSRrb/SDPLsxQ2+Pat0="
237-
}
238-
}
239147
}
240148
}
241149
}

0 commit comments

Comments
 (0)