diff --git a/dnas/file_storage_provider/zomes/coordinator/file_storage/zome.nix b/dnas/file_storage_provider/zomes/coordinator/file_storage/zome.nix index 29edfdbe..0d8caacf 100644 --- a/dnas/file_storage_provider/zomes/coordinator/file_storage/zome.nix +++ b/dnas/file_storage_provider/zomes/coordinator/file_storage/zome.nix @@ -5,7 +5,7 @@ { inputs' , ... }: { - packages.file_storage_integrity = inputs.hcUtils.outputs.lib.rustZome { + packages.file_storage_integrity = inputs.hc-infra.outputs.lib.rustZome { workspacePath = rootPath; holochain = inputs'.holochain; crateCargoToml = ./Cargo.toml; diff --git a/dnas/file_storage_provider/zomes/integrity/file_storage/zome.nix b/dnas/file_storage_provider/zomes/integrity/file_storage/zome.nix index ad6d4e60..b0bfa6fb 100644 --- a/dnas/file_storage_provider/zomes/integrity/file_storage/zome.nix +++ b/dnas/file_storage_provider/zomes/integrity/file_storage/zome.nix @@ -10,7 +10,7 @@ , options , ... }: { - packages.file_storage = inputs.hcUtils.outputs.lib.rustZome { + packages.file_storage = inputs.hc-infra.outputs.lib.rustZome { workspacePath = rootPath; holochain = inputs'.holochain; crateCargoToml = ./Cargo.toml; diff --git a/flake.lock b/flake.lock index 84b47482..84aae1da 100644 --- a/flake.lock +++ b/flake.lock @@ -73,11 +73,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1710003968, - "narHash": "sha256-g8+K+mLiNG5uch35Oy9oDQBAmGSkCcqrd0Jjme7xiG0=", + "lastModified": 1712513517, + "narHash": "sha256-VuLm5tTMqfS82NZAsNfsW7U+pTZ1+GcOU7gYR/Fb1Z4=", "owner": "ipetkov", "repo": "crane", - "rev": "10484f86201bb94bd61ecc5335b1496794fedb78", + "rev": "9caad1eb0c69a13ee6467035353b71a76c85ea53", "type": "github" }, "original": { @@ -89,7 +89,7 @@ "crane_2": { "inputs": { "nixpkgs": [ - "hcUtils", + "hc-infra", "holochain", "nixpkgs" ] @@ -313,12 +313,12 @@ "type": "github" } }, - "hcUtils": { + "hc-infra": { "inputs": { "crane": "crane", "holochain": "holochain", "nixpkgs": [ - "hcUtils", + "hc-infra", "holochain", "nixpkgs" ], @@ -326,16 +326,17 @@ "versions": "versions" }, "locked": { - "lastModified": 1710516248, - "narHash": "sha256-aPlNrB/i6LatG+nUD1uNL3k5sW6O499hYua1EuHwiCk=", + "lastModified": 1712755637, + "narHash": "sha256-/y+uOFj2uW9I1ASD+1jLlgFH22LLXpHfJKMSyfshbko=", "owner": "holochain-open-dev", - "repo": "common", - "rev": "97a15932e38a3a0db5ce5b48b4989508bf91bb46", + "repo": "infrastructure", + "rev": "0d83c96da1e9ed19b1f6e413743a33970694da8e", "type": "github" }, "original": { "owner": "holochain-open-dev", - "repo": "common", + "ref": "0.300.0-dev", + "repo": "infrastructure", "type": "github" } }, @@ -349,17 +350,17 @@ "flake-compat": "flake-compat", "flake-parts": "flake-parts", "holochain": [ - "hcUtils", + "hc-infra", "holochain", "empty" ], "lair": [ - "hcUtils", + "hc-infra", "holochain", "empty" ], "launcher": [ - "hcUtils", + "hc-infra", "holochain", "empty" ], @@ -369,21 +370,21 @@ "repo-git": "repo-git", "rust-overlay": "rust-overlay", "scaffolding": [ - "hcUtils", + "hc-infra", "holochain", "empty" ], "versions": [ - "hcUtils", + "hc-infra", "versions" ] }, "locked": { - "lastModified": 1710485275, - "narHash": "sha256-DyQL69KEN+H3gx8q1/PjudnLd5traesFT2SBJYc74iM=", + "lastModified": 1712658297, + "narHash": "sha256-+uDfTOPKtNUy2i6TjD7eMwRxU8RXo+FOgiY+C0SGwls=", "owner": "holochain", "repo": "holochain", - "rev": "b2a1abb37561bf94653dffcc50d516c996c56ec4", + "rev": "e49d2eb781aba3f521c54b45e3585f42575ef367", "type": "github" }, "original": { @@ -395,16 +396,16 @@ "holochain_2": { "flake": false, "locked": { - "lastModified": 1710291013, - "narHash": "sha256-etoY8oXg3PXFMeZgkixxsKJjH1Uauua366y2TN8+fms=", + "lastModified": 1712161287, + "narHash": "sha256-izcly9+JWv15F70SK5DcyZyuMomO4+HmvoQ0CWh3J3M=", "owner": "holochain", "repo": "holochain", - "rev": "15516823c6f5e0ec7f032e614d804b2376fe0867", + "rev": "a87b7b6280bd913d7ac88841810d2013864c0959", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3.0-beta-dev.40", + "ref": "holochain-0.3.0-beta-dev.44", "repo": "holochain", "type": "github" } @@ -444,11 +445,11 @@ ] }, "locked": { - "lastModified": 1712732100, - "narHash": "sha256-L2w9ycruj2DMtU6ehrBcPwXXAUzLRakj2MX0srMgNzs=", + "lastModified": 1712753500, + "narHash": "sha256-a6SFMXpUV2Ccyy+ITYOKDaJWIinvcUxlt0JOXV2K/Qo=", "owner": "holochain", "repo": "holochain", - "rev": "d73e31d3518a62c1d399c83130b3014c5ca3f17b", + "rev": "79e851a8b18871cb57c02b73d3c6262972ab34fb", "type": "github" }, "original": { @@ -511,11 +512,11 @@ "launcher": { "flake": false, "locked": { - "lastModified": 1706294585, - "narHash": "sha256-92Qc6hBMFfHo3w1m1+EpNAAV+7whpkgRHiGqNiXaMCg=", + "lastModified": 1712599324, + "narHash": "sha256-MNUTplS5O+w1G70kZMpFGfBTqOzzTRU6DYarl1bGVFY=", "owner": "holochain", "repo": "launcher", - "rev": "51a45a7141abc98a861b34b288b384f50f359485", + "rev": "597592253c9d2ca64a4e4ac4675ff5081c9dd9b5", "type": "github" }, "original": { @@ -574,11 +575,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709386671, - "narHash": "sha256-VPqfBnIJ+cfa78pd4Y5Cr6sOWVW8GYHRVucxJGmRf8Q=", + "lastModified": 1712026416, + "narHash": "sha256-N/3VR/9e1NlN49p7kCiATiEY6Tzdo+CbrAG8kqCQKcI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa9a51752f1b5de583ad5213eb621be071806663", + "rev": "080a4a27f206d07724b88da096e27ef63401a504", "type": "github" }, "original": { @@ -626,11 +627,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710272261, - "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "lastModified": 1712439257, + "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", "type": "github" }, "original": { @@ -712,7 +713,7 @@ }, "root": { "inputs": { - "hcUtils": "hcUtils", + "hc-infra": "hc-infra", "holochain": "holochain_3", "nixpkgs": [ "holochain", @@ -725,17 +726,17 @@ "inputs": { "flake-utils": "flake-utils", "nixpkgs": [ - "hcUtils", + "hc-infra", "holochain", "nixpkgs" ] }, "locked": { - "lastModified": 1710468700, - "narHash": "sha256-YGN6R0nLfB2L57J8T/DX+LcB06QipyYzHSz7AD8B0n0=", + "lastModified": 1712628742, + "narHash": "sha256-FIAlt8mbPUs8jRuh6xpFtYzDsyHzmiLNPcen8HwvD00=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7ff8e9a04ac7777a3446788cb4018b452157ab8a", + "rev": "e7354bb9e5f68b2074e272fd5f5ac3f4848860ba", "type": "github" }, "original": { @@ -748,16 +749,16 @@ "inputs": { "flake-utils": "flake-utils_2", "nixpkgs": [ - "hcUtils", + "hc-infra", "nixpkgs" ] }, "locked": { - "lastModified": 1710468700, - "narHash": "sha256-YGN6R0nLfB2L57J8T/DX+LcB06QipyYzHSz7AD8B0n0=", + "lastModified": 1712628742, + "narHash": "sha256-FIAlt8mbPUs8jRuh6xpFtYzDsyHzmiLNPcen8HwvD00=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7ff8e9a04ac7777a3446788cb4018b452157ab8a", + "rev": "e7354bb9e5f68b2074e272fd5f5ac3f4848860ba", "type": "github" }, "original": { @@ -791,11 +792,11 @@ "scaffolding": { "flake": false, "locked": { - "lastModified": 1708377063, - "narHash": "sha256-5+iEjwMO/sTe1h9JVrfn77GjliIRVJQFS2yvI3KTsL8=", + "lastModified": 1712589090, + "narHash": "sha256-neMBujjSEsOI0/MT1JpYnjtMq4tKHloCbYd8w6ARAKQ=", "owner": "holochain", "repo": "scaffolding", - "rev": "c41f01d2ff19fe58b6632860d85f88a96e16fd65", + "rev": "55b17239fb7aa80d6afce24479bb2b7ef18c5b6b", "type": "github" }, "original": { @@ -876,11 +877,11 @@ }, "locked": { "dir": "versions/weekly", - "lastModified": 1710485275, - "narHash": "sha256-DyQL69KEN+H3gx8q1/PjudnLd5traesFT2SBJYc74iM=", + "lastModified": 1712658297, + "narHash": "sha256-+uDfTOPKtNUy2i6TjD7eMwRxU8RXo+FOgiY+C0SGwls=", "owner": "holochain", "repo": "holochain", - "rev": "b2a1abb37561bf94653dffcc50d516c996c56ec4", + "rev": "e49d2eb781aba3f521c54b45e3585f42575ef367", "type": "github" }, "original": { @@ -899,11 +900,11 @@ }, "locked": { "dir": "versions/weekly", - "lastModified": 1712732100, - "narHash": "sha256-L2w9ycruj2DMtU6ehrBcPwXXAUzLRakj2MX0srMgNzs=", + "lastModified": 1712753500, + "narHash": "sha256-a6SFMXpUV2Ccyy+ITYOKDaJWIinvcUxlt0JOXV2K/Qo=", "owner": "holochain", "repo": "holochain", - "rev": "d73e31d3518a62c1d399c83130b3014c5ca3f17b", + "rev": "79e851a8b18871cb57c02b73d3c6262972ab34fb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9a5fe44e..6b16b1a8 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ url = "github:holochain/holochain"; inputs.versions.follows = "versions"; }; - hcUtils.url = "github:holochain-open-dev/common"; + hc-infra.url = "github:holochain-open-dev/infrastructure/0.300.0-dev"; }; outputs = inputs @ { ... }: diff --git a/package-lock.json b/package-lock.json index 605ad13c..66e16d7a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16426,7 +16426,7 @@ "dependencies": { "@holochain-open-dev/elements": "^0.300.0-dev.0", "@holochain-open-dev/utils": "^0.300.0-dev.0", - "@holochain/client": "^0.17.0-dev.7", + "@holochain/client": "^0.17.0-dev.8", "@lit-labs/task": "^2.0.0", "@lit/context": "^1.0.0", "@lit/localize": "^0.12.0", diff --git a/ui/demo/index.html b/ui/demo/index.html index 6b60d3bc..139e084f 100644 --- a/ui/demo/index.html +++ b/ui/demo/index.html @@ -40,7 +40,7 @@ }; async firstUpdated() { - const hcclient = await AppAgentWebsocket.connect("", ""); + const hcclient = await AppAgentWebsocket.connect(""); const client = new FileStorageClient( hcclient, diff --git a/ui/package.json b/ui/package.json index faffc42b..a425ae14 100644 --- a/ui/package.json +++ b/ui/package.json @@ -22,7 +22,7 @@ "dependencies": { "@holochain-open-dev/elements": "^0.300.0-dev.0", "@holochain-open-dev/utils": "^0.300.0-dev.0", - "@holochain/client": "^0.17.0-dev.7", + "@holochain/client": "^0.17.0-dev.8", "@lit-labs/task": "^2.0.0", "@lit/context": "^1.0.0", "@lit/localize": "^0.12.0",