regenerating yarn.lock got the goods

flake.lock

@@ -38,11 +38,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1660628617,
-        "narHash": "sha256-swFuey10pJV/TFcPv9pMf9xuXf/BDuJ1xzZ57jpfkrA=",
+        "lastModified": 1660630689,
+        "narHash": "sha256-oM21qcr+VtI69GIm56UDy6oGiupq2GkZDIaKXWWnM8k=",
         "owner": "quinn-dougherty",
         "repo": "genType",
-        "rev": "e4374399178976de0c4fc41f64dde913c3bed5dd",
+        "rev": "c2a022cfec32b5a61d575205daa93416a9a9309c",
         "type": "github"
       },
       "original": {

flake.nix

@@ -19,13 +19,15 @@
 
   outputs = { self, nixpkgs, gentype, hercules-ci-effects, flake-utils, ... }:
     let
+      version = builtins.substring 0 8 self.lastModifiedDate;
       commonFn = pkgs: {
         buildInputs = with pkgs; [ nodejs yarn ];
         prettier = with pkgs.nodePackages; [ prettier ];
         which = [ pkgs.which ];
       };
+      gentypeOutputFn = pkgs: gentype.outputs.packages.${pkgs.system}.default;
       langFn = { pkgs, ... }:
-        import ./nix/squiggle-lang.nix { inherit pkgs commonFn gentype; };
+        import ./nix/squiggle-lang.nix { inherit pkgs commonFn gentypeOutputFn; };
       componentsFn = { pkgs, ... }:
         import ./nix/squiggle-components.nix { inherit pkgs commonFn langFn; };
       websiteFn = { pkgs, ... }:
@@ -34,7 +36,7 @@
         };
 
       # local machines
-      localFlake = { pkgs }:
+      localFlake = { pkgs, ... }:
         let
           lang = langFn pkgs;
           components = componentsFn pkgs;
@@ -86,7 +88,7 @@
               squiggle-components-lint =
                 components.components-lint;
               squiggle-components-storybook =
-                components.storybook;
+                components.components-site-build;
             };
             docs-site.outputs = {
               squiggle-website = website.website;
@@ -96,19 +98,19 @@
         };
 
       };
-    in flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
+      in flake-utils.lib.eachDefaultSystem (system:
       let
         # globals
         pkgs = import nixpkgs {
-          system = system;
+          inherit system;
           overlays = [
             (final: prev: {
               # set the node version here
-              nodejs = prev.nodejs-16_x;
+              nodejs = prev.nodejs-18_x;
               # The override is the only way to get it into mkYarnModules
             })
           ];
         };
 
-      in (localFlake { inherit pkgs; } )) // herc;
+      in localFlake pkgs) // herc;
 }

nix/squiggle-lang.nix

@@ -1,14 +1,12 @@
-{ pkgs, commonFn, gentype }:
+{ pkgs, commonFn, gentypeOutputFn }:
 
 rec {
   common = commonFn pkgs;
-  # packages in subrepos
   lang-yarnPackage = pkgs.mkYarnPackage {
     name = "squiggle-lang_source";
     src = ../packages/squiggle-lang;
     packageJSON = ../packages/squiggle-lang/package.json;
     yarnLock = ../yarn.lock;
-    # extraBuildInputs = prettierCommon;
     pkgConfig = {
       rescript = {
         buildInputs = common.which ++ [ pkgs.gcc_multi ];
@@ -37,8 +35,8 @@ rec {
         postInstall = ''
           mv gentype.exe ELFLESS-gentype.exe
           cp ${
-            gentype.outputs.defaultPackage."${pkgs.system}"
-          }/GenType.exe gentype.exe
+            gentypeOutputFn pkgs
+          }/src/GenType.exe gentype.exe
         '';
       };
     };