Skip to content

Commit 3e51c32

Browse files
committed
merge: main -> feat/runners
1 parent 7c32a24 commit 3e51c32

File tree

3 files changed

+17
-12
lines changed

3 files changed

+17
-12
lines changed

flake.nix

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@
1616
lib = pkgs.lib;
1717
fenix = fenix-pkg.packages.${system};
1818

19-
toolchain = fenix.toolchainOf {
20-
channel = "1.85.0";
21-
sha256 = "sha256-AJ6LX/Q/Er9kS15bn9iflkUwcgYqRQxiOIL2ToVAXaU=";
22-
};
23-
wasmToolchain = fenix.targets.wasm32-unknown-unknown.toolchainOf {
24-
channel = "1.85.0";
25-
sha256 = "sha256-AJ6LX/Q/Er9kS15bn9iflkUwcgYqRQxiOIL2ToVAXaU=";
19+
rustToolchainDef = {
20+
channel = "1.88.0";
21+
sha256 = "sha256-Qxt8XAuaUR2OMdKbN4u8dBJOhSHxS+uS06Wl9+flVEk=";
2622
};
23+
toolchain = fenix.toolchainOf rustToolchainDef;
24+
wasmToolchain = fenix.targets.wasm32-unknown-unknown.toolchainOf rustToolchainDef;
2725

2826
commonBuildInputs = with pkgs; [
2927
just
@@ -61,7 +59,8 @@
6159
LD_LIBRARY_PATH = "${lib.makeLibraryPath [pkgs.libseccomp]}";
6260

6361
shellHook = ''
64-
cd frontend && pnpm install --frozen-lockfile || pnpm install
62+
if [ ! -e frontend-wasm/pkg ]; then wasm-pack build frontend-wasm; fi
63+
pnpm install -C frontend --frozen-lockfile || pnpm install -C frontend
6564
just setup-vendor-if-not
6665
'';
6766
};

frontend/package.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,11 @@
4343
"dependencies": {
4444
"frontend-wasm": "file:../frontend-wasm/pkg/",
4545
"solid-js": "^1.9.0"
46+
},
47+
"pnpm": {
48+
"onlyBuiltDependencies": [
49+
"@parcel/watcher",
50+
"esbuild"
51+
]
4652
}
4753
}

justfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
echo -e "\x1b[1;30;43m Downloading vendors \x1b[0m"
1414

15-
# just setup-vendor-download rust-1.85.0
15+
# just setup-vendor-download rust-stable-2025-03-18
1616
# just setup-vendor-download bash-interactive-5.2
1717
# just setup-vendor-download coreutils-full-9.6
1818

@@ -41,7 +41,7 @@
4141
just setup-vendor-uncompress openssl-3.4.1
4242
just setup-vendor-uncompress patchelf-0.15.0
4343
just setup-vendor-uncompress readline-8.2p13
44-
just setup-vendor-uncompress rust-1.85.0
44+
just setup-vendor-uncompress rust-stable-2025-03-18
4545
just setup-vendor-uncompress xgcc-14-20241116-libgcc
4646
just setup-vendor-uncompress zlib-1.3.1
4747

@@ -77,7 +77,7 @@
7777
just setup-vendor-rootfs openssl-3.4.1
7878
just setup-vendor-rootfs patchelf-0.15.0
7979
just setup-vendor-rootfs readline-8.2p13
80-
just setup-vendor-rootfs rust-1.85.0
80+
just setup-vendor-rootfs rust-stable-2025-03-18
8181
just setup-vendor-rootfs xgcc-14-20241116-libgcc
8282
just setup-vendor-rootfs zlib-1.3.1
8383

@@ -106,7 +106,7 @@ dev:
106106
echo -e "\x1b[1;32m \`{{NAME}}.tar.xz\` already downloaded\x1b[0m"; \
107107
else \
108108
echo -e "\x1b[1;33m Downloading \`{{NAME}}.tar.xz\`\x1b[0m"; \
109-
curl -L https://pub-8961b8a1fddb4f0185a74957df0591c7.r2.dev/{{NAME}}.tar.xz -o backend/runner/lxc_vendor/{{NAME}}.tar.xz; \
109+
curl -L https://vendor.rsground.rustlang-es.org/{{NAME}}.tar.xz -o backend/runner/lxc_vendor/{{NAME}}.tar.xz; \
110110
fi
111111

112112
@setup-vendor-uncompress NAME:

0 commit comments

Comments
 (0)