From aebb46d4f88251a757178b379dc9741c400f1758 Mon Sep 17 00:00:00 2001 From: "guillem.cordoba" Date: Wed, 6 Mar 2024 12:00:00 +0100 Subject: [PATCH] WIP --- .github/workflows/test.yaml | 16 +- .gitignore | 1 + crates/coordinator/Cargo.toml | 2 +- crates/coordinator/tests/create_and_get.rs | 2 +- crates/coordinator/tests/search.rs | 2 +- crates/coordinator/zome.nix | 31 +- crates/integrity/zome.nix | 2 +- flake.lock | 559 ++++++++++++++++++++- flake.nix | 2 - package.json | 5 +- 10 files changed, 592 insertions(+), 30 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 7df899718..bde76428e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -1,4 +1,4 @@ -name: "test" +name: "main" on: # Trigger the workflow on push or pull request, # but only for the main branch @@ -29,5 +29,17 @@ jobs: - name: Install and test run: | - nix develop --command bash -c "npm i && npm t" + nix develop --command bash -c "npm i && npm t && npm run build -w ui" + + push-to-nix-cache: + strategy: + matrix: + os: [ ubuntu-latest, macos-latest ] + steps: + - name: Build zomes + run: | + nix build .#profiles_integrity + sha256sum result + nix build .#profiles + sha256sum result diff --git a/.gitignore b/.gitignore index 2b90e2008..6404c56ff 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ dist/ *.happ storybook-static/ locales/ +result* diff --git a/crates/coordinator/Cargo.toml b/crates/coordinator/Cargo.toml index 49f3b8798..e04eaf966 100644 --- a/crates/coordinator/Cargo.toml +++ b/crates/coordinator/Cargo.toml @@ -25,7 +25,7 @@ hc_zome_profiles_integrity = { path = "../integrity", version = "0.2" } hdk = { workspace = true } [dev-dependencies] -fixt = "0.3.0-beta-dev.0" +fixt = "0.3.0-beta-dev.1" futures = { version = "0.3.1", default-features = false } hdk = { workspace = true, features = ["encoding", "test_utils"] } holochain = { workspace = true, features = ["test_utils"] } diff --git a/crates/coordinator/tests/create_and_get.rs b/crates/coordinator/tests/create_and_get.rs index ba9c10d17..aae7f4608 100644 --- a/crates/coordinator/tests/create_and_get.rs +++ b/crates/coordinator/tests/create_and_get.rs @@ -10,7 +10,7 @@ async fn create_and_get() { // Use prebuilt DNA file let dna_path = std::env::current_dir() .unwrap() - .join("../../workdir/profiles-test.dna"); + .join(std::env::var("DNA_PATH").expect("DNA_PATH not set")); let dna = SweetDnaFile::from_bundle(&dna_path).await.unwrap(); // Set up conductors diff --git a/crates/coordinator/tests/search.rs b/crates/coordinator/tests/search.rs index c2a0e6468..1a35bf704 100644 --- a/crates/coordinator/tests/search.rs +++ b/crates/coordinator/tests/search.rs @@ -10,7 +10,7 @@ async fn create_and_get() { // Use prebuilt DNA file let dna_path = std::env::current_dir() .unwrap() - .join("../../workdir/profiles-test.dna"); + .join(std::env::var("DNA_PATH").expect("DNA_PATH not set")); let dna = SweetDnaFile::from_bundle(&dna_path).await.unwrap(); // Set up conductors diff --git a/crates/coordinator/zome.nix b/crates/coordinator/zome.nix index e68c22116..0ffe05211 100644 --- a/crates/coordinator/zome.nix +++ b/crates/coordinator/zome.nix @@ -8,12 +8,41 @@ , system , lib , options + , self' , ... }: { packages.profiles = inputs.hcUtils.outputs.lib.rustZome { workspacePath = rootPath; holochain = inputs'.holochain; - cratePath = ./.; + crateCargoToml = ./Cargo.toml; + }; + + checks.profiles = inputs.hcUtils.outputs.lib.sweettest { + workspacePath = rootPath; + holochain = inputs'.holochain; + dna = inputs.hcUtils.outputs.lib.dna { + dnaManifest = builtins.toFile "dna.yaml" '' + --- + manifest_version: "1" + name: test_dna + integrity: + network_seed: ~ + properties: ~ + origin_time: 1709638576394039 + zomes: + - name: profiles_integrity + coordinator: + zomes: + - name: profiles + hash: ~ + dependencies: + - name: profiles_integrity + dylib: ~ + ''; + zomes = inputs.hcUtils.outputs.lib.filterZomes self'.packages; + holochain = inputs'.holochain; + }; + crateCargoToml = ./Cargo.toml; }; }; } diff --git a/crates/integrity/zome.nix b/crates/integrity/zome.nix index 8f647bd5c..4100bc97a 100644 --- a/crates/integrity/zome.nix +++ b/crates/integrity/zome.nix @@ -13,7 +13,7 @@ packages.profiles_integrity = inputs.hcUtils.outputs.lib.rustZome { workspacePath = rootPath; holochain = inputs'.holochain; - cratePath = ./.; + crateCargoToml = ./Cargo.toml; }; }; } diff --git a/flake.lock b/flake.lock index dacff7c60..11cb5a1a7 100644 --- a/flake.lock +++ b/flake.lock @@ -34,6 +34,23 @@ "type": "github" } }, + "cargo-chef_3": { + "flake": false, + "locked": { + "lastModified": 1695999026, + "narHash": "sha256-UtLoZd7YBRSF9uXStfC3geEFqSqZXFh1rLHaP8hre0Y=", + "owner": "LukeMathWalker", + "repo": "cargo-chef", + "rev": "6e96ae5cd023b718ae40d608981e50a6e7d7facf", + "type": "github" + }, + "original": { + "owner": "LukeMathWalker", + "ref": "main", + "repo": "cargo-chef", + "type": "github" + } + }, "cargo-rdme": { "flake": false, "locked": { @@ -68,16 +85,33 @@ "type": "github" } }, + "cargo-rdme_3": { + "flake": false, + "locked": { + "lastModified": 1675118998, + "narHash": "sha256-lrYWqu3h88fr8gG3Yo5GbFGYaq5/1Os7UtM+Af0Bg4k=", + "owner": "orium", + "repo": "cargo-rdme", + "rev": "f9dbb6bccc078f4869f45ae270a2890ac9a75877", + "type": "github" + }, + "original": { + "owner": "orium", + "ref": "v1.1.0", + "repo": "cargo-rdme", + "type": "github" + } + }, "crane": { "inputs": { "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1708560786, - "narHash": "sha256-gcTA/iq9mfrwGPQsoxVryWhCAgBwL2GJLGO/s06/0wY=", + "lastModified": 1709610799, + "narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=", "owner": "ipetkov", "repo": "crane", - "rev": "9a5972e2e8d0b1716cc4e42af8b75eca6914fbff", + "rev": "81c393c776d5379c030607866afef6406ca1be57", "type": "github" }, "original": { @@ -105,8 +139,27 @@ } }, "crane_3": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1708560786, + "narHash": "sha256-gcTA/iq9mfrwGPQsoxVryWhCAgBwL2GJLGO/s06/0wY=", + "owner": "ipetkov", + "repo": "crane", + "rev": "9a5972e2e8d0b1716cc4e42af8b75eca6914fbff", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_4": { "inputs": { "nixpkgs": [ + "hcUtils", "hcUtils", "holochain", "nixpkgs" @@ -126,7 +179,29 @@ "type": "github" } }, - "crane_4": { + "crane_5": { + "inputs": { + "nixpkgs": [ + "hcUtils", + "holochain", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1707363936, + "narHash": "sha256-QbqyvGFYt84QNOQLOOTWplZZkzkyDhYrAl/N/9H0vFM=", + "owner": "ipetkov", + "repo": "crane", + "rev": "9107434eda6991e9388ad87b815dafa337446d16", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_6": { "inputs": { "nixpkgs": [ "holochain", @@ -179,6 +254,22 @@ "type": "github" } }, + "crate2nix_3": { + "flake": false, + "locked": { + "lastModified": 1706909251, + "narHash": "sha256-T7G9Uhh77P0kKri/u+Mwa/4YnXwdPsJSwYCiJCCW+fs=", + "owner": "kolloch", + "repo": "crate2nix", + "rev": "15656bb6cb15f55ee3344bf4362e6489feb93db6", + "type": "github" + }, + "original": { + "owner": "kolloch", + "repo": "crate2nix", + "type": "github" + } + }, "empty": { "flake": false, "locked": { @@ -211,6 +302,22 @@ "type": "github" } }, + "empty_3": { + "flake": false, + "locked": { + "lastModified": 1683792623, + "narHash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=", + "owner": "steveej", + "repo": "empty", + "rev": "8e328e450e4cd32e072eba9e99fe92cf2a1ef5cf", + "type": "github" + }, + "original": { + "owner": "steveej", + "repo": "empty", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -243,6 +350,22 @@ "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" @@ -277,6 +400,23 @@ "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" @@ -349,12 +489,76 @@ "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" @@ -376,10 +580,10 @@ "type": "github" } }, - "hcUtils_2": { + "hcUtils_3": { "inputs": { - "crane": "crane_2", - "nixpkgs": "nixpkgs_3", + "crane": "crane_3", + "nixpkgs": "nixpkgs_4", "rust-overlay": "rust-overlay" }, "locked": { @@ -400,37 +604,42 @@ "inputs": { "cargo-chef": "cargo-chef", "cargo-rdme": "cargo-rdme", - "crane": "crane_3", + "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_4", + "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" ] @@ -470,33 +679,38 @@ "inputs": { "cargo-chef": "cargo-chef_2", "cargo-rdme": "cargo-rdme_2", - "crane": "crane_4", + "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_5", + "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" ] }, @@ -531,6 +745,71 @@ "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": 1709620314, + "narHash": "sha256-d7vekpj538VqdDrChFbVQpSVGDMnU1nSksbSzacKvyM=", + "owner": "holochain", + "repo": "holochain", + "rev": "392bdfd729fb6ce50f78f9e7f1c757dc392675f4", + "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": { @@ -565,6 +844,23 @@ "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": { @@ -599,6 +895,23 @@ "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, @@ -629,13 +942,28 @@ "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": 1706925685, - "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", + "lastModified": 1709386671, + "narHash": "sha256-VPqfBnIJ+cfa78pd4Y5Cr6sOWVW8GYHRVucxJGmRf8Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "79a13f1437e149dc7be2d1290c74d378dad60814", + "rev": "fa9a51752f1b5de583ad5213eb621be071806663", "type": "github" }, "original": { @@ -681,6 +1009,24 @@ "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, @@ -698,6 +1044,22 @@ } }, "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=", @@ -712,7 +1074,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1708475490, "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", @@ -727,7 +1089,22 @@ "type": "indirect" } }, - "nixpkgs_5": { + "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=", @@ -774,6 +1151,22 @@ "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": "0db2e67ee49910adfa13010e7f012149660af7f0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "repo-git": { "flake": false, "locked": { @@ -798,21 +1191,34 @@ "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": { "hcUtils": "hcUtils", - "holochain": "holochain_3", + "holochain": "holochain_5", "nixpkgs": [ "holochain", "nixpkgs" ], - "versions": "versions_2" + "versions": "versions_3" } }, "rust-overlay": { "inputs": { "flake-utils": "flake-utils", "nixpkgs": [ + "hcUtils", "hcUtils", "hcUtils", "nixpkgs" @@ -836,6 +1242,7 @@ "inputs": { "flake-utils": "flake-utils_2", "nixpkgs": [ + "hcUtils", "hcUtils", "holochain", "nixpkgs" @@ -859,6 +1266,7 @@ "inputs": { "flake-utils": "flake-utils_3", "nixpkgs": [ + "hcUtils", "hcUtils", "nixpkgs" ] @@ -880,6 +1288,51 @@ "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" @@ -933,6 +1386,23 @@ "type": "github" } }, + "scaffolding_3": { + "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" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -993,6 +1463,36 @@ "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", @@ -1038,6 +1538,29 @@ "repo": "holochain", "type": "github" } + }, + "versions_3": { + "inputs": { + "holochain": "holochain_6", + "lair": "lair_3", + "launcher": "launcher_3", + "scaffolding": "scaffolding_3" + }, + "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" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d7b19f744..833caab37 100644 --- a/flake.nix +++ b/flake.nix @@ -38,8 +38,6 @@ inputsFrom = [ inputs'.holochain.devShells.holonix ]; packages = with pkgs; [ nodejs_20 - # more packages go here - cargo-nextest ]; }; diff --git a/package.json b/package.json index d72beabf0..27ed2af62 100644 --- a/package.json +++ b/package.json @@ -5,15 +5,14 @@ "scripts": { "start": "AGENTS=2 npm run network", "network": "hc s clean && npm run build:happ && BOOTSTRAP_PORT=$(port) SIGNAL_PORT=$(port) UI_PORT=8888 concurrently \"npm start -w ui\" \"npm run local-services\" \"npm run launch\" \"holochain-playground\"", - "test": "npm run build:happ && cargo nextest run -j 1 && npm test -w tests", + "test": "npm run build:happ && nix flake check && npm test -w tests", "launch": "echo pass | RUST_LOG=warn hc launch --piped -n $AGENTS workdir/profiles-test.happ --ui-port $UI_PORT network --bootstrap http://127.0.0.1:$BOOTSTRAP_PORT webrtc ws://127.0.0.1:$SIGNAL_PORT", "local-services": "hc run-local-services --bootstrap-port $BOOTSTRAP_PORT --signal-port $SIGNAL_PORT", "build:happ": "npm run build:zome && hc app pack workdir --recursive", "build:zome": "CARGO_TARGET_DIR=target cargo build --release --target wasm32-unknown-unknown", "docs:start": "npm run docs:setup && storybook dev -p 6006", "docs:publish": "npm run docs:setup && storybook build && gh-pages -d ./storybook-static -b gh-pages", - "docs:setup": "npm run build -w @holochain-open-dev/profiles && npm run analyze -w @holochain-open-dev/profiles", - "package": "npm run build:happ && npm run package -w ui && hc web-app pack workdir --recursive" + "docs:setup": "npm run build -w @holochain-open-dev/profiles && npm run analyze -w @holochain-open-dev/profiles" }, "devDependencies": { "@holochain-playground/cli": "^0.1.0",