From 05a7d5c09aa70c124f8df294fc98a2155bc36c62 Mon Sep 17 00:00:00 2001
From: Quinn Dougherty <quinnd@riseup.net>
Date: Tue, 30 Aug 2022 11:19:54 +0800
Subject: [PATCH] rm need for `@types/lodash` in `lang/package.json`

---
 nix/squiggle-lang.nix               |  7 ++++++-
 packages/squiggle-lang/package.json |  1 -
 yarn.lock                           | 12 ++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/nix/squiggle-lang.nix b/nix/squiggle-lang.nix
index e7ad21ee..8722f908 100644
--- a/nix/squiggle-lang.nix
+++ b/nix/squiggle-lang.nix
@@ -2,10 +2,15 @@
 
 rec {
   common = commonFn pkgs;
+  langPackageJson = let
+    raw = pkgs.lib.importJSON ../packages/squiggle-lang/package.json;
+    modified = pkgs.lib.recursiveUpdate raw { devDependencies."@types/lodash" = "^4.14.182"; };
+    packageJsonString = builtins.toJSON modified;
+    in pkgs.writeText "packages/squiggle-lang/patched-package.json";
   yarn-source = pkgs.mkYarnPackage {
     name = "squiggle-lang_yarnsource";
     src = ../packages/squiggle-lang;
-    packageJSON = ../packages/squiggle-lang/package.json;
+    packageJSON = langPackageJson;
     yarnLock = ../yarn.lock;
     pkgConfig = {
       rescript = {
diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json
index 224c87c4..4d8c9224 100644
--- a/packages/squiggle-lang/package.json
+++ b/packages/squiggle-lang/package.json
@@ -51,7 +51,6 @@
     "@glennsl/rescript-jest": "^0.9.2",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@types/jest": "^27.5.0",
-    "@types/lodash": "^4.14.182",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
     "bisect_ppx": "^2.7.1",
     "chalk": "^5.0.1",
diff --git a/yarn.lock b/yarn.lock
index e3dca048..565cf57b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4401,7 +4401,7 @@
   resolved "https://registry.yarnpkg.com/@types/katex/-/katex-0.11.1.tgz#34de04477dcf79e2ef6c8d23b41a3d81f9ebeaf5"
   integrity sha512-DUlIj2nk0YnJdlWgsFuVKcX27MLW0KbKmGVoUHmFr+74FYYNUDAaj9ZqTADvsbE8rfxuVmSFc7KczYn5Y09ozg==
 
-"@types/lodash@^4.14.167", "@types/lodash@^4.14.175", "@types/lodash@^4.14.182", "@types/lodash@^4.14.184":
+"@types/lodash@^4.14.167", "@types/lodash@^4.14.175", "@types/lodash@^4.14.184":
   version "4.14.184"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.184.tgz#23f96cd2a21a28e106dc24d825d4aa966de7a9fe"
   integrity sha512-RoZphVtHbxPZizt4IcILciSWiC6dcn+eZ8oX9IWEYfDMcocdd42f7NPI6fQj+6zI8y4E0L7gu2pcZKLGTRaV9Q==
@@ -18807,16 +18807,16 @@ y18n@^5.0.5:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-
 yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
 yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"