diff --git a/.envrc b/.envrc new file mode 100644 index 00000000..a5dbbcba --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake . diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d5130a01..8fb7ea8f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,9 +6,9 @@ name: CI # events but only for the main branch on: push: - branches: [ main ] + branches: [ main, develop ] pull_request: - branches: [ main ] + branches: [ main, develop ] # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: @@ -23,27 +23,32 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - uses: cachix/install-nix-action@v12 + - name: Install nix + uses: cachix/install-nix-action@v18 with: - nix_path: nixpkgs=channel:nixos-unstable + install_url: https://releases.nixos.org/nix/nix-2.12.0/install + extra_nix_config: | + experimental-features = flakes nix-command - - name: cachix - run: | - nix-env -iA cachix -f https://cachix.org/api/v1/install - cachix use holochain-ci + - uses: cachix/cachix-action@v10 + with: + name: holochain-ci - - name: build-holochain - run: | - cd $GITHUB_WORKSPACE - nix-shell . --run "npm install" - nix-shell . --run "npm run build:happ" - - - name: test-holochain + - uses: cachix/cachix-action@v10 + with: + name: holochain-open-dev + + - name: Install and test run: | - cd $GITHUB_WORKSPACE - nix-shell . --run "npm test" - - - name: build-ui + nix develop --command bash -c "npm i && npm t" + + - name: Build UI run: | - cd $GITHUB_WORKSPACE - nix-shell . --run "cd ui && npm run lint && npm run build" + nix develop --command bash -c "npm run build -w ui" + + update-nix-cache: + strategy: + matrix: + os: [ ubuntu-latest, ] + needs: build-and-test + if: github.ref == 'refs/heads/master' diff --git a/.gitignore b/.gitignore index e4ef141e..3a15f9cd 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ dist/ *.happ *.webhapp storybook-static/ +.direnv +result* diff --git a/Cargo.lock b/Cargo.lock index 82216004..810b8c59 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -841,10 +841,11 @@ dependencies = [ [[package]] name = "hdi" -version = "0.4.0-beta-dev.20" +version = "0.4.0-beta-dev.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61dbdfa4444e7ef8c9b5ec0a24738557e02c6abd6de388cc0bcc43bbd93cdf68" +checksum = "a8f4429629b6ad49e1dcf225e4e39eff8bf461843f96a996878cb1ad5fe546b6" dependencies = [ + "getrandom", "hdk_derive", "holo_hash", "holochain_integrity_types", @@ -858,9 +859,9 @@ dependencies = [ [[package]] name = "hdk" -version = "0.3.0-beta-dev.24" +version = "0.3.0-beta-dev.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04a12eeaf4a1893c9aba3d20d2803c2be077c6bcbe6b90ba9dbb8ecc2cfd4c44" +checksum = "7b9388c15ea758b687d4c5348354636306a8ca6867bc40b3fc8525901fb96735" dependencies = [ "getrandom", "hdi", @@ -878,9 +879,9 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.3.0-beta-dev.19" +version = "0.3.0-beta-dev.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5af207d22c32e89054964b1eeb87219e6bab840f1f2d86bc0781fcb31b8de5" +checksum = "36e4d54bf7b14580cac156b1cb22480b59972df2ebaed56f1375f39cdf8ded6a" dependencies = [ "darling 0.14.4", "heck", @@ -912,9 +913,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.3.0-beta-dev.16" +version = "0.3.0-beta-dev.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5278f4ede2500478f4cae18bc3565cdb638ad0f17496b9cfad9170add12b0cc9" +checksum = "c8775ba0e9b8ebbbe089794c399cb6acd659f8213261fdee0febc2f4fff229d4" dependencies = [ "base64", "blake2b_simd", @@ -930,9 +931,9 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.3.0-beta-dev.19" +version = "0.3.0-beta-dev.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac4ec7618287f788c52ffa485b1731182a0d99c44c0ebb33e8457792a41deef9" +checksum = "7508886f8c4f7e3d03634e62094200bd1361210a2c73491a8b3211588b71bd64" dependencies = [ "holo_hash", "holochain_secure_primitive", @@ -948,9 +949,9 @@ dependencies = [ [[package]] name = "holochain_nonce" -version = "0.3.0-beta-dev.22" +version = "0.3.0-beta-dev.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aca92634944f023be0808df98bfc8f484b6f23f0f1452197043f287e06511e6c" +checksum = "54cb17e2abda28da552adea75f02b06c3b14a0e52376bc1823d3ceee9e2345a9" dependencies = [ "getrandom", "holochain_secure_primitive", @@ -995,9 +996,9 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.3.0-beta-dev.3" +version = "0.3.0-beta-dev.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35a22ca5f762735382c729c6e3250be96045f93b1e5d3e79f45a91691a3298e5" +checksum = "6be1f887f88ecb44975694b2d46c3a1ad4840e009d56f7be54c3af3f2d60b931" dependencies = [ "cfg-if 0.1.10", "derive_more", @@ -1010,9 +1011,9 @@ dependencies = [ [[package]] name = "holochain_wasmer_common" -version = "0.0.91" +version = "0.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91334617b53995b436796417abf4cfca516c33404842e60025c26321329c8734" +checksum = "72007fd2a72d77e76ffa494e5847bf6e893e25e73fe1d1de902e1b8d5033a64e" dependencies = [ "holochain_serialized_bytes", "serde", @@ -1024,9 +1025,9 @@ dependencies = [ [[package]] name = "holochain_wasmer_guest" -version = "0.0.91" +version = "0.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a4e3dcf97f42847f0ea8a4ed33d6ccf718764ed00f5a73390e9b4e5319b719" +checksum = "8c429e84a19ee446f47541a6fed10e1a4376a8a8ba6d3dbff7d07e4a7bb4c85f" dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", @@ -1038,10 +1039,11 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.3.0-beta-dev.20" +version = "0.3.0-beta-dev.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d02d90ed0bd3aa2b9235280abdfbb5dd42a573f7662157a7685b0693910e4c8" +checksum = "80857b41991c430a5bf10ba54215712d990f70604610f3cc1582cce4611c7d10" dependencies = [ + "derive_more", "holo_hash", "holochain_integrity_types", "holochain_nonce", @@ -1172,9 +1174,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.3.0-beta-dev.11" +version = "0.3.0-beta-dev.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1ce4773d0eff80d28b4acd31fcceeb82760b01e574fde9ee2588dff3d96e5d4" +checksum = "fe2bc530cd368de90546ff0cc3d53c321834b91c5a1bd4d67518222339f1a95c" dependencies = [ "base64", "derive_more", @@ -1187,9 +1189,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.3.0-beta-dev.13" +version = "0.3.0-beta-dev.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4914b835ee58f544b8d0e973ea1ce0dc932a8214c4b430c9822c065a99c4f44" +checksum = "76c69802ed069a0cd074f100df770840adca5a33c218eff3b03ac1366bc56a59" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -1198,9 +1200,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.3.0-beta-dev.10" +version = "0.3.0-beta-dev.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29daa891819cc03925b1673beea62e6528d26b02b8fba6639d9f14d4f82d1865" +checksum = "0c95e91172d17d87a9409d0e30b478f06e5f406a167d1fadde9f4fbac858b8c3" dependencies = [ "derive_more", "gcollections", @@ -1212,9 +1214,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.3.0-beta-dev.5" +version = "0.3.0-beta-dev.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c0210b97fd82356b81b2e0384909a6ec20bd74bff7e9e58a6013e7c6d3fae37" +checksum = "b9bd32418f929b981aa54f217302ae03b1eb983f9bb688e2ff06bba40600fe4e" dependencies = [ "chrono", "serde", diff --git a/Cargo.toml b/Cargo.toml index df2e1e9c..101fa96d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,11 +6,12 @@ opt-level = "z" [workspace] members = ["dnas/*/zomes/integrity/*", "dnas/*/zomes/coordinator/*"] +resolver = "2" [workspace.dependencies] -hdi = "0.4.0-beta-dev.20" -hdk = "0.3.0-beta-dev.24" -holochain = "0.3.0-beta-dev.29" +hdi = "0.4.0-beta-dev.28" +hdk = "0.3.0-beta-dev.32" +holochain = "0.3.0-beta-dev.38" serde = "1.0.193" diff --git a/dnas/file_storage_provider/zomes/coordinator/file_storage/zome.nix b/dnas/file_storage_provider/zomes/coordinator/file_storage/zome.nix new file mode 100644 index 00000000..29edfdbe --- /dev/null +++ b/dnas/file_storage_provider/zomes/coordinator/file_storage/zome.nix @@ -0,0 +1,16 @@ +{ inputs, rootPath, ... }: + +{ + perSystem = + { inputs' + , ... + }: { + packages.file_storage_integrity = inputs.hcUtils.outputs.lib.rustZome { + workspacePath = rootPath; + holochain = inputs'.holochain; + crateCargoToml = ./Cargo.toml; + }; + }; +} + + diff --git a/dnas/file_storage_provider/zomes/integrity/file_storage/src/lib.rs b/dnas/file_storage_provider/zomes/integrity/file_storage/src/lib.rs index 44cd50dc..b3ffbd08 100644 --- a/dnas/file_storage_provider/zomes/integrity/file_storage/src/lib.rs +++ b/dnas/file_storage_provider/zomes/integrity/file_storage/src/lib.rs @@ -13,7 +13,7 @@ pub struct FileMetadata { } #[cfg(feature = "externs")] -#[hdk_entry_defs] +#[hdk_entry_types] #[unit_enum(UnitEntryTypes)] pub enum EntryTypes { FileMetadata(FileMetadata), diff --git a/dnas/file_storage_provider/zomes/integrity/file_storage/zome.nix b/dnas/file_storage_provider/zomes/integrity/file_storage/zome.nix new file mode 100644 index 00000000..ad6d4e60 --- /dev/null +++ b/dnas/file_storage_provider/zomes/integrity/file_storage/zome.nix @@ -0,0 +1,21 @@ +{ inputs, rootPath, ... }: + +{ + perSystem = + { inputs' + , config + , pkgs + , system + , lib + , options + , ... + }: { + packages.file_storage = inputs.hcUtils.outputs.lib.rustZome { + workspacePath = rootPath; + holochain = inputs'.holochain; + crateCargoToml = ./Cargo.toml; + }; + }; +} + + diff --git a/flake.lock b/flake.lock index 200a7d58..1f80595a 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "cargo-chef": { "flake": false, "locked": { - "lastModified": 1672901199, - "narHash": "sha256-MHTuR4aQ1rQaBKx1vWDy2wbvcT0ZAzpkVB2zylSC+k0=", + "lastModified": 1695999026, + "narHash": "sha256-UtLoZd7YBRSF9uXStfC3geEFqSqZXFh1rLHaP8hre0Y=", "owner": "LukeMathWalker", "repo": "cargo-chef", - "rev": "5c9f11578a2e0783cce27666737d50f84510b8b5", + "rev": "6e96ae5cd023b718ae40d608981e50a6e7d7facf", "type": "github" }, "original": { @@ -17,330 +17,1148 @@ "type": "github" } }, - "cargo-rdme": { + "cargo-chef_2": { "flake": false, "locked": { - "lastModified": 1675118998, - "narHash": "sha256-lrYWqu3h88fr8gG3Yo5GbFGYaq5/1Os7UtM+Af0Bg4k=", - "owner": "orium", - "repo": "cargo-rdme", - "rev": "f9dbb6bccc078f4869f45ae270a2890ac9a75877", + "lastModified": 1695999026, + "narHash": "sha256-UtLoZd7YBRSF9uXStfC3geEFqSqZXFh1rLHaP8hre0Y=", + "owner": "LukeMathWalker", + "repo": "cargo-chef", + "rev": "6e96ae5cd023b718ae40d608981e50a6e7d7facf", "type": "github" }, "original": { - "owner": "orium", - "ref": "v1.1.0", - "repo": "cargo-rdme", + "owner": "LukeMathWalker", + "ref": "main", + "repo": "cargo-chef", "type": "github" } }, - "crane": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": [ - "holochain", - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, + "cargo-chef_3": { + "flake": false, "locked": { - "lastModified": 1675475924, - "narHash": "sha256-KWdfV9a6+zG6Ij/7PZYLnomjBZZUu8gdRy+hfjGrrJQ=", - "owner": "ipetkov", - "repo": "crane", - "rev": "1bde9c762ebf26de9f8ecf502357c92105bc4577", + "lastModified": 1695999026, + "narHash": "sha256-UtLoZd7YBRSF9uXStfC3geEFqSqZXFh1rLHaP8hre0Y=", + "owner": "LukeMathWalker", + "repo": "cargo-chef", + "rev": "6e96ae5cd023b718ae40d608981e50a6e7d7facf", "type": "github" }, "original": { - "owner": "ipetkov", - "repo": "crane", + "owner": "LukeMathWalker", + "ref": "main", + "repo": "cargo-chef", "type": "github" } }, - "crate2nix": { + "cargo-rdme": { "flake": false, "locked": { - "lastModified": 1693149153, - "narHash": "sha256-HUszQcnIal1FFRAWraODDbxTp0HECwczRTD+Zf0v9o0=", - "owner": "kolloch", - "repo": "crate2nix", - "rev": "8749f46953b46d44fd181b002399e4a20371f323", + "lastModified": 1675118998, + "narHash": "sha256-lrYWqu3h88fr8gG3Yo5GbFGYaq5/1Os7UtM+Af0Bg4k=", + "owner": "orium", + "repo": "cargo-rdme", + "rev": "f9dbb6bccc078f4869f45ae270a2890ac9a75877", "type": "github" }, "original": { - "owner": "kolloch", - "repo": "crate2nix", + "owner": "orium", + "ref": "v1.1.0", + "repo": "cargo-rdme", "type": "github" } }, - "empty": { + "cargo-rdme_2": { "flake": false, "locked": { - "lastModified": 1683792623, - "narHash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=", - "owner": "steveej", - "repo": "empty", - "rev": "8e328e450e4cd32e072eba9e99fe92cf2a1ef5cf", + "lastModified": 1675118998, + "narHash": "sha256-lrYWqu3h88fr8gG3Yo5GbFGYaq5/1Os7UtM+Af0Bg4k=", + "owner": "orium", + "repo": "cargo-rdme", + "rev": "f9dbb6bccc078f4869f45ae270a2890ac9a75877", "type": "github" }, "original": { - "owner": "steveej", - "repo": "empty", + "owner": "orium", + "ref": "v1.1.0", + "repo": "cargo-rdme", "type": "github" } }, - "flake-compat": { + "cargo-rdme_3": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "lastModified": 1675118998, + "narHash": "sha256-lrYWqu3h88fr8gG3Yo5GbFGYaq5/1Os7UtM+Af0Bg4k=", + "owner": "orium", + "repo": "cargo-rdme", + "rev": "f9dbb6bccc078f4869f45ae270a2890ac9a75877", "type": "github" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", + "owner": "orium", + "ref": "v1.1.0", + "repo": "cargo-rdme", "type": "github" } }, - "flake-compat_2": { - "flake": false, + "crane": { + "inputs": { + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "lastModified": 1709610799, + "narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=", + "owner": "ipetkov", + "repo": "crane", + "rev": "81c393c776d5379c030607866afef6406ca1be57", "type": "github" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", + "owner": "ipetkov", + "repo": "crane", "type": "github" } }, - "flake-parts": { + "crane_2": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1675295133, - "narHash": "sha256-dU8fuLL98WFXG0VnRgM00bqKX6CEPBLybhiIDIgO45o=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "bf53492df08f3178ce85e0c9df8ed8d03c030c9f", + "lastModified": 1708560786, + "narHash": "sha256-gcTA/iq9mfrwGPQsoxVryWhCAgBwL2GJLGO/s06/0wY=", + "owner": "ipetkov", + "repo": "crane", + "rev": "9a5972e2e8d0b1716cc4e42af8b75eca6914fbff", "type": "github" }, "original": { - "id": "flake-parts", - "type": "indirect" + "owner": "ipetkov", + "repo": "crane", + "type": "github" } }, - "flake-utils": { + "crane_3": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "lastModified": 1708560786, + "narHash": "sha256-gcTA/iq9mfrwGPQsoxVryWhCAgBwL2GJLGO/s06/0wY=", + "owner": "ipetkov", + "repo": "crane", + "rev": "9a5972e2e8d0b1716cc4e42af8b75eca6914fbff", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "ipetkov", + "repo": "crane", "type": "github" } }, - "flake-utils_2": { + "crane_4": { "inputs": { - "systems": "systems" + "nixpkgs": [ + "hcUtils", + "hcUtils", + "holochain", + "nixpkgs" + ] }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "lastModified": 1707363936, + "narHash": "sha256-QbqyvGFYt84QNOQLOOTWplZZkzkyDhYrAl/N/9H0vFM=", + "owner": "ipetkov", + "repo": "crane", + "rev": "9107434eda6991e9388ad87b815dafa337446d16", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "ipetkov", + "repo": "crane", "type": "github" } }, - "holochain": { + "crane_5": { "inputs": { - "cargo-chef": "cargo-chef", - "cargo-rdme": "cargo-rdme", - "crane": "crane", - "crate2nix": "crate2nix", - "empty": "empty", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts", - "holochain": [ - "holochain", - "empty" - ], - "lair": [ - "holochain", - "empty" - ], - "launcher": "launcher", - "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs", - "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "repo-git": "repo-git", - "rust-overlay": "rust-overlay_2", - "scaffolding": [ + "nixpkgs": [ + "hcUtils", "holochain", - "empty" - ], - "versions": [ - "versions" + "nixpkgs" ] }, "locked": { - "lastModified": 1706208442, - "narHash": "sha256-GCJjMF8XGIhBS0wnSGNLzCV+rgFRVfKUghm4MYDFopE=", - "owner": "holochain", - "repo": "holochain", - "rev": "a2201b6c1c69ad8be27a67c3722b754fd4698d1f", + "lastModified": 1707363936, + "narHash": "sha256-QbqyvGFYt84QNOQLOOTWplZZkzkyDhYrAl/N/9H0vFM=", + "owner": "ipetkov", + "repo": "crane", + "rev": "9107434eda6991e9388ad87b815dafa337446d16", "type": "github" }, "original": { - "owner": "holochain", - "repo": "holochain", + "owner": "ipetkov", + "repo": "crane", "type": "github" } }, - "holochain_2": { - "flake": false, + "crane_6": { + "inputs": { + "nixpkgs": [ + "holochain", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1706058277, - "narHash": "sha256-5pD56SigVOdKcXawMNSd9SC3+Uwvp1N3T8dSMI4+M8o=", - "owner": "holochain", - "repo": "holochain", - "rev": "e261c2b343a56f3adbc1ffbfda4ba060a583dd81", + "lastModified": 1707363936, + "narHash": "sha256-QbqyvGFYt84QNOQLOOTWplZZkzkyDhYrAl/N/9H0vFM=", + "owner": "ipetkov", + "repo": "crane", + "rev": "9107434eda6991e9388ad87b815dafa337446d16", "type": "github" }, "original": { - "owner": "holochain", - "ref": "holochain-0.3.0-beta-dev.34", - "repo": "holochain", + "owner": "ipetkov", + "repo": "crane", "type": "github" } }, - "lair": { + "crate2nix": { "flake": false, "locked": { - "lastModified": 1702662684, - "narHash": "sha256-heq+r9cCgyBbRp3rJBf009ituoEz7xBysy0awbNrlyk=", - "owner": "holochain", - "repo": "lair", - "rev": "026c1e7832f7a152a0093bbc6a3b4542ae85b7ba", + "lastModified": 1706909251, + "narHash": "sha256-T7G9Uhh77P0kKri/u+Mwa/4YnXwdPsJSwYCiJCCW+fs=", + "owner": "kolloch", + "repo": "crate2nix", + "rev": "15656bb6cb15f55ee3344bf4362e6489feb93db6", "type": "github" }, "original": { - "owner": "holochain", - "ref": "lair_keystore-v0.4.0", - "repo": "lair", + "owner": "kolloch", + "repo": "crate2nix", "type": "github" } }, - "launcher": { + "crate2nix_2": { "flake": false, "locked": { - "lastModified": 1706291930, - "narHash": "sha256-92Qc6hBMFfHo3w1m1+EpNAAV+7whpkgRHiGqNiXaMCg=", - "owner": "holochain", - "repo": "launcher", - "rev": "194576a0fdb90746e775dbd361ca76b99254fa10", + "lastModified": 1706909251, + "narHash": "sha256-T7G9Uhh77P0kKri/u+Mwa/4YnXwdPsJSwYCiJCCW+fs=", + "owner": "kolloch", + "repo": "crate2nix", + "rev": "15656bb6cb15f55ee3344bf4362e6489feb93db6", "type": "github" }, "original": { - "owner": "holochain", - "ref": "bump-weekly-0.3-32", - "repo": "launcher", + "owner": "kolloch", + "repo": "crate2nix", "type": "github" } }, - "launcher_2": { + "crate2nix_3": { "flake": false, "locked": { - "lastModified": 1701093498, - "narHash": "sha256-M9uaBXzHGxPFqmJjZKWpWmGCZdn02o0OHxZA32UBrJo=", - "owner": "holochain", - "repo": "launcher", - "rev": "ba2c48eb881368746048f392184c6b3e18ea4feb", + "lastModified": 1706909251, + "narHash": "sha256-T7G9Uhh77P0kKri/u+Mwa/4YnXwdPsJSwYCiJCCW+fs=", + "owner": "kolloch", + "repo": "crate2nix", + "rev": "15656bb6cb15f55ee3344bf4362e6489feb93db6", "type": "github" }, "original": { - "owner": "holochain", - "ref": "holochain-weekly", - "repo": "launcher", + "owner": "kolloch", + "repo": "crate2nix", "type": "github" } }, - "nix-filter": { + "empty": { + "flake": false, "locked": { - "lastModified": 1675361037, - "narHash": "sha256-CTbDuDxFD3U3g/dWUB+r+B/snIe+qqP1R+1myuFGe2I=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "e1b2f96c2a31415f362268bc48c3fccf47dff6eb", + "lastModified": 1683792623, + "narHash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=", + "owner": "steveej", + "repo": "empty", + "rev": "8e328e450e4cd32e072eba9e99fe92cf2a1ef5cf", "type": "github" }, "original": { - "owner": "numtide", - "repo": "nix-filter", + "owner": "steveej", + "repo": "empty", "type": "github" } }, - "nixpkgs": { + "empty_2": { + "flake": false, "locked": { - "lastModified": 1705856552, - "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", + "lastModified": 1683792623, + "narHash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=", + "owner": "steveej", + "repo": "empty", + "rev": "8e328e450e4cd32e072eba9e99fe92cf2a1ef5cf", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" + "owner": "steveej", + "repo": "empty", + "type": "github" } }, - "nixpkgs-lib": { + "empty_3": { + "flake": false, "locked": { - "dir": "lib", - "lastModified": 1675183161, - "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", + "lastModified": 1683792623, + "narHash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=", + "owner": "steveej", + "repo": "empty", + "rev": "8e328e450e4cd32e072eba9e99fe92cf2a1ef5cf", "type": "github" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", + "owner": "steveej", + "repo": "empty", "type": "github" } }, - "pre-commit-hooks-nix": { + "flake-compat": { "flake": false, "locked": { - "lastModified": 1676513100, - "narHash": "sha256-MK39nQV86L2ag4TmcK5/+r1ULpzRLPbbfvWbPvIoYJE=", - "owner": "cachix", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_3" + }, + "locked": { + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "hcUtils": { + "inputs": { + "crane": "crane", + "hcUtils": "hcUtils_2", + "holochain": "holochain_3", + "nixpkgs": [ + "hcUtils", + "holochain", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_5", + "versions": "versions_2" + }, + "locked": { + "lastModified": 1709662947, + "narHash": "sha256-k7eOa16h7yeU1l+QINgTjbLWwyRbukrnttEtFPuttsA=", + "owner": "holochain-open-dev", + "repo": "common", + "rev": "ddcc0facbce05e24d7be91fafe299987635469c7", + "type": "github" + }, + "original": { + "owner": "holochain-open-dev", + "repo": "common", + "type": "github" + } + }, + "hcUtils_2": { + "inputs": { + "crane": "crane_2", + "hcUtils": "hcUtils_3", + "holochain": "holochain", + "nixpkgs": [ + "hcUtils", + "hcUtils", + "holochain", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_3", + "versions": "versions" + }, + "locked": { + "lastModified": 1709649392, + "narHash": "sha256-X3ijMZFXDu2V2Wko1jFO8oovqbilGUj5U77WNiP+jvE=", + "owner": "holochain-open-dev", + "repo": "common", + "rev": "546c3c654904e1bd859dea39960475fef4c7924b", + "type": "github" + }, + "original": { + "owner": "holochain-open-dev", + "repo": "common", + "type": "github" + } + }, + "hcUtils_3": { + "inputs": { + "crane": "crane_3", + "nixpkgs": "nixpkgs_4", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1708609246, + "narHash": "sha256-8C5Nf84Sw3vutYxACA+N1Mc+QC06SddHzA1mjls/v8w=", + "owner": "holochain-open-dev", + "repo": "common", + "rev": "e7e9cfca683aaa78dfa7959bff7b1af91aa6651b", + "type": "github" + }, + "original": { + "owner": "holochain-open-dev", + "repo": "common", + "type": "github" + } + }, + "holochain": { + "inputs": { + "cargo-chef": "cargo-chef", + "cargo-rdme": "cargo-rdme", + "crane": "crane_4", + "crate2nix": "crate2nix", + "empty": "empty", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "holochain": [ + "hcUtils", + "hcUtils", + "holochain", + "empty" + ], + "lair": [ + "hcUtils", + "hcUtils", + "holochain", + "empty" + ], + "launcher": [ + "hcUtils", + "hcUtils", + "holochain", + "empty" + ], + "nix-filter": "nix-filter", + "nixpkgs": "nixpkgs_5", + "pre-commit-hooks-nix": "pre-commit-hooks-nix", + "repo-git": "repo-git", + "rust-overlay": "rust-overlay_2", + "scaffolding": [ + "hcUtils", + "hcUtils", + "holochain", + "empty" + ], + "versions": [ + "hcUtils", + "hcUtils", + "versions" + ] + }, + "locked": { + "lastModified": 1708595708, + "narHash": "sha256-coOhtMii+epTQobSAj1qGfVYbN9Rs0oB+Rj6ZePqKIU=", + "owner": "holochain", + "repo": "holochain", + "rev": "e2fd7138bfeb1185a245421eefb2f83d237eccef", + "type": "github" + }, + "original": { + "owner": "holochain", + "repo": "holochain", + "type": "github" + } + }, + "holochain_2": { + "flake": false, + "locked": { + "lastModified": 1707871925, + "narHash": "sha256-LmDAQT21zXXgDl/68ERyCerAWCym7aKECnXsnyLcmXw=", + "owner": "holochain", + "repo": "holochain", + "rev": "2f3c8dce79586aad6f67d3428bf56d868303f956", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3.0-beta-dev.37", + "repo": "holochain", + "type": "github" + } + }, + "holochain_3": { + "inputs": { + "cargo-chef": "cargo-chef_2", + "cargo-rdme": "cargo-rdme_2", + "crane": "crane_5", + "crate2nix": "crate2nix_2", + "empty": "empty_2", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_2", + "holochain": [ + "hcUtils", + "holochain", + "empty" + ], + "lair": [ + "hcUtils", + "holochain", + "empty" + ], + "launcher": [ + "hcUtils", + "holochain", + "empty" + ], + "nix-filter": "nix-filter_2", + "nixpkgs": "nixpkgs_6", + "pre-commit-hooks-nix": "pre-commit-hooks-nix_2", + "repo-git": "repo-git_2", + "rust-overlay": "rust-overlay_4", + "scaffolding": [ + "hcUtils", + "holochain", + "empty" + ], + "versions": [ + "hcUtils", + "versions" + ] + }, + "locked": { + "lastModified": 1709620314, + "narHash": "sha256-d7vekpj538VqdDrChFbVQpSVGDMnU1nSksbSzacKvyM=", + "owner": "holochain", + "repo": "holochain", + "rev": "392bdfd729fb6ce50f78f9e7f1c757dc392675f4", + "type": "github" + }, + "original": { + "owner": "holochain", + "repo": "holochain", + "type": "github" + } + }, + "holochain_4": { + "flake": false, + "locked": { + "lastModified": 1709081329, + "narHash": "sha256-QP7WKySgEFbgNaSc7BNBBOWCVKuycXSp4HAfD4GTug8=", + "owner": "holochain", + "repo": "holochain", + "rev": "547c63a442e61be805887b644c78cf6f970d631b", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3.0-beta-dev.38", + "repo": "holochain", + "type": "github" + } + }, + "holochain_5": { + "inputs": { + "cargo-chef": "cargo-chef_3", + "cargo-rdme": "cargo-rdme_3", + "crane": "crane_6", + "crate2nix": "crate2nix_3", + "empty": "empty_3", + "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts_3", + "holochain": [ + "holochain", + "empty" + ], + "lair": [ + "holochain", + "empty" + ], + "launcher": [ + "holochain", + "empty" + ], + "nix-filter": "nix-filter_3", + "nixpkgs": "nixpkgs_7", + "pre-commit-hooks-nix": "pre-commit-hooks-nix_3", + "repo-git": "repo-git_3", + "rust-overlay": "rust-overlay_6", + "scaffolding": [ + "holochain", + "empty" + ], + "versions": [ + "versions" + ] + }, + "locked": { + "lastModified": 1709706781, + "narHash": "sha256-wBnOinfR47XONjpkj114N1BmWqfJqOFgGbsLq7JIoKc=", + "owner": "holochain", + "repo": "holochain", + "rev": "532163f8d0aee621642a08ec80bcfd659297a3d9", + "type": "github" + }, + "original": { + "owner": "holochain", + "repo": "holochain", + "type": "github" + } + }, + "holochain_6": { + "flake": false, + "locked": { + "lastModified": 1709081329, + "narHash": "sha256-QP7WKySgEFbgNaSc7BNBBOWCVKuycXSp4HAfD4GTug8=", + "owner": "holochain", + "repo": "holochain", + "rev": "547c63a442e61be805887b644c78cf6f970d631b", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3.0-beta-dev.38", + "repo": "holochain", + "type": "github" + } + }, + "lair": { + "flake": false, + "locked": { + "lastModified": 1706569525, + "narHash": "sha256-e8zYqElBSQgELs1zFYEco2P6qf63NcI2Ftqt1gb2OIs=", + "owner": "holochain", + "repo": "lair", + "rev": "8f01e989372b2d60714ba4774c0a1e2e2c961cf7", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "lair_keystore-v0.4.3", + "repo": "lair", + "type": "github" + } + }, + "lair_2": { + "flake": false, + "locked": { + "lastModified": 1706569525, + "narHash": "sha256-e8zYqElBSQgELs1zFYEco2P6qf63NcI2Ftqt1gb2OIs=", + "owner": "holochain", + "repo": "lair", + "rev": "8f01e989372b2d60714ba4774c0a1e2e2c961cf7", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "lair_keystore-v0.4.3", + "repo": "lair", + "type": "github" + } + }, + "lair_3": { + "flake": false, + "locked": { + "lastModified": 1706569525, + "narHash": "sha256-e8zYqElBSQgELs1zFYEco2P6qf63NcI2Ftqt1gb2OIs=", + "owner": "holochain", + "repo": "lair", + "rev": "8f01e989372b2d60714ba4774c0a1e2e2c961cf7", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "lair_keystore-v0.4.3", + "repo": "lair", + "type": "github" + } + }, + "launcher": { + "flake": false, + "locked": { + "lastModified": 1706294585, + "narHash": "sha256-92Qc6hBMFfHo3w1m1+EpNAAV+7whpkgRHiGqNiXaMCg=", + "owner": "holochain", + "repo": "launcher", + "rev": "51a45a7141abc98a861b34b288b384f50f359485", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-weekly", + "repo": "launcher", + "type": "github" + } + }, + "launcher_2": { + "flake": false, + "locked": { + "lastModified": 1706294585, + "narHash": "sha256-92Qc6hBMFfHo3w1m1+EpNAAV+7whpkgRHiGqNiXaMCg=", + "owner": "holochain", + "repo": "launcher", + "rev": "51a45a7141abc98a861b34b288b384f50f359485", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-weekly", + "repo": "launcher", + "type": "github" + } + }, + "launcher_3": { + "flake": false, + "locked": { + "lastModified": 1706294585, + "narHash": "sha256-92Qc6hBMFfHo3w1m1+EpNAAV+7whpkgRHiGqNiXaMCg=", + "owner": "holochain", + "repo": "launcher", + "rev": "51a45a7141abc98a861b34b288b384f50f359485", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-weekly", + "repo": "launcher", + "type": "github" + } + }, + "nix-filter": { + "locked": { + "lastModified": 1705332318, + "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, + "nix-filter_2": { + "locked": { + "lastModified": 1705332318, + "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, + "nix-filter_3": { + "locked": { + "lastModified": 1705332318, + "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1709386671, + "narHash": "sha256-VPqfBnIJ+cfa78pd4Y5Cr6sOWVW8GYHRVucxJGmRf8Q=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fa9a51752f1b5de583ad5213eb621be071806663", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1706550542, + "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_2": { + "locked": { + "dir": "lib", + "lastModified": 1706550542, + "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_3": { + "locked": { + "dir": "lib", + "lastModified": 1706550542, + "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1706925685, + "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "79a13f1437e149dc7be2d1290c74d378dad60814", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1706925685, + "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "79a13f1437e149dc7be2d1290c74d378dad60814", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1708603017, + "narHash": "sha256-YVMXAorB6bE+y3nFJY0OUfQERI3tyLTDqd6zuPfewp8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2a56c2ca6814a31f8211dad09302398a06acbcdf", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1709479366, + "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1709479366, + "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "pre-commit-hooks-nix": { + "flake": false, + "locked": { + "lastModified": 1707297608, + "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "0db2e67ee49910adfa13010e7f012149660af7f0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks-nix_2": { + "flake": false, + "locked": { + "lastModified": 1707297608, + "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "0db2e67ee49910adfa13010e7f012149660af7f0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks-nix_3": { + "flake": false, + "locked": { + "lastModified": 1707297608, + "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=", + "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5f0cba88ac4d6dd8cad5c6f6f1540b3d6a21a798", + "rev": "0db2e67ee49910adfa13010e7f012149660af7f0", "type": "github" }, "original": { @@ -361,35 +1179,57 @@ "url": "file:/dev/null" } }, + "repo-git_2": { + "flake": false, + "locked": { + "narHash": "sha256-d6xi4mKdjkX2JFicDIv5niSzpyI0m/Hnm8GGAIU04kY=", + "type": "file", + "url": "file:/dev/null" + }, + "original": { + "type": "file", + "url": "file:/dev/null" + } + }, + "repo-git_3": { + "flake": false, + "locked": { + "narHash": "sha256-d6xi4mKdjkX2JFicDIv5niSzpyI0m/Hnm8GGAIU04kY=", + "type": "file", + "url": "file:/dev/null" + }, + "original": { + "type": "file", + "url": "file:/dev/null" + } + }, "root": { "inputs": { - "holochain": "holochain", + "hcUtils": "hcUtils", + "holochain": "holochain_5", "nixpkgs": [ "holochain", "nixpkgs" ], - "versions": "versions" + "versions": "versions_3" } }, "rust-overlay": { "inputs": { - "flake-utils": [ - "holochain", - "crane", - "flake-utils" - ], + "flake-utils": "flake-utils", "nixpkgs": [ - "holochain", - "crane", + "hcUtils", + "hcUtils", + "hcUtils", "nixpkgs" ] }, "locked": { - "lastModified": 1675391458, - "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", + "lastModified": 1708567842, + "narHash": "sha256-tJmra4795ji+hWZTq9UfbHISu+0/V8kdfAj2VYFk6xc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", + "rev": "0b5394f1da0e50715d36a22d4912cb3b02e6b72a", "type": "github" }, "original": { @@ -401,17 +1241,109 @@ "rust-overlay_2": { "inputs": { "flake-utils": "flake-utils_2", + "nixpkgs": [ + "hcUtils", + "hcUtils", + "holochain", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1708567842, + "narHash": "sha256-tJmra4795ji+hWZTq9UfbHISu+0/V8kdfAj2VYFk6xc=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "0b5394f1da0e50715d36a22d4912cb3b02e6b72a", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "hcUtils", + "hcUtils", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1708567842, + "narHash": "sha256-tJmra4795ji+hWZTq9UfbHISu+0/V8kdfAj2VYFk6xc=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "0b5394f1da0e50715d36a22d4912cb3b02e6b72a", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_4": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": [ + "hcUtils", + "holochain", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709604635, + "narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_5": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": [ + "hcUtils", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709604635, + "narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_6": { + "inputs": { + "flake-utils": "flake-utils_6", "nixpkgs": [ "holochain", "nixpkgs" ] }, "locked": { - "lastModified": 1706149103, - "narHash": "sha256-Me28A0tAb1EzZIozfi31+hnsQIaYU0HXaMPWCe+zByc=", + "lastModified": 1709691047, + "narHash": "sha256-2Vwx1FLufoMEcOS8KAwP8H83IP3Hw6ZPrIDHkSXrFCY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "493cc67d5e9f1b298241b8d92aa06883296acc3f", + "rev": "d55139f3061cdf2c8f5f7bc8d49e884826e6a4ea", "type": "github" }, "original": { @@ -423,16 +1355,50 @@ "scaffolding": { "flake": false, "locked": { - "lastModified": 1705076186, - "narHash": "sha256-O914XeBuFulky5RqTOvsog+fbO12v0ppW+mIdO6lvKU=", + "lastModified": 1708377063, + "narHash": "sha256-5+iEjwMO/sTe1h9JVrfn77GjliIRVJQFS2yvI3KTsL8=", + "owner": "holochain", + "repo": "scaffolding", + "rev": "c41f01d2ff19fe58b6632860d85f88a96e16fd65", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-weekly", + "repo": "scaffolding", + "type": "github" + } + }, + "scaffolding_2": { + "flake": false, + "locked": { + "lastModified": 1708377063, + "narHash": "sha256-5+iEjwMO/sTe1h9JVrfn77GjliIRVJQFS2yvI3KTsL8=", + "owner": "holochain", + "repo": "scaffolding", + "rev": "c41f01d2ff19fe58b6632860d85f88a96e16fd65", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-weekly", + "repo": "scaffolding", + "type": "github" + } + }, + "scaffolding_3": { + "flake": false, + "locked": { + "lastModified": 1708377063, + "narHash": "sha256-5+iEjwMO/sTe1h9JVrfn77GjliIRVJQFS2yvI3KTsL8=", "owner": "holochain", "repo": "scaffolding", - "rev": "42e025fe23ac0b4cd659d95e6752d2d300a8d076", + "rev": "c41f01d2ff19fe58b6632860d85f88a96e16fd65", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.2", + "ref": "holochain-weekly", "repo": "scaffolding", "type": "github" } @@ -452,20 +1418,141 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "versions": { "inputs": { "holochain": "holochain_2", "lair": "lair", - "launcher": "launcher_2", + "launcher": "launcher", "scaffolding": "scaffolding" }, "locked": { "dir": "versions/weekly", - "lastModified": 1706208442, - "narHash": "sha256-GCJjMF8XGIhBS0wnSGNLzCV+rgFRVfKUghm4MYDFopE=", + "lastModified": 1708595708, + "narHash": "sha256-coOhtMii+epTQobSAj1qGfVYbN9Rs0oB+Rj6ZePqKIU=", + "owner": "holochain", + "repo": "holochain", + "rev": "e2fd7138bfeb1185a245421eefb2f83d237eccef", + "type": "github" + }, + "original": { + "dir": "versions/weekly", + "owner": "holochain", + "repo": "holochain", + "type": "github" + } + }, + "versions_2": { + "inputs": { + "holochain": "holochain_4", + "lair": "lair_2", + "launcher": "launcher_2", + "scaffolding": "scaffolding_2" + }, + "locked": { + "dir": "versions/weekly", + "lastModified": 1709620314, + "narHash": "sha256-d7vekpj538VqdDrChFbVQpSVGDMnU1nSksbSzacKvyM=", + "owner": "holochain", + "repo": "holochain", + "rev": "392bdfd729fb6ce50f78f9e7f1c757dc392675f4", + "type": "github" + }, + "original": { + "dir": "versions/weekly", + "owner": "holochain", + "repo": "holochain", + "type": "github" + } + }, + "versions_3": { + "inputs": { + "holochain": "holochain_6", + "lair": "lair_3", + "launcher": "launcher_3", + "scaffolding": "scaffolding_3" + }, + "locked": { + "dir": "versions/weekly", + "lastModified": 1709706781, + "narHash": "sha256-wBnOinfR47XONjpkj114N1BmWqfJqOFgGbsLq7JIoKc=", "owner": "holochain", "repo": "holochain", - "rev": "a2201b6c1c69ad8be27a67c3722b754fd4698d1f", + "rev": "532163f8d0aee621642a08ec80bcfd659297a3d9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c5702a0c..7e1fd55c 100644 --- a/flake.nix +++ b/flake.nix @@ -9,16 +9,23 @@ holochain = { url = "github:holochain/holochain"; inputs.versions.follows = "versions"; - inputs.launcher.url = "github:holochain/launcher/bump-weekly-0.3-32"; }; + hcUtils.url = "github:holochain-open-dev/common"; }; outputs = inputs @ { ... }: inputs.holochain.inputs.flake-parts.lib.mkFlake { inherit inputs; + specialArgs.rootPath = ./.; } { + # Import all `dnas/*/dna.nix` files + imports = [ + ./dnas/file_storage_provider/zomes/integrity/file_storage/zome.nix + ./dnas/file_storage_provider/zomes/coordinator/file_storage/zome.nix + ]; + systems = builtins.attrNames inputs.holochain.devShells; perSystem = { inputs' @@ -31,9 +38,7 @@ devShells.default = pkgs.mkShell { inputsFrom = [ inputs'.holochain.devShells.holonix ]; packages = with pkgs; [ - nodejs-18_x - # more packages go here - cargo-nextest + nodejs_20 ]; }; }; diff --git a/package-lock.json b/package-lock.json index e33c7d92..651885f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11610,11 +11610,6 @@ "postcss": "^8.1.0" } }, - "node_modules/idb": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/idb/-/idb-8.0.0.tgz", - "integrity": "sha512-l//qvlAKGmQO31Qn7xdzagVPPaHTxXx199MhrAFuVBTPqydcPYBWjkrbv4Y0ktB+GmWOiwHl237UUOrLmQxLvw==" - }, "node_modules/idb-keyval": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/idb-keyval/-/idb-keyval-6.2.1.tgz", @@ -18094,18 +18089,17 @@ }, "ui": { "name": "@holochain-open-dev/file-storage", - "version": "0.7.0", + "version": "0.7.1", "license": "MIT", "dependencies": { "@holochain-open-dev/elements": "^0.8.2", "@holochain-open-dev/utils": "^0.16.0", - "@holochain/client": "^0.17.0-dev.3", + "@holochain/client": "^0.17.0-dev.7", "@lit-labs/task": "^2.0.0", "@lit/context": "^1.0.0", "@lit/localize": "^0.12.0", "@scoped-elements/dropzone": "^0.2.1", "@shoelace-style/shoelace": "^2.11.0", - "idb": "^8.0.0", "idb-keyval": "^6.2.1", "lit": "^3.0.0" }, @@ -18128,9 +18122,9 @@ } }, "ui/node_modules/@holochain/client": { - "version": "0.17.0-dev.3", - "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.17.0-dev.3.tgz", - "integrity": "sha512-+XiF0IO7E0mOj+FsXGkVn4AtGA3ZP+NkD7dQyMxVbZ7gG2RxGZrYZ3u8W8Q4RizB+szZMejkH0KodXQyomh2TA==", + "version": "0.17.0-dev.7", + "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.17.0-dev.7.tgz", + "integrity": "sha512-dr0S+4Au/sS/PXu0T7Lm1uqwkPVpcWvbMBL9xD7bRv4pfWMratGdP3OpeA356l4bkpSJxkOltz2o2kN3pW3tRQ==", "dependencies": { "@bitgo/blake2b": "^3.2.4", "@holochain/serialization": "^0.1.0-beta-rc.3", diff --git a/tests/package.json b/tests/package.json index 1b9b6a51..f82db7f5 100644 --- a/tests/package.json +++ b/tests/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "@msgpack/msgpack": "^2.7.0", - "@holochain/tryorama": "^0.16.0-dev.0", + "@holochain/tryorama": "^0.16.0-dev.1", "vitest": "^0.34.5" }, "type": "module" diff --git a/ui/package.json b/ui/package.json index f885af27..16c69cd5 100644 --- a/ui/package.json +++ b/ui/package.json @@ -16,12 +16,13 @@ "build": "npm run lint && tsc", "lint": "eslint --ext .ts,.html src --ignore-path .gitignore", "analyze": "cem analyze --litelement --exclude dist", - "format": "eslint --ext .ts,.html src --fix --ignore-path .gitignore" + "format": "eslint --ext .ts,.html src --fix --ignore-path .gitignore", + "postinstall": "tsc" }, "dependencies": { "@holochain-open-dev/elements": "^0.8.2", "@holochain-open-dev/utils": "^0.16.0", - "@holochain/client": "^0.17.0-dev.3", + "@holochain/client": "^0.17.0-dev.7", "@lit-labs/task": "^2.0.0", "@lit/context": "^1.0.0", "@lit/localize": "^0.12.0",