@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
+1
-1
@@ -663,7 +663,7 @@ dependencies = [
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gyehoek-runtime"
|
||||
name = "gyehoek-wasm-runtime"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"clap",
|
||||
@@ -1,5 +1,5 @@
|
||||
[package]
|
||||
name = "gyehoek-runtime"
|
||||
name = "gyehoek-wasm-runtime"
|
||||
version = "0.1.0"
|
||||
edition = "2024"
|
||||
|
||||
@@ -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";
|
||||
}))
|
||||
@@ -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 {
|
||||
Reference in New Issue
Block a user