From 782cfa9e3372d0cfe13471597968d58deb181e71 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Fri, 23 Feb 2024 11:00:13 +0300 Subject: chore(tvixbolt): move from //corp to //web Assigning copyright to the TVL community (whatever that is), and adding AGPL-3.0-or-later license. I also cleaned up some of the stuff on the landing page. Change-Id: I4dbca19406e00e5105fed50e8fb64e0fcca23e3a Reviewed-on: https://cl.tvl.fyi/c/depot/+/11013 Autosubmit: tazjin Reviewed-by: flokli Tested-by: BuildkiteCI --- web/tvixbolt/default.nix | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 web/tvixbolt/default.nix (limited to 'web/tvixbolt/default.nix') diff --git a/web/tvixbolt/default.nix b/web/tvixbolt/default.nix new file mode 100644 index 000000000000..9b6baa582fb0 --- /dev/null +++ b/web/tvixbolt/default.nix @@ -0,0 +1,74 @@ +{ depot, lib, pkgs, ... }: + +let + wasmRust = pkgs.rust-bin.stable.latest.default.override { + targets = [ "wasm32-unknown-unknown" ]; + }; + + cargoToml = with builtins; fromTOML (readFile ./Cargo.toml); + + wasmBindgenMatch = + cargoToml.dependencies.wasm-bindgen == "= ${pkgs.wasm-bindgen-cli.version}"; + + assertWasmBindgen = assert (lib.assertMsg wasmBindgenMatch '' + Due to instability in the Rust WASM ecosystem, the trunk build + tool enforces that the Cargo-dependency version of `wasm-bindgen` + MUST match the version of the CLI supplied in the environment. + + This can get out of sync when nixpkgs is updated. To resolve it, + wasm-bindgen must be bumped in the Cargo.toml file and cargo needs + to be run to resolve the dependencies. + + Versions of `wasm-bindgen` in Cargo.toml: + + Expected: '= ${pkgs.wasm-bindgen-cli.version}' + Actual: '${cargoToml.dependencies.wasm-bindgen}' + ''); pkgs.wasm-bindgen-cli; + + deps = [ + pkgs.binaryen + pkgs.sass + pkgs.trunk + + wasmRust + assertWasmBindgen + ]; + + # Cargo.toml needs to be patched with the /nix/store source path of + # tvix-eval. + cargoTomlPatch = pkgs.writeText "tvix-eval-src.patch" '' + diff --git a/Cargo.toml b/Cargo.toml + index 75006bec18..6ca244bbb2 100644 + --- a/Cargo.toml + +++ b/Cargo.toml + @@ -16,7 +16,7 @@ rnix = "0.11.0" + wasm-bindgen = "= 0.2.83" + + [dependencies.tvix-eval] + -path = "../../tvix/eval" + +path = "${depot.tvix.crates.workspaceMembers.tvix-eval.build.src}" + default-features = false + + [dependencies.serde] + ''; +in +pkgs.rustPlatform.buildRustPackage rec { + pname = "tvixbolt"; + version = "canon"; + src = lib.cleanSource ./.; + + cargoLock.lockFile = ./Cargo.lock; + + patches = [ + cargoTomlPatch + ]; + + buildPhase = '' + export PATH=${lib.makeBinPath deps}:$PATH + mkdir home + export HOME=$PWD/home + trunk build --release -d $out + ''; + + dontInstall = true; +} -- cgit 1.4.1