rename runtime → wasm-runtime

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,15 +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
-                  export GYEHOEK_IN_NIX_BUILD=1
                 '';
             })];
             shell = {
               withHoogle = true;
               inputsFrom = [
-                final.gyehoek-runtime
+                final.gyehoek-wasm-runtime
               ];
               tools = {
                 cabal = {};
@@ -92,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

gyehoek.cabal

@@ -156,11 +156,11 @@ test-suite test
   default-language:   GHC2024
 
 -- https://github.com/martijnbastiaan/doctest-parallel/pull/66
-test-suite doctest
+-- test-suite doctest
-  import:         ghcstuffs, ghcstuffs-dev
+--   import:         ghcstuffs, ghcstuffs-dev
-  type:           exitcode-stdio-1.0
+--   type:           exitcode-stdio-1.0
-  hs-source-dirs: test
+--   hs-source-dirs: test
-  main-is:        doctest.hs
+--   main-is:        doctest.hs
-  build-depends:
+--   build-depends:
-    , base
+--     , base
-    , doctest-parallel  >=0.1
+--     , doctest-parallel  >=0.1

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"
+  cmd <- getEnvDefault "GYEHOEK_WASM_RUNTIME"
-    "runtime/target/debug/gyehoek-runtime"
+    "runtime/target/debug/gyehoek-wasm-runtime"
   pure $ testGroup "wasm" $ files <&> \test ->
     let testname = takeFileName test
         scmfile = test </> "source.scm"

test/doctest.hs

@@ -7,11 +7,4 @@ import System.IO (stderr, hPutStrLn)
 
 
 main :: IO ()
-main = do
+main = mainFromCabal "gyehoek" =<< getArgs
-  nix <- maybe False null <$> lookupEnv "GYEHOEK_IN_NIX_BUILD"
-  if nix then do
-    hPutStrLn stderr "\
-     \skipping doctests in Nix build environment. \
-     \see https://github.com/pcapriotti/optparse-applicative/pull/408."
-  else
-    mainFromCabal "gyehoek" =<< getArgs

wasm-runtime/Cargo.lock

@@ -663,7 +663,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "gyehoek-runtime"
+name = "gyehoek-wasm-runtime"
 version = "0.1.0"
 dependencies = [
  "clap",

wasm-runtime/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "gyehoek-runtime"
+name = "gyehoek-wasm-runtime"
 version = "0.1.0"
 edition = "2024"
 

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";
 }))

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 {