From 030b36cd98407a0c931f61af9cb86ca30b32cdfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Madeleine=20Sydney=20=C5=9Alaga?= Date: Mon, 24 Aug 2026 02:00:15 -0600 Subject: [PATCH] =?UTF-8?q?rename=20runtime=20=E2=86=92=20wasm-runtime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.nix | 10 ++++++---- test/Gyehoek/Test/Golden.hs | 4 ++-- {runtime => wasm-runtime}/.gitignore | 0 {runtime => wasm-runtime}/Cargo.lock | 2 +- {runtime => wasm-runtime}/Cargo.toml | 2 +- {runtime => wasm-runtime}/default.nix | 4 ++-- {runtime => wasm-runtime}/src/gyehoek.rs | 0 {runtime => wasm-runtime}/src/internal.rs | 0 {runtime => wasm-runtime}/src/main.rs | 2 +- {runtime => wasm-runtime}/src/types.rs | 0 10 files changed, 13 insertions(+), 11 deletions(-) rename {runtime => wasm-runtime}/.gitignore (100%) rename {runtime => wasm-runtime}/Cargo.lock (99%) rename {runtime => wasm-runtime}/Cargo.toml (87%) rename {runtime => wasm-runtime}/default.nix (68%) rename {runtime => wasm-runtime}/src/gyehoek.rs (100%) rename {runtime => wasm-runtime}/src/internal.rs (100%) rename {runtime => wasm-runtime}/src/main.rs (97%) rename {runtime => wasm-runtime}/src/types.rs (100%) diff --git a/flake.nix b/flake.nix index a6cb716..c655d07 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,7 @@ overlays = [ haskellNix.overlay (final: prev: { - gyehoek-runtime = final.callPackage ./runtime { + gyehoek-wasm-runtime = final.callPackage ./wasm-runtime { crane-lib = inputs.crane.mkLib final; }; gyehoek = final.haskell-nix.project' { @@ -33,14 +33,16 @@ pkgs.git # tasty uses git diff ]; in '' - export GYEHOEK_RUNTIME=${lib.getExe final.gyehoek-runtime} + export GYEHOEK_WASM_RUNTIME=${ + lib.getExe final.gyehoek-wasm-runtime + } export PATH=${lib.makeBinPath bin}:$PATH ''; })]; shell = { withHoogle = true; inputsFrom = [ - final.gyehoek-runtime + final.gyehoek-wasm-runtime ]; tools = { cabal = {}; @@ -91,7 +93,7 @@ hf.packages.${system} // lib.fix (packages: { gyehoek = hf.packages.${system}."gyehoek:exe:gyehoek"; default = packages.gyehoek; - inherit (pkgs) gyehoek-runtime; + inherit (pkgs) gyehoek-wasm-runtime; })); devShells = each-system diff --git a/test/Gyehoek/Test/Golden.hs b/test/Gyehoek/Test/Golden.hs index 04bd34c..9c62551 100644 --- a/test/Gyehoek/Test/Golden.hs +++ b/test/Gyehoek/Test/Golden.hs @@ -50,8 +50,8 @@ maybeBroken name broken = applyWhen (name `elem` broken) expectFail wasmTests :: List FilePath -> IO TestTree wasmTests files = do - cmd <- getEnvDefault "GYEHOEK_RUNTIME" - "runtime/target/debug/gyehoek-runtime" + cmd <- getEnvDefault "GYEHOEK_WASM_RUNTIME" + "runtime/target/debug/gyehoek-wasm-runtime" pure $ testGroup "wasm" $ files <&> \test -> let testname = takeFileName test scmfile = test "source.scm" diff --git a/runtime/.gitignore b/wasm-runtime/.gitignore similarity index 100% rename from runtime/.gitignore rename to wasm-runtime/.gitignore diff --git a/runtime/Cargo.lock b/wasm-runtime/Cargo.lock similarity index 99% rename from runtime/Cargo.lock rename to wasm-runtime/Cargo.lock index 99d077a..decb228 100644 --- a/runtime/Cargo.lock +++ b/wasm-runtime/Cargo.lock @@ -663,7 +663,7 @@ dependencies = [ ] [[package]] -name = "gyehoek-runtime" +name = "gyehoek-wasm-runtime" version = "0.1.0" dependencies = [ "clap", diff --git a/runtime/Cargo.toml b/wasm-runtime/Cargo.toml similarity index 87% rename from runtime/Cargo.toml rename to wasm-runtime/Cargo.toml index eddba02..d478f0b 100644 --- a/runtime/Cargo.toml +++ b/wasm-runtime/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "gyehoek-runtime" +name = "gyehoek-wasm-runtime" version = "0.1.0" edition = "2024" diff --git a/runtime/default.nix b/wasm-runtime/default.nix similarity index 68% rename from runtime/default.nix rename to wasm-runtime/default.nix index 8359c32..38a1767 100644 --- a/runtime/default.nix +++ b/wasm-runtime/default.nix @@ -4,10 +4,10 @@ }: crane-lib.buildPackage (lib.fix (finalAttrs: { - pname = "gyehoek-runtime"; + pname = "gyehoek-wasm-runtime"; version = "0.1.0"; src = ./.; # cargoLock = ./Cargo.lock; doCheck = true; - meta.mainProgram = "gyehoek-runtime"; + meta.mainProgram = "gyehoek-wasm-runtime"; })) diff --git a/runtime/src/gyehoek.rs b/wasm-runtime/src/gyehoek.rs similarity index 100% rename from runtime/src/gyehoek.rs rename to wasm-runtime/src/gyehoek.rs diff --git a/runtime/src/internal.rs b/wasm-runtime/src/internal.rs similarity index 100% rename from runtime/src/internal.rs rename to wasm-runtime/src/internal.rs diff --git a/runtime/src/main.rs b/wasm-runtime/src/main.rs similarity index 97% rename from runtime/src/main.rs rename to wasm-runtime/src/main.rs index fcd662f..e289c8d 100644 --- a/runtime/src/main.rs +++ b/wasm-runtime/src/main.rs @@ -8,7 +8,7 @@ use clio::*; use clap::Parser; use wasmtime::*; -/// A runtime for Gyehoek scheme. +/// A Wasm runtime for Gyehoek scheme. #[derive(Parser, Debug)] #[command(name = "gyehoek", version, about, long_about = None)] struct Args { diff --git a/runtime/src/types.rs b/wasm-runtime/src/types.rs similarity index 100% rename from runtime/src/types.rs rename to wasm-runtime/src/types.rs