From 5f7b8f1c07feaba794a94d09c86718f33c5453db Mon Sep 17 00:00:00 2001
From: Quinn Dougherty <quinnd@riseup.net>
Date: Tue, 16 Aug 2022 01:02:53 -0700
Subject: [PATCH] we took a step backwards somewhere, somehow.

---
 flake.lock            |  8 ++++----
 flake.nix             | 14 +++++++-------
 nix/shell.nix         |  3 +--
 nix/squiggle-lang.nix |  6 +++---
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/flake.lock b/flake.lock
index e0d3615f..ee8a31b4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -73,16 +73,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1660496378,
-        "narHash": "sha256-sgAhmrC1iSnl5T2VPPiMpciH1aRw5c7PYEdXX6jd6Gk=",
+        "lastModified": 1660485612,
+        "narHash": "sha256-sSLW1KaB1adKTJn9+Ja3h3AaS7QCZyhUKiSUStcLg80=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "879121648fe522b38cc1cf75aef160a14a1f2e7b",
+        "rev": "6512b21eabb4d52e87ea2edcf31a288e67b2e4f8",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-22.05",
+        "ref": "nixos-unstable",
         "type": "indirect"
       }
     },
diff --git a/flake.nix b/flake.nix
index dd218ed5..517bdcfd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "Squiggle CI";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-22.05";
+    nixpkgs.url = "nixpkgs/nixos-unstable";
     gentype = {
       url = "github:quinn-dougherty/genType";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -27,7 +27,9 @@
       };
       gentypeOutputFn = pkgs: gentype.outputs.packages.${pkgs.system}.default;
       langFn = { pkgs, ... }:
-        import ./nix/squiggle-lang.nix { inherit pkgs commonFn gentypeOutputFn; };
+        import ./nix/squiggle-lang.nix {
+          inherit pkgs commonFn gentypeOutputFn;
+        };
       componentsFn = { pkgs, ... }:
         import ./nix/squiggle-components.nix { inherit pkgs commonFn langFn; };
       websiteFn = { pkgs, ... }:
@@ -85,10 +87,8 @@
             };
             components.outputs = {
               squiggle-components = components.components-package-build;
-              squiggle-components-lint =
-                components.components-lint;
-              squiggle-components-storybook =
-                components.components-site-build;
+              squiggle-components-lint = components.components-lint;
+              squiggle-components-storybook = components.components-site-build;
             };
             docs-site.outputs = {
               squiggle-website = website.website;
@@ -98,7 +98,7 @@
         };
 
       };
-      in flake-utils.lib.eachDefaultSystem (system:
+    in flake-utils.lib.eachDefaultSystem (system:
       let
         # globals
         pkgs = import nixpkgs {
diff --git a/nix/shell.nix b/nix/shell.nix
index 023524bc..29008b8d 100644
--- a/nix/shell.nix
+++ b/nix/shell.nix
@@ -1,6 +1,5 @@
 { pkgs }:
-with pkgs;
-{
+with pkgs; {
   shell = mkShell {
     name = "SQUIGGLE_yarn-wasm-devshell";
     buildInputs =
diff --git a/nix/squiggle-lang.nix b/nix/squiggle-lang.nix
index 0f0d8fc0..de5298b0 100644
--- a/nix/squiggle-lang.nix
+++ b/nix/squiggle-lang.nix
@@ -34,9 +34,7 @@ rec {
       gentype = {
         postInstall = ''
           mv gentype.exe ELFLESS-gentype.exe
-          cp ${
-            gentypeOutputFn pkgs
-          }/src/GenType.exe gentype.exe
+          cp ${gentypeOutputFn pkgs}/src/GenType.exe gentype.exe
         '';
       };
     };
@@ -58,7 +56,9 @@ rec {
     src = lang-yarnPackage + "/libexec/@quri/squiggle-lang";
     buildInputs = common.buildInputs;
     buildPhase = ''
+      # so that the path to ppx doesn't need to be patched.
       mv node_modules deps
+
       pushd deps/@quri/squiggle-lang
       yarn --offline build:peggy
       yarn --offline build:rescript