From 94d57491bd7303688d9ae42a8a0a34b12b1372f5 Mon Sep 17 00:00:00 2001
From: Quinn Dougherty <quinnd@riseup.net>
Date: Tue, 16 Aug 2022 22:24:32 -0700
Subject: [PATCH] attempted to fix the herc part of the flake

---
 flake.nix           | 42 +++++++++++++++++++++++++++++-------------
 nix/squiggle-mc.nix |  3 ++-
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/flake.nix b/flake.nix
index ed374676..2dc96d73 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,24 +34,30 @@
         system = "wasm32-wasi";
         useLLVM = true;
       };
-      overlays =  [
-            cargo2nix.overlays.default
-            (final: prev: {
-              # set the node version here
-              nodejs = prev.nodejs-18_x;
-              # The override is the only way to get it into mkYarnModules
-            })
-          ];
+      overlays = [
+        cargo2nix.overlays.default
+        (final: prev: {
+          # set the node version here
+          nodejs = prev.nodejs-18_x;
+          # The override is the only way to get it into mkYarnModules
+        })
+      ];
 
       commonFn = pkgs: {
         buildInputs = with pkgs; [ nodejs yarn ];
         prettier = with pkgs.nodePackages; [ prettier ];
         which = [ pkgs.which ];
       };
-      naerskFn = { pkgs, rust, ... }: pkgs.callPackage naersk { cargo = rust; rustc = rust; };
+      naerskFn = { pkgs, rust, ... }:
+        pkgs.callPackage naersk {
+          cargo = rust;
+          rustc = rust;
+        };
       gentypeOutputFn = pkgs: gentype.outputs.packages.${pkgs.system}.default;
       mcFn = { pkgs, wasmPkgs, ... }:
-        import ./nix/squiggle-mc.nix { inherit pkgs wasmPkgs commonFn naerskFn; };
+        import ./nix/squiggle-mc.nix {
+          inherit pkgs wasmPkgs commonFn naerskFn;
+        };
       langFn = { pkgs, ... }:
         import ./nix/squiggle-lang.nix {
           inherit pkgs commonFn mcFn gentypeOutputFn;
@@ -105,9 +111,16 @@
       herc = let
         hciSystem = "x86_64-linux";
         hciPkgs = import nixpkgs { system = hciSystem; };
-        hciPkgsWasm = import nixpkgs { system = hciSystem; crossSystem = crossSystemForWasmPkgs; overlays = overlays; };
+        hciPkgsWasm = import nixpkgs {
+          system = hciSystem;
+          crossSystem = crossSystemForWasmPkgs;
+          overlays = overlays;
+        };
         effects = hercules-ci-effects.lib.withPkgs hciPkgs;
-        mc = mcFn hciPkgs hciPkgsWasm;
+        mc = mcFn {
+          pkgs = hciPkgs;
+          wasmPkgs = hciPkgsWasm;
+        };
         lang = langFn hciPkgs;
         components = componentsFn hciPkgs;
         website = websiteFn hciPkgs;
@@ -151,5 +164,8 @@
           crossSystem = crossSystemForWasmPkgs;
         };
 
-      in localFlake { pkgs = pkgs; wasmPkgs = pkgsWasm; }) // herc;
+      in localFlake {
+        pkgs = pkgs;
+        wasmPkgs = pkgsWasm;
+      }) // herc;
 }
diff --git a/nix/squiggle-mc.nix b/nix/squiggle-mc.nix
index fdd7eb9e..7e933a47 100644
--- a/nix/squiggle-mc.nix
+++ b/nix/squiggle-mc.nix
@@ -57,7 +57,8 @@ rec {
   firefox-test = pkgs.stdenv.mkDerivation {
     name = "squiggle-mc-test";
     src = yarn-source + "/libexec/@quri/squiggle-mc/deps/@quri/squiggle-mc";
-    buildInputs = common.buildInputs ++ (with pkgs; [ geckodriver cargo wasm-pack ]);
+    buildInputs = common.buildInputs
+      ++ (with pkgs; [ geckodriver cargo wasm-pack ]);
     buildPhase = "yarn --offline test -- --firefox";
     installPhase = "mkdir -p $out";
   };