From 25c9cdc7f23ed3ac5b84a72f6b4ab4238e8ec148 Mon Sep 17 00:00:00 2001
From: Quinn Dougherty <quinnd@riseup.net>
Date: Tue, 16 Aug 2022 02:15:55 -0700
Subject: [PATCH] finished renamings.

---
 flake.nix                   | 20 ++++++++++----------
 nix/squiggle-components.nix | 16 ++++++++--------
 nix/squiggle-lang.nix       |  3 +--
 nix/squiggle-website.nix    | 19 ++++++++-----------
 4 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/flake.nix b/flake.nix
index 38f8e4fe..24ee285c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,16 +48,16 @@
           checks = flake-utils.lib.flattenTree {
             lang-lint = lang.lint;
             lang-test = lang.test;
-            components-lint = components.components-lint;
-            docusaurus-lint = website.website-lint;
+            components-lint = components.lint;
+            docusaurus-lint = website.lint;
           };
           # building
           packages = flake-utils.lib.flattenTree {
             default = website.website;
             lang-bundle = lang.bundle;
-            components = components.components-package-build;
-            storybook = components.components-site-build;
-            docs-site = website.website;
+            components = components.package-build;
+            storybook = components.site-build;
+            docs-site = website.docusaurus;
           };
 
           # developing
@@ -85,13 +85,13 @@
               squiggle-lang-bundle = lang.bundle;
             };
             components.outputs = {
-              squiggle-components = components.components-package-build;
-              squiggle-components-lint = components.components-lint;
-              squiggle-components-storybook = components.components-site-build;
+              squiggle-components = components.package-build;
+              squiggle-components-lint = components.lint;
+              squiggle-components-storybook = components.site-build;
             };
             docs-site.outputs = {
-              squiggle-website = website.website;
-              docusaurus-lint = website.website-lint;
+              squiggle-website = website.docusaurus;
+              docusaurus-lint = website.lint;
             };
           };
         };
diff --git a/nix/squiggle-components.nix b/nix/squiggle-components.nix
index aa04b4a9..723e6fc6 100644
--- a/nix/squiggle-components.nix
+++ b/nix/squiggle-components.nix
@@ -10,25 +10,25 @@ rec {
     packageJsonString = builtins.toJSON modified;
   in pkgs.writeText "packages/components/patched-package.json"
   packageJsonString;
-  components-yarnPackage = pkgs.mkYarnPackage {
+  yarn-source = pkgs.mkYarnPackage {
     name = "squiggle-components_source";
     buildInputs = common.buildInputs;
     src = ../packages/components;
     packageJSON = componentsPackageJson;
     yarnLock = ../yarn.lock;
-    packageResolutions."@quri/squiggle-lang" = lang.lang-build;
+    packageResolutions."@quri/squiggle-lang" = lang.build;
   };
-  components-lint = pkgs.stdenv.mkDerivation {
+  lint = pkgs.stdenv.mkDerivation {
     name = "squiggle-components-lint";
-    src = components-yarnPackage
+    src = yarn-source
       + "/libexec/@quri/squiggle-components/deps/@quri/squiggle-components";
     buildInputs = common.buildInputs ++ common.prettier;
     buildPhase = "yarn lint";
     installPhase = "mkdir -p $out";
   };
-  components-package-build = pkgs.stdenv.mkDerivation {
+  package-build = pkgs.stdenv.mkDerivation {
     name = "squiggle-components-package-build";
-    src = components-yarnPackage + "/libexec/@quri/squiggle-components";
+    src = yarn-source + "/libexec/@quri/squiggle-components";
     buildInputs = common.buildInputs;
     buildPhase = ''
       cp -r node_modules/@quri/squiggle-lang deps/@quri
@@ -50,9 +50,9 @@ rec {
       cp -r deps/@quri/squiggle-components/. $out
     '';
   };
-  components-site-build = pkgs.stdenv.mkDerivation {
+  site-build = pkgs.stdenv.mkDerivation {
     name = "squiggle-components-storybook";
-    src = components-package-build;
+    src = package-build;
     buildInputs = common.buildInputs;
     buildPhase = "yarn build:storybook";
     installPhase = ''
diff --git a/nix/squiggle-lang.nix b/nix/squiggle-lang.nix
index 0826cb41..3f0e6b87 100644
--- a/nix/squiggle-lang.nix
+++ b/nix/squiggle-lang.nix
@@ -41,8 +41,7 @@ rec {
   };
   lint = pkgs.stdenv.mkDerivation {
     name = "squiggle-lang-lint";
-    src = yarn-source
-      + "/libexec/@quri/squiggle-lang/deps/@quri/squiggle-lang";
+    src = yarn-source + "/libexec/@quri/squiggle-lang/deps/@quri/squiggle-lang";
     buildInputs = common.buildInputs ++ common.prettier;
     buildPhase = ''
       yarn lint:prettier
diff --git a/nix/squiggle-website.nix b/nix/squiggle-website.nix
index 27b9a163..1b75cdc3 100644
--- a/nix/squiggle-website.nix
+++ b/nix/squiggle-website.nix
@@ -12,29 +12,26 @@ rec {
     };
     packageJsonString = builtins.toJSON modified;
   in pkgs.writeText "packages/website/patched-package.json" packageJsonString;
-  website-yarnPackage = pkgs.mkYarnPackage {
+  yarn-source = pkgs.mkYarnPackage {
     name = "squiggle-website_source";
     src = ../packages/website;
     packageJSON = websitePackageJson;
     yarnLock = ../yarn.lock;
-    packageResolutions."@quri/squiggle-lang" = lang.lang-build;
-    packageResolutions."@quri/squiggle-components" =
-      components.components-package-build;
-    workspaceDependencies =
-      [ lang.lang-yarnPackage components.components-yarnPackage ];
+    packageResolutions."@quri/squiggle-lang" = lang.build;
+    packageResolutions."@quri/squiggle-components" = components.package-build;
+    workspaceDependencies = [ lang.yarn-source components.yarn-source ];
   };
-  website-lint = pkgs.stdenv.mkDerivation {
+  lint = pkgs.stdenv.mkDerivation {
     name = "squiggle-website-lint";
     buildInputs = common.buildInputs ++ common.prettier;
-    src = website-yarnPackage
-      + "/libexec/squiggle-website/deps/squiggle-website";
+    src = yarn-source + "/libexec/squiggle-website/deps/squiggle-website";
     buildPhase = "yarn --offline lint";
     installPhase = "mkdir -p $out";
   };
-  website = pkgs.stdenv.mkDerivation {
+  docusaurus = pkgs.stdenv.mkDerivation {
     name = "squiggle-website";
     buildInputs = common.buildInputs;
-    src = website-yarnPackage + "/libexec/squiggle-website";
+    src = yarn-source + "/libexec/squiggle-website";
     buildPhase = ''
       pushd deps/squiggle-website
       yarn --offline build