proper deno dep management

shelf/default.nix

@@ -5,24 +5,23 @@ let
   scrollDirs = lib.discoverScrolls {
     scrollsDir = denoScrollsDir;
   };
-
-  mkScroll = subDir: lib.readDenoScroll {
-    inherit pkgs system subDir;
-    scrollsDir = denoScrollsDir;
-  };
   
+  mkScroll = subDir: import "${denoScrollsDir}/${subDir}/scroll.nix";
+
   scrolls = builtins.map mkScroll scrollDirs;
 
-  sharedCache = lib.buildSharedDenoCache {
-    inherit pkgs system;
-    scrollsDir = denoScrollsDir;
-    subDirs = scrollDirs;
+  lockfiles = builtins.map (s: s.build.lockFile) scrolls;
+
+  denoSharedCache = lib.denoSharedCache {
+    inherit pkgs lockfiles;
   };
 in
 {
-  setupScript = lib.makeDenoShelfSetup {
-    inherit pkgs sharedCache;
+  setupScript = lib.installDenoCache {
+    inherit pkgs;
+    cache = denoSharedCache;
   };
 
-  scrolls = builtins.map (s: s.meta) scrolls;
+  scrolls =
+    builtins.map (s: builtins.removeAttrs s [ "build" ]) scrolls;
 }

shelf/deno/hjq/scroll.nix

@@ -1,32 +0,0 @@
-{
-  name = "hjq";
-
-  description = "Drop-in jq replacement for HJSON that tries to preserve comments";
-  
-  inputs = {
-    stdin = {
-      format = "HJSON";
-      react  = "push";
-    };
-    jqFilter = {
-      format = "string";
-      react  = "push";
-    };
-  };
-  
-  outputs = {
-    stdout = {
-      format = "HJSON";
-      react  = "push";
-    };
-  };
-
-  build = {
-    hashFiles = [ ./deno.json ./deno.lock ];
-    cacheCommand = "deno cache --frozen main.ts";
-    knownHashes = {
-      "sha1-gSeoE0sSj+dFQ7SUoyaQV0X/KJE=" =
-        "sha256-0ZfdWVfShbhgAoSse9vEpFPRh5XTTVjgxGMmezwon1I=";
-    };
-  };
-}

shelf/deno/uses-hjq/deno.json

@@ -2,7 +2,7 @@
   "tasks": {
     "start": "deno run --cached-only main.ts"
   },
-  "patch": [
+  "links": [
     "../hjq"
   ]
 }

shelf/deno/uses-hjq/scroll.nix

@@ -22,11 +22,6 @@
   };
 
   build = {
-    hashFiles = [ ./deno.json ./deno.lock ];
-    cacheCommand = "deno cache --frozen main.ts";
-    knownHashes = {
-      "sha1-uO43Rt1F6+Ud1wk2p9LQhfP180M=" =
-        "sha256-x/Fvn/l3J7C0D7AftlbRk7iuc6o9qPakdnHb72TSxec=";
-    } ; 
+    lockFile = ./deno.lock;
   };
 }