From c4f38032cec2418f7792f6d15bdeec8a124a352b Mon Sep 17 00:00:00 2001
From: fang <git@fang.io>
Date: Sun, 20 Feb 2022 15:35:55 -0600
Subject: [PATCH] pkg: move /lib/dill into base-dev, include it

Landscape desk needed it, but didn't have it.
---
 pkg/arvo/lib/dill.hoon      | 94 +------------------------------------
 pkg/base-dev/lib/dill.hoon  | 93 ++++++++++++++++++++++++++++++++++++
 pkg/landscape/lib/dill.hoon |  1 +
 3 files changed, 95 insertions(+), 93 deletions(-)
 mode change 100644 => 120000 pkg/arvo/lib/dill.hoon
 create mode 100644 pkg/base-dev/lib/dill.hoon
 create mode 120000 pkg/landscape/lib/dill.hoon

diff --git a/pkg/arvo/lib/dill.hoon b/pkg/arvo/lib/dill.hoon
deleted file mode 100644
index d4cecdf142..0000000000
--- a/pkg/arvo/lib/dill.hoon
+++ /dev/null
@@ -1,93 +0,0 @@
-::  dill: utilities for dill's data structures
-::
-=,  dill
-|%
-++  enjs
-  |%
-  ++  blit
-    |=  =blit:dill
-    ^-  json
-    =,  enjs:format
-    %+  frond  -.blit
-    ?-  -.blit
-      %bel  b+&
-      %clr  b+&
-      %hop  ?@  p.blit  (numb p.blit)
-            (pairs 'r'^(numb r.p.blit) 'c'^(numb c.p.blit) ~)
-      %put  a+(turn p.blit |=(c=@c s+(tuft c)))
-      %nel  b+&
-      %url  s+p.blit
-      %wyp  b+&
-    ::
-        %sag
-      %-  pairs
-      :~  'path'^(path p.blit)
-          'file'^s+(en:base64:mimes:html (as-octs:mimes:html (jam q.blit)))
-      ==
-    ::
-        %sav
-      %-  pairs
-      :~  'path'^(path p.blit)
-          'file'^s+(en:base64:mimes:html (as-octs:mimes:html q.blit))
-      ==
-    ::
-        %klr
-      :-  %a
-      %+  turn  p.blit
-      |=  [=stye text=(list @c)]
-      %-  pairs
-      :~  'text'^a+(turn text |=(c=@c s+(tuft c)))
-        ::
-          :-  'stye'
-          %-  pairs
-          |^  :~  'back'^(color p.q.stye)
-                  'fore'^(color q.q.stye)
-                  'deco'^a+(turn ~(tap in p.stye) |=(d=deco ?~(d ~ s+d)))
-              ==
-          ++  color
-            |=  =tint
-            ?@  tint  ?~(tint ~ s+tint)
-            =,  tint
-            (pairs r+(numb r) g+(numb g) b+(numb b) ~)
-          --
-      ==
-    ==
-  --
-::
-++  dejs
-  |%
-  ++  belt
-    |=  jon=json
-    ^-  belt:dill
-    ?:  ?=([%s *] jon)
-      (taft p.jon)
-    =,  dejs:format
-    %.  jon
-    %-  of
-    |^  :*  mod+(ot 'mod'^mod 'key'^bot ~)
-            txt+(ar (cu taft so))
-            bol
-        ==
-    ::
-    ++  bol
-      :~  aro+(su (perk %d %l %r %u ~))
-          bac+ul
-          del+ul
-          hit+(ot 'r'^ni 'c'^ni ~)
-          ret+ul
-      ==
-    ::
-    ++  bot
-      |=  j=json
-      ^-  bolt:dill
-      ?+  j  !!
-        [%s *]  (taft p.j)
-        [%o *]  ((of bol) j)
-      ==
-    ::
-    ++  mod
-      |=  j=json
-      ((su (perk %ctl %met %hyp ~)) j)
-    --
-  --
---
\ No newline at end of file
diff --git a/pkg/arvo/lib/dill.hoon b/pkg/arvo/lib/dill.hoon
new file mode 120000
index 0000000000..f9c2362f07
--- /dev/null
+++ b/pkg/arvo/lib/dill.hoon
@@ -0,0 +1 @@
+../../base-dev/lib/dill.hoon
\ No newline at end of file
diff --git a/pkg/base-dev/lib/dill.hoon b/pkg/base-dev/lib/dill.hoon
new file mode 100644
index 0000000000..d4cecdf142
--- /dev/null
+++ b/pkg/base-dev/lib/dill.hoon
@@ -0,0 +1,93 @@
+::  dill: utilities for dill's data structures
+::
+=,  dill
+|%
+++  enjs
+  |%
+  ++  blit
+    |=  =blit:dill
+    ^-  json
+    =,  enjs:format
+    %+  frond  -.blit
+    ?-  -.blit
+      %bel  b+&
+      %clr  b+&
+      %hop  ?@  p.blit  (numb p.blit)
+            (pairs 'r'^(numb r.p.blit) 'c'^(numb c.p.blit) ~)
+      %put  a+(turn p.blit |=(c=@c s+(tuft c)))
+      %nel  b+&
+      %url  s+p.blit
+      %wyp  b+&
+    ::
+        %sag
+      %-  pairs
+      :~  'path'^(path p.blit)
+          'file'^s+(en:base64:mimes:html (as-octs:mimes:html (jam q.blit)))
+      ==
+    ::
+        %sav
+      %-  pairs
+      :~  'path'^(path p.blit)
+          'file'^s+(en:base64:mimes:html (as-octs:mimes:html q.blit))
+      ==
+    ::
+        %klr
+      :-  %a
+      %+  turn  p.blit
+      |=  [=stye text=(list @c)]
+      %-  pairs
+      :~  'text'^a+(turn text |=(c=@c s+(tuft c)))
+        ::
+          :-  'stye'
+          %-  pairs
+          |^  :~  'back'^(color p.q.stye)
+                  'fore'^(color q.q.stye)
+                  'deco'^a+(turn ~(tap in p.stye) |=(d=deco ?~(d ~ s+d)))
+              ==
+          ++  color
+            |=  =tint
+            ?@  tint  ?~(tint ~ s+tint)
+            =,  tint
+            (pairs r+(numb r) g+(numb g) b+(numb b) ~)
+          --
+      ==
+    ==
+  --
+::
+++  dejs
+  |%
+  ++  belt
+    |=  jon=json
+    ^-  belt:dill
+    ?:  ?=([%s *] jon)
+      (taft p.jon)
+    =,  dejs:format
+    %.  jon
+    %-  of
+    |^  :*  mod+(ot 'mod'^mod 'key'^bot ~)
+            txt+(ar (cu taft so))
+            bol
+        ==
+    ::
+    ++  bol
+      :~  aro+(su (perk %d %l %r %u ~))
+          bac+ul
+          del+ul
+          hit+(ot 'r'^ni 'c'^ni ~)
+          ret+ul
+      ==
+    ::
+    ++  bot
+      |=  j=json
+      ^-  bolt:dill
+      ?+  j  !!
+        [%s *]  (taft p.j)
+        [%o *]  ((of bol) j)
+      ==
+    ::
+    ++  mod
+      |=  j=json
+      ((su (perk %ctl %met %hyp ~)) j)
+    --
+  --
+--
\ No newline at end of file
diff --git a/pkg/landscape/lib/dill.hoon b/pkg/landscape/lib/dill.hoon
new file mode 120000
index 0000000000..f9c2362f07
--- /dev/null
+++ b/pkg/landscape/lib/dill.hoon
@@ -0,0 +1 @@
+../../base-dev/lib/dill.hoon
\ No newline at end of file