From 4b6a565c3361973eb62f9ed5d6224c23011a51ef Mon Sep 17 00:00:00 2001
From: Quinn Dougherty <quinnd@riseup.net>
Date: Tue, 30 Aug 2022 17:12:50 +0800
Subject: [PATCH] minor cleanup

---
 flake.nix                |  1 +
 nix/squiggle-website.nix | 36 ++++++++++++++++++------------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/flake.nix b/flake.nix
index 9e0ee063..275c3f28 100644
--- a/flake.nix
+++ b/flake.nix
@@ -67,6 +67,7 @@
           # building
           packages = flake-utils.lib.flattenTree {
             default = components.build;
+            lang = lang.build;
             lang-bundle = lang.bundle;
             lang-test = lang.test;
             components = components.build;
diff --git a/nix/squiggle-website.nix b/nix/squiggle-website.nix
index 41c9d28d..3209affd 100644
--- a/nix/squiggle-website.nix
+++ b/nix/squiggle-website.nix
@@ -2,24 +2,24 @@
 
 rec {
   common = commonFn pkgs;
-  #  lang = langFn pkgs;
-  #  components = componentsFn pkgs;
-  #  websitePackageJson = let
-  #    raw = pkgs.lib.importJSON ../packages/website/package.json;
-  #    modified = pkgs.lib.recursiveUpdate raw {
-  #      dependencies.postcss-import = "^14.1.0";
-  #      dependencies.tailwindcss = "^3.1.8";
-  #    };
-  #    packageJsonString = builtins.toJSON modified;
-  #  in pkgs.writeText "packages/website/patched-package.json" packageJsonString;
-  #  yarn-source = pkgs.mkYarnPackage {
-  #    name = "squiggle-website_yarnsource";
-  #    src = ../packages/website;
-  #    packageJSON = websitePackageJson;
-  #    yarnLock = ../yarn.lock;
-  #    packageResolutions."@quri/squiggle-lang" = lang.build;
-  #    packageResolutions."@quri/squiggle-components" = components.build;
-  #  };
+  lang = langFn pkgs;
+  components = componentsFn pkgs;
+  websitePackageJson = let
+    raw = pkgs.lib.importJSON ../packages/website/package.json;
+    modified = pkgs.lib.recursiveUpdate raw {
+      dependencies.postcss-import = "^14.1.0";
+      dependencies.tailwindcss = "^3.1.8";
+    };
+    packageJsonString = builtins.toJSON modified;
+  in pkgs.writeText "packages/website/patched-package.json" packageJsonString;
+  yarn-source = pkgs.mkYarnPackage {
+    name = "squiggle-website_yarnsource";
+    src = ../packages/website;
+    packageJSON = websitePackageJson;
+    yarnLock = ../yarn.lock;
+    packageResolutions."@quri/squiggle-lang" = lang.build;
+    packageResolutions."@quri/squiggle-components" = components.build;
+  };
   lint = pkgs.stdenv.mkDerivation {
     name = "squiggle-website-lint";
     buildInputs = common.buildInputs ++ common.prettier;