Re-enable purescript

3 files changed, 299 insertions, 30 deletions

diff --git a/fig-frontend-client/Makefile b/fig-frontend-client/Makefile
index 872bec7..1f01f50 100644
--- a/fig-frontend-client/Makefile
+++ b/fig-frontend-client/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all deploy extension
+.PHONY: all deploy extension clean
 
 all: dist/test/index.html dist/test/assets dist/test/main.js dist/test/main.css
 
@@ -33,3 +33,7 @@ dist/extension/manifest.json: extension/manifest.dhall
 
 dist/extension/%: extension/%
 	cp $< $@
+
+clean:
+	rm main.js
+	rm -r dist/
diff --git a/flake.lock b/flake.lock
index 2e7f74f..66db5b4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,135 @@
 {
   "nodes": {
+    "docs-search": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1675992564,
+        "narHash": "sha256-Tk9VSogFHXtXe9O9vuCEfM/PV/S7plMIO0I++fCZn7U=",
+        "owner": "purs-nix",
+        "repo": "purescript-docs-search",
+        "rev": "35822b1d6ce65b1a07f80dd9e2caf15c3ee83e2c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "purs-nix",
+        "repo": "purescript-docs-search",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1644229661,
+        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1618217525,
+        "narHash": "sha256-WGrhVczjXTiswQaoxQ+0PTfbLNeOQM6M36zvLn78AYg=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c6169a2772643c4a93a0b5ac1c61e296cba68544",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
+      "locked": {
+        "lastModified": 1618217525,
+        "narHash": "sha256-WGrhVczjXTiswQaoxQ+0PTfbLNeOQM6M36zvLn78AYg=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c6169a2772643c4a93a0b5ac1c61e296cba68544",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "get-flake": {
+      "locked": {
+        "lastModified": 1644686428,
+        "narHash": "sha256-zkhYsURWFrvEZLkIoBeqFBzSu+cA2u5mo6M8vq9LN7M=",
+        "owner": "ursi",
+        "repo": "get-flake",
+        "rev": "703f15558daa56dfae19d1858bb3046afe68831a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ursi",
+        "repo": "get-flake",
+        "type": "github"
+      }
+    },
+    "lint-utils": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "purs-nix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1707777931,
+        "narHash": "sha256-PsPb5xMBZ9dPDP04o9vqKEUIEG80Z84/74fPuOMs0ZI=",
+        "owner": "homotopic",
+        "repo": "lint-utils",
+        "rev": "5f11e3e51d8f1aa4ed62a89e90f05953931e105a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "homotopic",
+        "repo": "lint-utils",
+        "type": "github"
+      }
+    },
+    "make-shell": {
+      "locked": {
+        "lastModified": 1634940815,
+        "narHash": "sha256-P69OmveboXzS+es1vQGS4bt+ckwbeIExqxfGLjGuJqA=",
+        "owner": "ursi",
+        "repo": "nix-make-shell",
+        "rev": "8add91681170924e4d0591b22f294aee3f5516f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ursi",
+        "ref": "1",
+        "repo": "nix-make-shell",
+        "type": "github"
+      }
+    },
+    "make-shell_2": {
+      "locked": {
+        "lastModified": 1634940815,
+        "narHash": "sha256-P69OmveboXzS+es1vQGS4bt+ckwbeIExqxfGLjGuJqA=",
+        "owner": "ursi",
+        "repo": "nix-make-shell",
+        "rev": "8add91681170924e4d0591b22f294aee3f5516f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ursi",
+        "ref": "1",
+        "repo": "nix-make-shell",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1708815994,
@@ -16,9 +146,145 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1704161960,
+        "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "63143ac2c9186be6d9da6035fa22620018c85932",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1656549732,
+        "narHash": "sha256-eILutFZGjfk2bEzfim8S/qyYc//0S1KsCeO+OWbtoR0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d3248619647234b5dc74a6921bcdf6dd8323eb22",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "parsec": {
+      "locked": {
+        "lastModified": 1635533376,
+        "narHash": "sha256-/HrG0UPGnI5VdkhrNrpDiM2+nhdL6lD/bqyGtYv0QDE=",
+        "owner": "nprindle",
+        "repo": "nix-parsec",
+        "rev": "1bf25dd9c5de1257a1c67de3c81c96d05e8beb5e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nprindle",
+        "repo": "nix-parsec",
+        "type": "github"
+      }
+    },
+    "ps-tools": {
+      "inputs": {
+        "make-shell": "make-shell_2",
+        "nixpkgs": "nixpkgs_3",
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1704567308,
+        "narHash": "sha256-WbFPIkKLtyQOPBUjintckKIYnfs7MvIbmfVsLRSAPlc=",
+        "owner": "purs-nix",
+        "repo": "purescript-tools",
+        "rev": "ac626313141cbee78f06eb3c5e90359f695aef9b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "purs-nix",
+        "repo": "purescript-tools",
+        "type": "github"
+      }
+    },
+    "purs-nix": {
+      "inputs": {
+        "docs-search": "docs-search",
+        "get-flake": "get-flake",
+        "lint-utils": "lint-utils",
+        "make-shell": "make-shell",
+        "nixpkgs": "nixpkgs_2",
+        "parsec": "parsec",
+        "ps-tools": "ps-tools",
+        "utils": "utils_2"
+      },
+      "locked": {
+        "lastModified": 1707933489,
+        "narHash": "sha256-LP05KSBQ02mgBDiVdW53h9ViFBtFQIo4dT3FCebucI0=",
+        "owner": "purs-nix",
+        "repo": "purs-nix",
+        "rev": "72c9a8b7df0e53ff8b24fef00d9ea74d3a5b6522",
+        "type": "github"
+      },
+      "original": {
+        "owner": "purs-nix",
+        "ref": "ps-0.15",
+        "repo": "purs-nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "ps-tools": [
+          "purs-nix",
+          "ps-tools"
+        ],
+        "purs-nix": "purs-nix"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "flake-utils": "flake-utils_2"
+      },
+      "locked": {
+        "lastModified": 1656044990,
+        "narHash": "sha256-f01BB7CaOyntOab9XnpH9HD63rGcnu2iyL4M2ubs5F8=",
+        "owner": "ursi",
+        "repo": "flake-utils",
+        "rev": "f53b674a2c90f6202a2f4cd491aba121775490b5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ursi",
+        "ref": "8",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "utils_2": {
+      "inputs": {
+        "flake-utils": "flake-utils_3"
+      },
+      "locked": {
+        "lastModified": 1656044990,
+        "narHash": "sha256-f01BB7CaOyntOab9XnpH9HD63rGcnu2iyL4M2ubs5F8=",
+        "owner": "ursi",
+        "repo": "flake-utils",
+        "rev": "f53b674a2c90f6202a2f4cd491aba121775490b5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ursi",
+        "ref": "8",
+        "repo": "flake-utils",
+        "type": "github"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 8422b18..7012071 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,17 +3,16 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    # commented pending https://github.com/purs-nix/purs-nix/issues/55
-    # ps-tools.follows = "purs-nix/ps-tools";
-    # purs-nix.url = "github:purs-nix/purs-nix/ps-0.15";
+    ps-tools.follows = "purs-nix/ps-tools";
+    purs-nix.url = "github:purs-nix/purs-nix/ps-0.15";
   };
 
   outputs = { self, nixpkgs, ... }@inputs:
     let
       system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system};
-      # ps-tools = inputs.ps-tools.legacyPackages.${system};
-      # purs-nix = inputs.purs-nix { inherit system; };
+      ps-tools = inputs.ps-tools.legacyPackages.${system};
+      purs-nix = inputs.purs-nix { inherit system; };
 
       haskellOverrides = self: super: {
         scotty = self.callHackageDirect {
@@ -39,25 +38,25 @@
         overrides = haskellOverrides;
       };
 
-      # purescript = purs-nix.purs {
-      #   dependencies = [
-      #     "console"
-      #     "effect"
-      #     "prelude"
-      #     "random"
-      #     "refs"
-      #     "web-html"
-      #     "web-dom"
-      #     "web-uievents"
-      #     "canvas"
-      #     "argonaut"
-      #     "fetch"
-      #     "fetch-argonaut"
-      #   ];
-      #   dir = ./fig-frontend-client;
-      #   srcs = [ "src" ];
-      # };
-      # fig-frontend-client = purescript.bundle {};
+      purescript = purs-nix.purs {
+        dependencies = [
+          "console"
+          "effect"
+          "prelude"
+          "random"
+          "refs"
+          "web-html"
+          "web-dom"
+          "web-uievents"
+          "canvas"
+          "argonaut"
+          "fetch"
+          "fetch-argonaut"
+        ];
+        dir = ./fig-frontend-client;
+        srcs = [ "src" ];
+      };
+      fig-frontend-client = purescript.bundle {};
 
       figBusModule = { config, lib, ... }:
         let
@@ -296,10 +295,10 @@
         buildInputs = [
           haskellPackages.haskell-language-server
           pkgs.nodejs
-          # (purescript.command {})
-          # ps-tools.for-0_15.purescript-language-server
-          # purs-nix.esbuild
-          # purs-nix.purescript
+          (purescript.command {})
+          ps-tools.for-0_15.purescript-language-server
+          purs-nix.esbuild
+          purs-nix.purescript
           pkgs.m4
           pkgs.dhall
           pkgs.dhall-json