From 5d86862c206606848e7fa2e69ea4d09d05464a4d Mon Sep 17 00:00:00 2001 From: zo-el Date: Thu, 1 Aug 2024 15:37:33 -0500 Subject: [PATCH 1/6] network-dump endpint --- src/index.js | 16 +++++++++++ src/utils.js | 75 ++++++++++------------------------------------------ 2 files changed, 30 insertions(+), 61 deletions(-) diff --git a/src/index.js b/src/index.js index 6062abd..704e5ed 100644 --- a/src/index.js +++ b/src/index.js @@ -11,6 +11,7 @@ import { installApp, enableApp, appInfo, + dumpNetworkMetrics, zomeCall } from './utils' import path from 'path' @@ -184,6 +185,21 @@ export async function getArgs () { logResult(result) }) + program + .command('dumpNetworkMetrics') + .alias('n') + .description( + 'dump network state for app: calls dumpNetworkMetrics(DNAHashBase64) -> [networkDump: any]' + ) + .action(async () => { + const result = await call_admin_port( + dumpNetworkMetrics, + program.opts().adminPort, + ) + console.log('Network State Dump for DNA:') + logResult(result) + }) + program .command('installApp ') .alias('b') diff --git a/src/utils.js b/src/utils.js index 63ef47e..1221ed9 100644 --- a/src/utils.js +++ b/src/utils.js @@ -204,67 +204,6 @@ export const listEnabledApps = async (adminWebsocket) => { return result } -/** - * Dumps state of holochain for given cell id in a pretty format - * @param {CellID | int} cellIdArg - * @returns string - */ -export const dumpState = async (adminWebsocket, cellIdArg) => { - console.log('cell Id Arg : ', cellIdArg) - if (!cellIdArg) throw new Error('No cell_id passed.') - let cellId - - const index = parseInt(cellIdArg) - if (`${index}` === cellIdArg) { - // arg is a index so get cell ID list from conductor - const result = await adminWebsocket.listCellIds() - if (Array.isArray(result)) { - if (index >= result.length) { - return `CellId index (zero based) provided was ${index}, but there are only ${result.length} cell(s)` - } - cellId = result[index] - } else { - return `Expected array from listCellIds() got: ${result}` - } - } else { - // Convert cellIdArg into array format to satisfy dumpState arg type - cellId = cellIdArg.split(',') - if (Array.isArray(cellId)) { - cellId[0] = Buffer.from(cellId[0], 'base64') - cellId[1] = Buffer.from(cellId[1], 'base64') - } else { - throw new Error( - 'Error parsing cell_id: cell_id should be an array [DnaHashBase64, AgentPubKeyBase64]' - ) - } - } - - console.log('CellId in Buffer format : ', cellId) - if (cellId.length !== 2) { - throw new Error( - 'cell_id is in improper format. Make sure both the dna and agent hash are passed as a single, non-spaced array.' - ) - } else if (cellId[0].length !== 39 || cellId[1].length !== 39) { - throw new Error( - 'cell_id contains a hash of improper length. Make sure both the dna and agent hash are passed as a single, non-spaced array.' - ) - } - let stateDump - try { - stateDump = await adminWebsocket.dumpState({ - cell_id: cellId - }) - } catch (error) { - throw new Error(`${JSON.stringify(error)}`) - } - // Replace all the buffers with byte64 representations - const result = stringifyBuffRec(stateDump) - return ( - JSON.stringify(result, null, 4) + - `\n\nTotal Elements in Dump: ${stateDump.length}` - ) -} - /** * Call installApp for app bundle * @param {obj} installAppArgs @@ -371,3 +310,17 @@ export const zomeCall = async (appWebsocket, args) => { } return result } + +/** + * Dumps network state of holochain + * @returns string + */ +export const dumpNetworkMetrics = async (adminWebsocket) => { + let result + try { + result = await adminWebsocket.listDnas() + } catch (error) { + return error + } + return result +} \ No newline at end of file From 069abd48e6b10f341a0a5235e76245445aaf3ddd Mon Sep 17 00:00:00 2001 From: zo-el Date: Thu, 1 Aug 2024 15:58:24 -0500 Subject: [PATCH 2/6] network-stats endpint --- src/index.js | 22 +++++++++++++++++++--- src/utils.js | 18 ++++++++++++++++-- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/src/index.js b/src/index.js index 704e5ed..d5e9028 100644 --- a/src/index.js +++ b/src/index.js @@ -187,19 +187,35 @@ export async function getArgs () { program .command('dumpNetworkMetrics') - .alias('n') + .alias('nd') .description( - 'dump network state for app: calls dumpNetworkMetrics(DNAHashBase64) -> [networkDump: any]' + 'dump network state for app: calls dumpNetworkMetrics() -> [NetworkMetricsDumped: any]' ) .action(async () => { const result = await call_admin_port( dumpNetworkMetrics, program.opts().adminPort, ) - console.log('Network State Dump for DNA:') + console.log('Network metricz Dump for DNA:') logResult(result) }) + program + .command('dumpNetworkStats') + .alias('ns') + .description( + 'dump network state for app: calls dumpNetworkStats() -> [DumpNetworkStats: any]' + ) + .action(async () => { + const result = await call_admin_port( + dumpNetworkStats, + program.opts().adminPort, + ) + console.log('Network State Dump for DNA:') + logResult(result) + }) + + program .command('installApp ') .alias('b') diff --git a/src/utils.js b/src/utils.js index 1221ed9..be83993 100644 --- a/src/utils.js +++ b/src/utils.js @@ -312,13 +312,27 @@ export const zomeCall = async (appWebsocket, args) => { } /** - * Dumps network state of holochain + * Dumps network metrics of holochain * @returns string */ export const dumpNetworkMetrics = async (adminWebsocket) => { let result try { - result = await adminWebsocket.listDnas() + result = await adminWebsocket.dumpNetworkMetrics() + } catch (error) { + return error + } + return result +} + +/** + * Dumps network state of holochain + * @returns string + */ +export const dumpNetworkStats = async (adminWebsocket) => { + let result + try { + result = await adminWebsocket.dumpNetworkStats() } catch (error) { return error } From 268d2b1d88bdd0b354a21b5b2f3364d2a8a944e1 Mon Sep 17 00:00:00 2001 From: zo-el Date: Thu, 1 Aug 2024 16:09:18 -0500 Subject: [PATCH 3/6] network-stats endpint --- src/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.js b/src/index.js index d5e9028..d0d7ee2 100644 --- a/src/index.js +++ b/src/index.js @@ -12,6 +12,7 @@ import { enableApp, appInfo, dumpNetworkMetrics, + dumpNetworkStats, zomeCall } from './utils' import path from 'path' From 9a3e3012a76949c3446e8716ff1d09c494a621ed Mon Sep 17 00:00:00 2001 From: zo-el Date: Thu, 1 Aug 2024 16:29:12 -0500 Subject: [PATCH 4/6] remove metric endpoint --- src/index.js | 16 ---------------- src/utils.js | 14 -------------- 2 files changed, 30 deletions(-) diff --git a/src/index.js b/src/index.js index d0d7ee2..612fbcf 100644 --- a/src/index.js +++ b/src/index.js @@ -11,7 +11,6 @@ import { installApp, enableApp, appInfo, - dumpNetworkMetrics, dumpNetworkStats, zomeCall } from './utils' @@ -186,21 +185,6 @@ export async function getArgs () { logResult(result) }) - program - .command('dumpNetworkMetrics') - .alias('nd') - .description( - 'dump network state for app: calls dumpNetworkMetrics() -> [NetworkMetricsDumped: any]' - ) - .action(async () => { - const result = await call_admin_port( - dumpNetworkMetrics, - program.opts().adminPort, - ) - console.log('Network metricz Dump for DNA:') - logResult(result) - }) - program .command('dumpNetworkStats') .alias('ns') diff --git a/src/utils.js b/src/utils.js index be83993..b2ab147 100644 --- a/src/utils.js +++ b/src/utils.js @@ -311,20 +311,6 @@ export const zomeCall = async (appWebsocket, args) => { return result } -/** - * Dumps network metrics of holochain - * @returns string - */ -export const dumpNetworkMetrics = async (adminWebsocket) => { - let result - try { - result = await adminWebsocket.dumpNetworkMetrics() - } catch (error) { - return error - } - return result -} - /** * Dumps network state of holochain * @returns string From 380e70a2b6803d95713ed534baad976ea2b106ff Mon Sep 17 00:00:00 2001 From: zo-el Date: Thu, 1 Aug 2024 16:43:03 -0500 Subject: [PATCH 5/6] flake: update --- flake.lock | 118 +++++++++++++++++++++++++---------------------------- flake.nix | 6 +-- 2 files changed, 59 insertions(+), 65 deletions(-) diff --git a/flake.lock b/flake.lock index b58db61..5ac16d3 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "cargo-chef": { "flake": false, "locked": { - "lastModified": 1695999026, - "narHash": "sha256-UtLoZd7YBRSF9uXStfC3geEFqSqZXFh1rLHaP8hre0Y=", + "lastModified": 1716357509, + "narHash": "sha256-7iSxwTaJnDLqaFu4ydxkx7ivhDvSQQcXWKawv/e4NHE=", "owner": "LukeMathWalker", "repo": "cargo-chef", - "rev": "6e96ae5cd023b718ae40d608981e50a6e7d7facf", + "rev": "b468537839bfc7c23d744b85d7a5090954626550", "type": "github" }, "original": { @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1707363936, - "narHash": "sha256-QbqyvGFYt84QNOQLOOTWplZZkzkyDhYrAl/N/9H0vFM=", + "lastModified": 1721322122, + "narHash": "sha256-a0G1NvyXGzdwgu6e1HQpmK5R5yLsfxeBe07nNDyYd+g=", "owner": "ipetkov", "repo": "crane", - "rev": "9107434eda6991e9388ad87b815dafa337446d16", + "rev": "8a68b987c476a33e90f203f0927614a75c3f47ea", "type": "github" }, "original": { @@ -58,11 +58,11 @@ "crate2nix": { "flake": false, "locked": { - "lastModified": 1706909251, - "narHash": "sha256-T7G9Uhh77P0kKri/u+Mwa/4YnXwdPsJSwYCiJCCW+fs=", + "lastModified": 1719760654, + "narHash": "sha256-L3VIJ9182wsYJqP27xO5qiWwfK+a00x0JHiy8ns3NQE=", "owner": "kolloch", "repo": "crate2nix", - "rev": "15656bb6cb15f55ee3344bf4362e6489feb93db6", + "rev": "a6ca1e58132bab26fc08572f22a34bbb86f4d91d", "type": "github" }, "original": { @@ -108,11 +108,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -123,16 +123,16 @@ "holochain": { "flake": false, "locked": { - "lastModified": 1715129891, - "narHash": "sha256-M+AoE56LNvtoP7EP+XBI9GaMEKoJ9aeslGHw3WKPB0I=", + "lastModified": 1721783155, + "narHash": "sha256-daI+jKnInq6Cl6mfum5P2SErfvhxzUSndOIgfZU7aic=", "owner": "holochain", "repo": "holochain", - "rev": "6e9dbbedc4879cf344c5fc9a324e5ce025048405", + "rev": "ede241e88fd13bf750f38e3a1fcef146094343dc", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3.1-rc.2", + "ref": "holochain-0.4.0-dev.15", "repo": "holochain", "type": "github" } @@ -172,11 +172,11 @@ ] }, "locked": { - "lastModified": 1719428453, - "narHash": "sha256-5D7P1kN0hSiWKdGzk6b2Zoi3bh+o2tHm9c7CVVbnIMk=", + "lastModified": 1722509204, + "narHash": "sha256-mVPZ52L3/8ydW0GbKHFu16Una5vZq3FKsofmP4xAZD4=", "owner": "holochain", "repo": "holochain", - "rev": "75af8c2b73d36bbb14b16a8834e19e7d884fbf04", + "rev": "c59a4dff985c2308edac58a40ae0b56c46eed27d", "type": "github" }, "original": { @@ -188,16 +188,16 @@ "lair": { "flake": false, "locked": { - "lastModified": 1709335027, - "narHash": "sha256-rKMhh7TLuR1lqze2YFWZCGYKZQoB4dZxjpX3sb7r7Jk=", + "lastModified": 1717684904, + "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=", "owner": "holochain", "repo": "lair", - "rev": "826be915efc839d1d1b8a2156b158999b8de8d5b", + "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066", "type": "github" }, "original": { "owner": "holochain", - "ref": "lair_keystore-v0.4.4", + "ref": "lair_keystore-v0.4.5", "repo": "lair", "type": "github" } @@ -205,27 +205,27 @@ "launcher": { "flake": false, "locked": { - "lastModified": 1717431387, - "narHash": "sha256-+VvWwBmxcgePV1L6kU2mSkg3emMiMgpdQnCqvQJkRPk=", + "lastModified": 1720810416, + "narHash": "sha256-PgykEezr0yrUAPQcmVJdR8M4PiKDzLCL/RS67RFeu/A=", "owner": "holochain", - "repo": "launcher", - "rev": "9d9cab5e6b57e1c278113921ff203e515c8bbd2e", + "repo": "hc-launch", + "rev": "b788d346491f4749949ae1710d51508920b6ea07", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3", - "repo": "launcher", + "ref": "holochain-weekly", + "repo": "hc-launch", "type": "github" } }, "nix-filter": { "locked": { - "lastModified": 1705332318, - "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", "owner": "numtide", "repo": "nix-filter", - "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", "type": "github" }, "original": { @@ -236,11 +236,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716293225, - "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", + "lastModified": 1722062969, + "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", + "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", "type": "github" }, "original": { @@ -251,30 +251,24 @@ }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", - "type": "github" + "lastModified": 1719876945, + "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" } }, "pre-commit-hooks-nix": { "flake": false, "locked": { - "lastModified": 1707297608, - "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=", + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "0db2e67ee49910adfa13010e7f012149660af7f0", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", "type": "github" }, "original": { @@ -317,11 +311,11 @@ ] }, "locked": { - "lastModified": 1719109180, - "narHash": "sha256-96dwGCV2yQxDozDATqbsM3YU0ft3Isw3cwVDO/eNCv8=", + "lastModified": 1722133294, + "narHash": "sha256-XKSVN+lmjVEFPjMa5Ui0VTay2Uvqa74h0MQT0HU1pqw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5fc5f3a0d7eabf7db86851e6423f9d7fbceaf89d", + "rev": "9803f6e04ca37a2c072783e8297d2080f8d0e739", "type": "github" }, "original": { @@ -333,16 +327,16 @@ "scaffolding": { "flake": false, "locked": { - "lastModified": 1717661456, - "narHash": "sha256-e+9YRRFJg89rfHDWtumEa33rpa2vmij/zw7Uwl6BP/g=", + "lastModified": 1721827330, + "narHash": "sha256-N150LFw9yrxUYd/0QvFirUR1LyZg67TmgCktb+D1Tys=", "owner": "holochain", "repo": "scaffolding", - "rev": "1ffc9eb350b82784a8fb609073f1c7eccf2e0fc0", + "rev": "53724e445db0f3bba3d0acff26e60688294c00a2", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3", + "ref": "holochain-weekly", "repo": "scaffolding", "type": "github" } @@ -355,16 +349,16 @@ "scaffolding": "scaffolding" }, "locked": { - "dir": "versions/0_3_rc", - "lastModified": 1719428453, - "narHash": "sha256-5D7P1kN0hSiWKdGzk6b2Zoi3bh+o2tHm9c7CVVbnIMk=", + "dir": "versions/weekly", + "lastModified": 1722509204, + "narHash": "sha256-mVPZ52L3/8ydW0GbKHFu16Una5vZq3FKsofmP4xAZD4=", "owner": "holochain", "repo": "holochain", - "rev": "75af8c2b73d36bbb14b16a8834e19e7d884fbf04", + "rev": "c59a4dff985c2308edac58a40ae0b56c46eed27d", "type": "github" }, "original": { - "dir": "versions/0_3_rc", + "dir": "versions/weekly", "owner": "holochain", "repo": "holochain", "type": "github" diff --git a/flake.nix b/flake.nix index be81f6b..9dbc7da 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,8 @@ description = "Template for Holochain app development"; inputs = { - versions.url = "github:holochain/holochain?dir=versions/0_3_rc"; - versions.inputs.holochain.url = "github:holochain/holochain/holochain-0.4.0-dev.2"; + versions.url = "github:holochain/holochain/?dir=versions/weekly"; + versions.inputs.holochain.url = "github:holochain/holochain/holochain-0.4.0-dev.14"; holochain-flake.url = "github:holochain/holochain"; holochain-flake.inputs.versions.follows = "versions"; @@ -26,7 +26,7 @@ }: { devShells.default = pkgs.mkShell { - inputsFrom = [ inputs'.holochain-flake.devShells.holonix ]; + inputsFrom = [ inputs'.holochain-flake.devShells.holochainBinaries ]; packages = [ pkgs.nodejs-18_x pkgs.binaryen From 6de86b3daff9502aff55d624b1d2d01d50623341 Mon Sep 17 00:00:00 2001 From: zo-el Date: Thu, 1 Aug 2024 16:57:51 -0500 Subject: [PATCH 6/6] update flake --- flake.lock | 102 ++++++++++++++++++++++++++++------------------------- flake.nix | 4 +-- 2 files changed, 56 insertions(+), 50 deletions(-) diff --git a/flake.lock b/flake.lock index 5ac16d3..d6e39f9 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "cargo-chef": { "flake": false, "locked": { - "lastModified": 1716357509, - "narHash": "sha256-7iSxwTaJnDLqaFu4ydxkx7ivhDvSQQcXWKawv/e4NHE=", + "lastModified": 1695999026, + "narHash": "sha256-UtLoZd7YBRSF9uXStfC3geEFqSqZXFh1rLHaP8hre0Y=", "owner": "LukeMathWalker", "repo": "cargo-chef", - "rev": "b468537839bfc7c23d744b85d7a5090954626550", + "rev": "6e96ae5cd023b718ae40d608981e50a6e7d7facf", "type": "github" }, "original": { @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1721322122, - "narHash": "sha256-a0G1NvyXGzdwgu6e1HQpmK5R5yLsfxeBe07nNDyYd+g=", + "lastModified": 1707363936, + "narHash": "sha256-QbqyvGFYt84QNOQLOOTWplZZkzkyDhYrAl/N/9H0vFM=", "owner": "ipetkov", "repo": "crane", - "rev": "8a68b987c476a33e90f203f0927614a75c3f47ea", + "rev": "9107434eda6991e9388ad87b815dafa337446d16", "type": "github" }, "original": { @@ -58,11 +58,11 @@ "crate2nix": { "flake": false, "locked": { - "lastModified": 1719760654, - "narHash": "sha256-L3VIJ9182wsYJqP27xO5qiWwfK+a00x0JHiy8ns3NQE=", + "lastModified": 1706909251, + "narHash": "sha256-T7G9Uhh77P0kKri/u+Mwa/4YnXwdPsJSwYCiJCCW+fs=", "owner": "kolloch", "repo": "crate2nix", - "rev": "a6ca1e58132bab26fc08572f22a34bbb86f4d91d", + "rev": "15656bb6cb15f55ee3344bf4362e6489feb93db6", "type": "github" }, "original": { @@ -108,11 +108,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "type": "github" }, "original": { @@ -123,16 +123,16 @@ "holochain": { "flake": false, "locked": { - "lastModified": 1721783155, - "narHash": "sha256-daI+jKnInq6Cl6mfum5P2SErfvhxzUSndOIgfZU7aic=", + "lastModified": 1719968525, + "narHash": "sha256-smpK/6bTj6rz4L5JE4LNEPXKS2FHX9TuMj2hg473ggI=", "owner": "holochain", "repo": "holochain", - "rev": "ede241e88fd13bf750f38e3a1fcef146094343dc", + "rev": "31c75c07234a573b18f07cb05c2961809bf1c0a1", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.4.0-dev.15", + "ref": "holochain-0.4.0-dev.11", "repo": "holochain", "type": "github" } @@ -172,11 +172,11 @@ ] }, "locked": { - "lastModified": 1722509204, - "narHash": "sha256-mVPZ52L3/8ydW0GbKHFu16Una5vZq3FKsofmP4xAZD4=", + "lastModified": 1721160188, + "narHash": "sha256-Qqofmd/S4hN4ONLzUB01OTjJB/P+3PzrXvmV4Y4v2Ww=", "owner": "holochain", "repo": "holochain", - "rev": "c59a4dff985c2308edac58a40ae0b56c46eed27d", + "rev": "2c02d515391e664918e8b2395a1dde9a1b1519fe", "type": "github" }, "original": { @@ -205,27 +205,27 @@ "launcher": { "flake": false, "locked": { - "lastModified": 1720810416, - "narHash": "sha256-PgykEezr0yrUAPQcmVJdR8M4PiKDzLCL/RS67RFeu/A=", + "lastModified": 1715106263, + "narHash": "sha256-a7iQ8pKGz6fghJrtXq0Xamp57GE8Hd3w5YQASzz5Wlk=", "owner": "holochain", - "repo": "hc-launch", - "rev": "b788d346491f4749949ae1710d51508920b6ea07", + "repo": "launcher", + "rev": "92bd39e1c66912d61c35c4725d7b106959888670", "type": "github" }, "original": { "owner": "holochain", "ref": "holochain-weekly", - "repo": "hc-launch", + "repo": "launcher", "type": "github" } }, "nix-filter": { "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", + "lastModified": 1705332318, + "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", "owner": "numtide", "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", + "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", "type": "github" }, "original": { @@ -236,11 +236,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722062969, - "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", + "lastModified": 1716293225, + "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", + "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", "type": "github" }, "original": { @@ -251,24 +251,30 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1719876945, - "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "dir": "lib", + "lastModified": 1706550542, + "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "pre-commit-hooks-nix": { "flake": false, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1707297608, + "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "0db2e67ee49910adfa13010e7f012149660af7f0", "type": "github" }, "original": { @@ -311,11 +317,11 @@ ] }, "locked": { - "lastModified": 1722133294, - "narHash": "sha256-XKSVN+lmjVEFPjMa5Ui0VTay2Uvqa74h0MQT0HU1pqw=", + "lastModified": 1720923816, + "narHash": "sha256-GrDL1nFYZrB/+Ah1hNoaNFfduB1agpfqL9QyEl12UOU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9803f6e04ca37a2c072783e8297d2080f8d0e739", + "rev": "fb8c8be0313f0e6385b3d70151a04ea1d71e4b68", "type": "github" }, "original": { @@ -327,11 +333,11 @@ "scaffolding": { "flake": false, "locked": { - "lastModified": 1721827330, - "narHash": "sha256-N150LFw9yrxUYd/0QvFirUR1LyZg67TmgCktb+D1Tys=", + "lastModified": 1720709716, + "narHash": "sha256-JrUNDbAiSPl11L8JxtgNfKXV13bWgCD+Xd0hNy8nK9A=", "owner": "holochain", "repo": "scaffolding", - "rev": "53724e445db0f3bba3d0acff26e60688294c00a2", + "rev": "3241aaaf52589ced9e29bf616407b867f6927c44", "type": "github" }, "original": { @@ -350,11 +356,11 @@ }, "locked": { "dir": "versions/weekly", - "lastModified": 1722509204, - "narHash": "sha256-mVPZ52L3/8ydW0GbKHFu16Una5vZq3FKsofmP4xAZD4=", + "lastModified": 1721160188, + "narHash": "sha256-Qqofmd/S4hN4ONLzUB01OTjJB/P+3PzrXvmV4Y4v2Ww=", "owner": "holochain", "repo": "holochain", - "rev": "c59a4dff985c2308edac58a40ae0b56c46eed27d", + "rev": "2c02d515391e664918e8b2395a1dde9a1b1519fe", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9dbc7da..6180bf6 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,8 @@ description = "Template for Holochain app development"; inputs = { - versions.url = "github:holochain/holochain/?dir=versions/weekly"; - versions.inputs.holochain.url = "github:holochain/holochain/holochain-0.4.0-dev.14"; + versions.url = "github:holochain/holochain?dir=versions/weekly"; + versions.inputs.holochain.url = "github:holochain/holochain/holochain-0.4.0-dev.11"; holochain-flake.url = "github:holochain/holochain"; holochain-flake.inputs.versions.follows = "versions";