update with store composition

binary-cache/tvix-cache.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, lib, ... }: {
   fileSystems."/nvme" = {
     device = "/dev/nvme0n1";
     fsType = "ext4";
@@ -8,6 +8,7 @@
   security.acme.defaults.email = "experiments@lahfa.xyz";
   services.tvix-binary-cache = {
     enable = true;
+
     enableNginx = true;
     nginx = {
       clientMaxBodySize = "50G";
@@ -15,12 +16,38 @@
     };
     caches = {
       forkos = {
-        port = 8000;
-        remote-path-info-service-addr = "nix+https://bagel-cache.s3-web.delroth.net";
+        grpcListenAddress = "[::1]:5000";
+        narBridgeListenAddress = "[::1]:8000";
+        tvix-daemon-composition.pathinfoservices = {
+          sled = {
+            type = "sled";
+            is_temporary = false;
+            path = "/var/lib/tvix-daemon-forkos/pathinfos.sled";
+          };
+          default = lib.mkForce {
+            type = "nix";
+            url = "nix+https://bagel-cache.s3-web.delroth.net";
+            blobservice = "default";
+            directoryservice = "objectstore";
+          };
+        };
       };
       cno = {
-        port = 8001;
-        remote-path-info-service-addr = "nix+https://cache.nixos.org?trusted-public-keys=cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=";
+        grpcListenAddress = "[::1]:5001";
+        narBridgeListenAddress = "[::1]:8001";
+        tvix-daemon-composition.pathinfoservices = {
+          sled = {
+            type = "sled";
+            is_temporary = false;
+            path = "/var/lib/tvix-daemon-cno/pathinfos.sled";
+          };
+          default = lib.mkForce {
+            type = "nix";
+            url = "nix+https://cache.nixos.org?trusted-public-keys=cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=";
+            blobservice = "default";
+            directoryservice = "objectstore";
+          };
+        };
       };
     };
   };

npins/sources.json

@@ -4,12 +4,12 @@
       "type": "Git",
       "repository": {
         "type": "Git",
-        "url": "https://git.dgnum.eu/mdebray/binary-cache.git"
+        "url": "https://git.lix.systems/yu-re-ka/binary-cache"
       },
       "branch": "master",
-      "revision": "ca91cdb33b14cea9221c21dba836132fdc5d4956",
+      "revision": "608f8008ebd5e7a535544cbc8df18ea4a64bb66a",
       "url": null,
-      "hash": "sha256-JKwi18fjiM5Fz/+qPsixrHKYAjTDPZiI8t8gsiP2Zac="
+      "hash": "sha256-yCA/QwWcwOs9dtVxHaHFCu2LNMOhhyUeZG1XpaZrNFE="
     },
     "nixpkgs": {
       "type": "Channel",