diff --git a/crates/sync-npm-dependencies-with-nix/Cargo.lock b/crates/sync-npm-dependencies-with-nix/Cargo.lock new file mode 100644 index 0000000..049c1ab --- /dev/null +++ b/crates/sync-npm-dependencies-with-nix/Cargo.lock @@ -0,0 +1,176 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "anyhow" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "parse-flake-lock" +version = "0.1.0" +source = "git+https://github.com/DeterminateSystems/flake-checker?branch=main#267211ab35fdd1792cdfcfcf9f98901d89971f99" +dependencies = [ + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "proc-macro2" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "syn" +version = "2.0.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync-npm-dependencies-with-nix" +version = "0.1.0" +dependencies = [ + "anyhow", + "parse-flake-lock", + "walkdir", +] + +[[package]] +name = "thiserror" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/crates/sync-npm-dependencies-with-nix/Cargo.toml b/crates/sync-npm-dependencies-with-nix/Cargo.toml new file mode 100644 index 0000000..aa2a950 --- /dev/null +++ b/crates/sync-npm-dependencies-with-nix/Cargo.toml @@ -0,0 +1,11 @@ +[package] +name = "sync-npm-dependencies-with-nix" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +anyhow = "1.0.81" +parse-flake-lock = { git = "https://github.com/DeterminateSystems/flake-checker", branch = "main" } +walkdir = "2.5.0" diff --git a/crates/sync-npm-dependencies-with-nix/src/main.rs b/crates/sync-npm-dependencies-with-nix/src/main.rs new file mode 100644 index 0000000..8c69663 --- /dev/null +++ b/crates/sync-npm-dependencies-with-nix/src/main.rs @@ -0,0 +1,26 @@ +use anyhow::Result; +use std::path::Path; + +use parse_flake_lock::{FlakeLock, FlakeLockParseError}; + +use walkdir::WalkDir; + +fn main() -> Result<()> { + for entry in WalkDir::new(".").into_iter().filter_map(|e| e.ok()) { + let f_name = entry.file_name().to_string_lossy(); + + if f_name == "package.json" { + println!("{}", f_name); + } + } + + Ok(()) +} + +// fn main() -> Result<(), FlakeLockParseError> { +// let flake_lock = FlakeLock::new(Path::new("flake.lock"))?; + +// println!("asdf {flake_lock:?}"); + +// Ok(()) +// } diff --git a/flake.lock b/flake.lock index fbeb071..3c3c9d8 100644 --- a/flake.lock +++ b/flake.lock @@ -85,6 +85,23 @@ "type": "github" } }, + "cargo-chef_6": { + "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": { @@ -170,6 +187,23 @@ "type": "github" } }, + "cargo-rdme_6": { + "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" @@ -191,6 +225,8 @@ "crane_10": { "inputs": { "nixpkgs": [ + "hcUtils", + "hcUtils", "hcUtils", "holochain", "nixpkgs" @@ -211,6 +247,51 @@ } }, "crane_11": { + "inputs": { + "nixpkgs": [ + "hcUtils", + "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_12": { + "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_13": { "inputs": { "nixpkgs": [ "holochain", @@ -236,11 +317,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1709610799, - "narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=", + "lastModified": 1710003968, + "narHash": "sha256-g8+K+mLiNG5uch35Oy9oDQBAmGSkCcqrd0Jjme7xiG0=", "owner": "ipetkov", "repo": "crane", - "rev": "81c393c776d5379c030607866afef6406ca1be57", + "rev": "10484f86201bb94bd61ecc5335b1496794fedb78", "type": "github" }, "original": { @@ -290,11 +371,11 @@ "nixpkgs": "nixpkgs_5" }, "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": { @@ -323,21 +404,14 @@ }, "crane_7": { "inputs": { - "nixpkgs": [ - "hcUtils", - "hcUtils", - "hcUtils", - "hcUtils", - "holochain", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1707363936, - "narHash": "sha256-QbqyvGFYt84QNOQLOOTWplZZkzkyDhYrAl/N/9H0vFM=", + "lastModified": 1708560786, + "narHash": "sha256-gcTA/iq9mfrwGPQsoxVryWhCAgBwL2GJLGO/s06/0wY=", "owner": "ipetkov", "repo": "crane", - "rev": "9107434eda6991e9388ad87b815dafa337446d16", + "rev": "9a5972e2e8d0b1716cc4e42af8b75eca6914fbff", "type": "github" }, "original": { @@ -349,6 +423,8 @@ "crane_8": { "inputs": { "nixpkgs": [ + "hcUtils", + "hcUtils", "hcUtils", "hcUtils", "hcUtils", @@ -373,6 +449,8 @@ "crane_9": { "inputs": { "nixpkgs": [ + "hcUtils", + "hcUtils", "hcUtils", "hcUtils", "holochain", @@ -473,6 +551,22 @@ "type": "github" } }, + "crate2nix_6": { + "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": { @@ -553,6 +647,22 @@ "type": "github" } }, + "empty_6": { + "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": { @@ -633,6 +743,22 @@ "type": "github" } }, + "flake-compat_6": { + "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" @@ -718,6 +844,23 @@ "type": "indirect" } }, + "flake-parts_6": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_6" + }, + "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" @@ -772,6 +915,42 @@ "type": "github" } }, + "flake-utils_12": { + "inputs": { + "systems": "systems_12" + }, + "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_13": { + "inputs": { + "systems": "systems_13" + }, + "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" @@ -920,8 +1099,36 @@ "inputs": { "crane": "crane_2", "hcUtils": "hcUtils_2", + "holochain": "holochain_9", + "nixpkgs": [ + "hcUtils", + "holochain", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_11", + "versions": "versions_5" + }, + "locked": { + "lastModified": 1710170526, + "narHash": "sha256-8SMfoPrMF0nXBmN+k9Ckxy/1VFB7GWMX+ZWPQUl/ylM=", + "owner": "holochain-open-dev", + "repo": "common", + "rev": "8ae6c8817918006f25f0e38c0351809e23328df8", + "type": "github" + }, + "original": { + "owner": "holochain-open-dev", + "repo": "common", + "type": "github" + } + }, + "hcUtils_2": { + "inputs": { + "crane": "crane_3", + "hcUtils": "hcUtils_3", "holochain": "holochain_7", "nixpkgs": [ + "hcUtils", "hcUtils", "holochain", "nixpkgs" @@ -943,12 +1150,13 @@ "type": "github" } }, - "hcUtils_2": { + "hcUtils_3": { "inputs": { - "crane": "crane_3", - "hcUtils": "hcUtils_3", + "crane": "crane_4", + "hcUtils": "hcUtils_4", "holochain": "holochain_5", "nixpkgs": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", @@ -971,15 +1179,16 @@ "type": "github" } }, - "hcUtils_3": { + "hcUtils_4": { "inputs": { - "crane": "crane_4", - "hcUtils": "hcUtils_4", + "crane": "crane_5", + "hcUtils": "hcUtils_5", "holochain": "holochain_3", "nixpkgs": [ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "nixpkgs" ], @@ -1000,16 +1209,17 @@ "type": "github" } }, - "hcUtils_4": { + "hcUtils_5": { "inputs": { - "crane": "crane_5", - "hcUtils": "hcUtils_5", + "crane": "crane_6", + "hcUtils": "hcUtils_6", "holochain": "holochain", "nixpkgs": [ "hcUtils", "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "nixpkgs" ], @@ -1030,10 +1240,10 @@ "type": "github" } }, - "hcUtils_5": { + "hcUtils_6": { "inputs": { - "crane": "crane_6", - "nixpkgs": "nixpkgs_7", + "crane": "crane_7", + "nixpkgs": "nixpkgs_8", "rust-overlay": "rust-overlay" }, "locked": { @@ -1054,7 +1264,7 @@ "inputs": { "cargo-chef": "cargo-chef", "cargo-rdme": "cargo-rdme", - "crane": "crane_7", + "crane": "crane_8", "crate2nix": "crate2nix", "empty": "empty", "flake-compat": "flake-compat", @@ -1064,6 +1274,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], @@ -1072,6 +1283,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], @@ -1080,11 +1292,12 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "repo-git": "repo-git", "rust-overlay": "rust-overlay_2", @@ -1093,6 +1306,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], @@ -1101,6 +1315,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "versions" ] }, @@ -1135,6 +1350,71 @@ "type": "github" } }, + "holochain_11": { + "inputs": { + "cargo-chef": "cargo-chef_6", + "cargo-rdme": "cargo-rdme_6", + "crane": "crane_13", + "crate2nix": "crate2nix_6", + "empty": "empty_6", + "flake-compat": "flake-compat_6", + "flake-parts": "flake-parts_6", + "holochain": [ + "holochain", + "empty" + ], + "lair": [ + "holochain", + "empty" + ], + "launcher": [ + "holochain", + "empty" + ], + "nix-filter": "nix-filter_6", + "nixpkgs": "nixpkgs_14", + "pre-commit-hooks-nix": "pre-commit-hooks-nix_6", + "repo-git": "repo-git_6", + "rust-overlay": "rust-overlay_12", + "scaffolding": [ + "holochain", + "empty" + ], + "versions": [ + "versions" + ] + }, + "locked": { + "lastModified": 1710225101, + "narHash": "sha256-vf2FT9x5Ua8/LA4TGXss2Y3y6xokwBauCDKsK9PcH3g=", + "owner": "holochain", + "repo": "holochain", + "rev": "eff052624aa039576c6b4d4598a7ad860a7afd50", + "type": "github" + }, + "original": { + "owner": "holochain", + "repo": "holochain", + "type": "github" + } + }, + "holochain_12": { + "flake": false, + "locked": { + "lastModified": 1709687030, + "narHash": "sha256-aaixbhm+R0urE900zRpIhHWQUOtQCP2gAAxz+jcx80s=", + "owner": "holochain", + "repo": "holochain", + "rev": "cb671524080332983281baa2db7c1851344e79d2", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3.0-beta-dev.39", + "repo": "holochain", + "type": "github" + } + }, "holochain_2": { "flake": false, "locked": { @@ -1156,7 +1436,7 @@ "inputs": { "cargo-chef": "cargo-chef_2", "cargo-rdme": "cargo-rdme_2", - "crane": "crane_8", + "crane": "crane_9", "crate2nix": "crate2nix_2", "empty": "empty_2", "flake-compat": "flake-compat_2", @@ -1165,6 +1445,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], @@ -1172,6 +1453,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], @@ -1179,11 +1461,12 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], "nix-filter": "nix-filter_2", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "pre-commit-hooks-nix": "pre-commit-hooks-nix_2", "repo-git": "repo-git_2", "rust-overlay": "rust-overlay_4", @@ -1191,6 +1474,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], @@ -1198,6 +1482,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "versions" ] }, @@ -1236,41 +1521,46 @@ "inputs": { "cargo-chef": "cargo-chef_3", "cargo-rdme": "cargo-rdme_3", - "crane": "crane_9", + "crane": "crane_10", "crate2nix": "crate2nix_3", "empty": "empty_3", "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_3", "holochain": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", "empty" ], "lair": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", "empty" ], "launcher": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", "empty" ], "nix-filter": "nix-filter_3", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_11", "pre-commit-hooks-nix": "pre-commit-hooks-nix_3", "repo-git": "repo-git_3", "rust-overlay": "rust-overlay_6", "scaffolding": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", "empty" ], "versions": [ + "hcUtils", "hcUtils", "hcUtils", "versions" @@ -1311,37 +1601,42 @@ "inputs": { "cargo-chef": "cargo-chef_4", "cargo-rdme": "cargo-rdme_4", - "crane": "crane_10", + "crane": "crane_11", "crate2nix": "crate2nix_4", "empty": "empty_4", "flake-compat": "flake-compat_4", "flake-parts": "flake-parts_4", "holochain": [ + "hcUtils", "hcUtils", "holochain", "empty" ], "lair": [ + "hcUtils", "hcUtils", "holochain", "empty" ], "launcher": [ + "hcUtils", "hcUtils", "holochain", "empty" ], "nix-filter": "nix-filter_4", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "pre-commit-hooks-nix": "pre-commit-hooks-nix_4", "repo-git": "repo-git_4", "rust-overlay": "rust-overlay_8", "scaffolding": [ + "hcUtils", "hcUtils", "holochain", "empty" ], "versions": [ + "hcUtils", "hcUtils", "versions" ] @@ -1381,33 +1676,38 @@ "inputs": { "cargo-chef": "cargo-chef_5", "cargo-rdme": "cargo-rdme_5", - "crane": "crane_11", + "crane": "crane_12", "crate2nix": "crate2nix_5", "empty": "empty_5", "flake-compat": "flake-compat_5", "flake-parts": "flake-parts_5", "holochain": [ + "hcUtils", "holochain", "empty" ], "lair": [ + "hcUtils", "holochain", "empty" ], "launcher": [ + "hcUtils", "holochain", "empty" ], "nix-filter": "nix-filter_5", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_13", "pre-commit-hooks-nix": "pre-commit-hooks-nix_5", "repo-git": "repo-git_5", "rust-overlay": "rust-overlay_10", "scaffolding": [ + "hcUtils", "holochain", "empty" ], "versions": [ + "hcUtils", "versions" ] }, @@ -1421,11 +1721,28 @@ }, "original": { "owner": "holochain", - "repo": "holochain", + "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": { + "lair_2": { "flake": false, "locked": { "lastModified": 1706569525, @@ -1442,7 +1759,7 @@ "type": "github" } }, - "lair_2": { + "lair_3": { "flake": false, "locked": { "lastModified": 1706569525, @@ -1459,7 +1776,7 @@ "type": "github" } }, - "lair_3": { + "lair_4": { "flake": false, "locked": { "lastModified": 1706569525, @@ -1476,7 +1793,7 @@ "type": "github" } }, - "lair_4": { + "lair_5": { "flake": false, "locked": { "lastModified": 1706569525, @@ -1493,7 +1810,7 @@ "type": "github" } }, - "lair_5": { + "lair_6": { "flake": false, "locked": { "lastModified": 1706569525, @@ -1595,6 +1912,23 @@ "type": "github" } }, + "launcher_6": { + "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, @@ -1670,6 +2004,21 @@ "type": "github" } }, + "nix-filter_6": { + "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, @@ -1776,6 +2125,24 @@ "type": "github" } }, + "nixpkgs-lib_6": { + "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_10": { "locked": { "lastModified": 1709479366, @@ -1792,6 +2159,21 @@ } }, "nixpkgs_11": { + "locked": { + "lastModified": 1709479366, + "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_12": { "locked": { "lastModified": 1709703039, "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", @@ -1806,7 +2188,22 @@ "type": "indirect" } }, - "nixpkgs_12": { + "nixpkgs_13": { + "locked": { + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_14": { "locked": { "lastModified": 1709961763, "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", @@ -1870,6 +2267,22 @@ } }, "nixpkgs_5": { + "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_6": { "locked": { "lastModified": 1706925685, "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", @@ -1885,7 +2298,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1706925685, "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", @@ -1901,7 +2314,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1708603017, "narHash": "sha256-YVMXAorB6bE+y3nFJY0OUfQERI3tyLTDqd6zuPfewp8=", @@ -1916,7 +2329,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1708475490, "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", @@ -1931,22 +2344,23 @@ "type": "indirect" } }, - "nixpkgs_9": { + "pre-commit-hooks-nix": { + "flake": false, "locked": { - "lastModified": 1709479366, - "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", + "lastModified": 1707297608, + "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "0db2e67ee49910adfa13010e7f012149660af7f0", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" } }, - "pre-commit-hooks-nix": { + "pre-commit-hooks-nix_2": { "flake": false, "locked": { "lastModified": 1707297608, @@ -1962,7 +2376,7 @@ "type": "github" } }, - "pre-commit-hooks-nix_2": { + "pre-commit-hooks-nix_3": { "flake": false, "locked": { "lastModified": 1707297608, @@ -1978,7 +2392,7 @@ "type": "github" } }, - "pre-commit-hooks-nix_3": { + "pre-commit-hooks-nix_4": { "flake": false, "locked": { "lastModified": 1707297608, @@ -1994,7 +2408,7 @@ "type": "github" } }, - "pre-commit-hooks-nix_4": { + "pre-commit-hooks-nix_5": { "flake": false, "locked": { "lastModified": 1707297608, @@ -2010,7 +2424,7 @@ "type": "github" } }, - "pre-commit-hooks-nix_5": { + "pre-commit-hooks-nix_6": { "flake": false, "locked": { "lastModified": 1707297608, @@ -2086,17 +2500,29 @@ "url": "file:/dev/null" } }, + "repo-git_6": { + "flake": false, + "locked": { + "narHash": "sha256-d6xi4mKdjkX2JFicDIv5niSzpyI0m/Hnm8GGAIU04kY=", + "type": "file", + "url": "file:/dev/null" + }, + "original": { + "type": "file", + "url": "file:/dev/null" + } + }, "root": { "inputs": { "crane": "crane", "hcUtils": "hcUtils", - "holochain": "holochain_9", + "holochain": "holochain_11", "nixpkgs": [ "holochain", "nixpkgs" ], - "rust-overlay": "rust-overlay_11", - "versions": "versions_5" + "rust-overlay": "rust-overlay_13", + "versions": "versions_6" } }, "rust-overlay": { @@ -2108,6 +2534,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "nixpkgs" ] }, @@ -2129,6 +2556,7 @@ "inputs": { "flake-utils": "flake-utils_10", "nixpkgs": [ + "hcUtils", "holochain", "nixpkgs" ] @@ -2151,6 +2579,7 @@ "inputs": { "flake-utils": "flake-utils_11", "nixpkgs": [ + "hcUtils", "nixpkgs" ] }, @@ -2168,6 +2597,49 @@ "type": "github" } }, + "rust-overlay_12": { + "inputs": { + "flake-utils": "flake-utils_12", + "nixpkgs": [ + "holochain", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1710209426, + "narHash": "sha256-A7bXK9k6RdBGsmqU4DxHqDBty7kKNkh8Pv+iGE2i1Ac=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "405cdc2652fa89f2fcf392335d5b9364b0adc5c2", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_13": { + "inputs": { + "flake-utils": "flake-utils_13", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1710209426, + "narHash": "sha256-A7bXK9k6RdBGsmqU4DxHqDBty7kKNkh8Pv+iGE2i1Ac=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "405cdc2652fa89f2fcf392335d5b9364b0adc5c2", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "rust-overlay_2": { "inputs": { "flake-utils": "flake-utils_2", @@ -2176,6 +2648,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "nixpkgs" ] @@ -2202,6 +2675,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "nixpkgs" ] }, @@ -2226,6 +2700,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "nixpkgs" ] @@ -2251,6 +2726,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "nixpkgs" ] }, @@ -2272,6 +2748,7 @@ "inputs": { "flake-utils": "flake-utils_6", "nixpkgs": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", @@ -2296,6 +2773,7 @@ "inputs": { "flake-utils": "flake-utils_7", "nixpkgs": [ + "hcUtils", "hcUtils", "hcUtils", "nixpkgs" @@ -2319,6 +2797,7 @@ "inputs": { "flake-utils": "flake-utils_8", "nixpkgs": [ + "hcUtils", "hcUtils", "holochain", "nixpkgs" @@ -2342,6 +2821,7 @@ "inputs": { "flake-utils": "flake-utils_9", "nixpkgs": [ + "hcUtils", "hcUtils", "nixpkgs" ] @@ -2445,6 +2925,23 @@ "type": "github" } }, + "scaffolding_6": { + "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, @@ -2490,6 +2987,36 @@ "type": "github" } }, + "systems_12": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_13": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -2724,6 +3251,29 @@ "repo": "holochain", "type": "github" } + }, + "versions_6": { + "inputs": { + "holochain": "holochain_12", + "lair": "lair_6", + "launcher": "launcher_6", + "scaffolding": "scaffolding_6" + }, + "locked": { + "dir": "versions/weekly", + "lastModified": 1710225101, + "narHash": "sha256-vf2FT9x5Ua8/LA4TGXss2Y3y6xokwBauCDKsK9PcH3g=", + "owner": "holochain", + "repo": "holochain", + "rev": "eff052624aa039576c6b4d4598a7ad860a7afd50", + "type": "github" + }, + "original": { + "dir": "versions/weekly", + "owner": "holochain", + "repo": "holochain", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index f066de6..8c21c01 100644 --- a/flake.nix +++ b/flake.nix @@ -41,6 +41,7 @@ filterZomes = filterByHolochainPackageType "zome"; filterDnas = filterByHolochainPackageType "dna"; filterHapps = filterByHolochainPackageType "happ"; + filterNpmPackages = filterByHolochainPackageType "npm"; rustZome = { crateCargoToml, holochain, workspacePath, excludedCrates ? [] }: let @@ -114,6 +115,16 @@ pkgs.callPackage ./nix/happ.nix { inherit dnas holochain happManifest; }; + ui-package = { system, workspacePath, rootPath }: + let + pkgs = import inputs.nixpkgs { + inherit system; + overlays = [ (import inputs.rust-overlay) ]; + }; + in + pkgs.callPackage ./nix/ui-package.nix { + inherit workspacePath rootPath; + }; }; }; @@ -128,27 +139,33 @@ }: { devShells.default = pkgs.mkShell { - inputsFrom = [ ]; + inputsFrom = [ inputs'.holochain.devShells.holonix ]; packages = with pkgs; [ nodejs-18_x # more packages go here cargo-nextest - (let - - pkgs = import inputs.nixpkgs { - inherit system; - overlays = [ (import inputs.rust-overlay) ]; - }; - - rustToolchain = pkgs.rust-bin.nightly."2024-01-29".minimal.override { - # Set the build targets supported by the toolchain, - # wasm32-unknown-unknown is required for trunk. - targets = [ "wasm32-unknown-unknown" ]; - }; - in - rustToolchain) ]; }; + + packages.sync-npm-dependencies-with-nix = + let + craneLib = inputs.crane.lib.${system}; + + cratePath = ./crates/sync-npm-dependencies-with-nix; + + cargoToml = builtins.fromTOML (builtins.readFile "${cratePath}/Cargo.toml"); + crate = cargoToml.package.name; + + commonArgs = { + strictDeps = true; + doCheck = false; + src = craneLib.cleanCargoSource (craneLib.path cratePath); + }; + in + craneLib.buildPackage (commonArgs // { + pname = crate; + version = cargoToml.package.version; + }); }; }; } diff --git a/nix/fixture/dna.nix b/nix/fixture/dna.nix index c6d8804..20f767a 100644 --- a/nix/fixture/dna.nix +++ b/nix/fixture/dna.nix @@ -1,4 +1,4 @@ -{ inputs, ... }: +{ inputs, allZomes, ... }: { imports = [./zome/zome.nix]; @@ -15,9 +15,8 @@ }: { packages = let - allZomes = inputs.hcUtils.lib.filterZomes self'.packages; - zomes = { - } // allZomes; + zomes = (allZomes { inherit self' inputs'; }) // { + }; in { my_dna = inputs.hcUtils.outputs.lib.dna { diff --git a/nix/fixture/flake.lock b/nix/fixture/flake.lock index 3fbe6a4..a3ec57d 100644 --- a/nix/fixture/flake.lock +++ b/nix/fixture/flake.lock @@ -102,6 +102,40 @@ "type": "github" } }, + "cargo-chef_7": { + "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-chef_8": { + "flake": false, + "locked": { + "lastModified": 1672901199, + "narHash": "sha256-MHTuR4aQ1rQaBKx1vWDy2wbvcT0ZAzpkVB2zylSC+k0=", + "owner": "LukeMathWalker", + "repo": "cargo-chef", + "rev": "5c9f11578a2e0783cce27666737d50f84510b8b5", + "type": "github" + }, + "original": { + "owner": "LukeMathWalker", + "ref": "main", + "repo": "cargo-chef", + "type": "github" + } + }, "cargo-rdme": { "flake": false, "locked": { @@ -204,6 +238,40 @@ "type": "github" } }, + "cargo-rdme_7": { + "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" + } + }, + "cargo-rdme_8": { + "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" @@ -225,6 +293,8 @@ "crane_10": { "inputs": { "nixpkgs": [ + "hcUtils", + "hcUtils", "hcUtils", "hcUtils", "holochain", @@ -248,6 +318,8 @@ "crane_11": { "inputs": { "nixpkgs": [ + "hcUtils", + "hcUtils", "hcUtils", "holochain", "nixpkgs" @@ -268,6 +340,51 @@ } }, "crane_12": { + "inputs": { + "nixpkgs": [ + "hcUtils", + "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_13": { + "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_14": { "inputs": { "nixpkgs": [ "holochain", @@ -288,16 +405,41 @@ "type": "github" } }, + "crane_15": { + "inputs": { + "flake-compat": "flake-compat_8", + "flake-utils": "flake-utils_15", + "nixpkgs": [ + "profiles", + "holochain", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_15" + }, + "locked": { + "lastModified": 1675475924, + "narHash": "sha256-KWdfV9a6+zG6Ij/7PZYLnomjBZZUu8gdRy+hfjGrrJQ=", + "owner": "ipetkov", + "repo": "crane", + "rev": "1bde9c762ebf26de9f8ecf502357c92105bc4577", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "crane_2": { "inputs": { "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1709610799, - "narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=", + "lastModified": 1710003968, + "narHash": "sha256-g8+K+mLiNG5uch35Oy9oDQBAmGSkCcqrd0Jjme7xiG0=", "owner": "ipetkov", "repo": "crane", - "rev": "81c393c776d5379c030607866afef6406ca1be57", + "rev": "10484f86201bb94bd61ecc5335b1496794fedb78", "type": "github" }, "original": { @@ -347,11 +489,11 @@ "nixpkgs": "nixpkgs_5" }, "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": { @@ -380,22 +522,14 @@ }, "crane_7": { "inputs": { - "nixpkgs": [ - "hcUtils", - "hcUtils", - "hcUtils", - "hcUtils", - "hcUtils", - "holochain", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1707363936, - "narHash": "sha256-QbqyvGFYt84QNOQLOOTWplZZkzkyDhYrAl/N/9H0vFM=", + "lastModified": 1708560786, + "narHash": "sha256-gcTA/iq9mfrwGPQsoxVryWhCAgBwL2GJLGO/s06/0wY=", "owner": "ipetkov", "repo": "crane", - "rev": "9107434eda6991e9388ad87b815dafa337446d16", + "rev": "9a5972e2e8d0b1716cc4e42af8b75eca6914fbff", "type": "github" }, "original": { @@ -411,6 +545,8 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", + "hcUtils", "holochain", "nixpkgs" ] @@ -432,6 +568,8 @@ "crane_9": { "inputs": { "nixpkgs": [ + "hcUtils", + "hcUtils", "hcUtils", "hcUtils", "hcUtils", @@ -549,6 +687,38 @@ "type": "github" } }, + "crate2nix_7": { + "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" + } + }, + "crate2nix_8": { + "flake": false, + "locked": { + "lastModified": 1693149153, + "narHash": "sha256-HUszQcnIal1FFRAWraODDbxTp0HECwczRTD+Zf0v9o0=", + "owner": "kolloch", + "repo": "crate2nix", + "rev": "8749f46953b46d44fd181b002399e4a20371f323", + "type": "github" + }, + "original": { + "owner": "kolloch", + "repo": "crate2nix", + "type": "github" + } + }, "empty": { "flake": false, "locked": { @@ -645,6 +815,38 @@ "type": "github" } }, + "empty_7": { + "flake": false, + "locked": { + "lastModified": 1683792623, + "narHash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=", + "owner": "steveej", + "repo": "empty", + "rev": "8e328e450e4cd32e072eba9e99fe92cf2a1ef5cf", + "type": "github" + }, + "original": { + "owner": "steveej", + "repo": "empty", + "type": "github" + } + }, + "empty_8": { + "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": { @@ -741,6 +943,54 @@ "type": "github" } }, + "flake-compat_7": { + "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_8": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_9": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -843,6 +1093,40 @@ "type": "indirect" } }, + "flake-parts_7": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_7" + }, + "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_8": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_8" + }, + "locked": { + "lastModified": 1675295133, + "narHash": "sha256-dU8fuLL98WFXG0VnRgM00bqKX6CEPBLybhiIDIgO45o=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "bf53492df08f3178ce85e0c9df8ed8d03c030c9f", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -915,6 +1199,75 @@ "type": "github" } }, + "flake-utils_13": { + "inputs": { + "systems": "systems_13" + }, + "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_14": { + "inputs": { + "systems": "systems_14" + }, + "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_15": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_16": { + "inputs": { + "systems": "systems_15" + }, + "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" @@ -1063,18 +1416,18 @@ "inputs": { "crane": "crane", "hcUtils": "hcUtils_2", - "holochain": "holochain_9", + "holochain": "holochain_11", "nixpkgs": [ "hcUtils", "holochain", "nixpkgs" ], - "rust-overlay": "rust-overlay_11", - "versions": "versions_5" + "rust-overlay": "rust-overlay_13", + "versions": "versions_6" }, "locked": { "lastModified": 0, - "narHash": "sha256-rQi55GCNqO8XakWGPDSIKpeDmgp/oftewsKdr8I0G3Q=", + "narHash": "sha256-iHe7CO1xeAuMImRVRvwVl0JK/aQrP8Ei7OCJxumMKbM=", "path": "../..", "type": "path" }, @@ -1087,8 +1440,37 @@ "inputs": { "crane": "crane_2", "hcUtils": "hcUtils_3", + "holochain": "holochain_9", + "nixpkgs": [ + "hcUtils", + "hcUtils", + "holochain", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_11", + "versions": "versions_5" + }, + "locked": { + "lastModified": 1710170526, + "narHash": "sha256-8SMfoPrMF0nXBmN+k9Ckxy/1VFB7GWMX+ZWPQUl/ylM=", + "owner": "holochain-open-dev", + "repo": "common", + "rev": "8ae6c8817918006f25f0e38c0351809e23328df8", + "type": "github" + }, + "original": { + "owner": "holochain-open-dev", + "repo": "common", + "type": "github" + } + }, + "hcUtils_3": { + "inputs": { + "crane": "crane_3", + "hcUtils": "hcUtils_4", "holochain": "holochain_7", "nixpkgs": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", @@ -1111,15 +1493,16 @@ "type": "github" } }, - "hcUtils_3": { + "hcUtils_4": { "inputs": { - "crane": "crane_3", - "hcUtils": "hcUtils_4", + "crane": "crane_4", + "hcUtils": "hcUtils_5", "holochain": "holochain_5", "nixpkgs": [ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "nixpkgs" ], @@ -1140,16 +1523,17 @@ "type": "github" } }, - "hcUtils_4": { + "hcUtils_5": { "inputs": { - "crane": "crane_4", - "hcUtils": "hcUtils_5", + "crane": "crane_5", + "hcUtils": "hcUtils_6", "holochain": "holochain_3", "nixpkgs": [ "hcUtils", "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "nixpkgs" ], @@ -1170,10 +1554,10 @@ "type": "github" } }, - "hcUtils_5": { + "hcUtils_6": { "inputs": { - "crane": "crane_5", - "hcUtils": "hcUtils_6", + "crane": "crane_6", + "hcUtils": "hcUtils_7", "holochain": "holochain", "nixpkgs": [ "hcUtils", @@ -1181,6 +1565,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "nixpkgs" ], @@ -1201,10 +1586,10 @@ "type": "github" } }, - "hcUtils_6": { + "hcUtils_7": { "inputs": { - "crane": "crane_6", - "nixpkgs": "nixpkgs_7", + "crane": "crane_7", + "nixpkgs": "nixpkgs_8", "rust-overlay": "rust-overlay" }, "locked": { @@ -1225,7 +1610,7 @@ "inputs": { "cargo-chef": "cargo-chef", "cargo-rdme": "cargo-rdme", - "crane": "crane_7", + "crane": "crane_8", "crate2nix": "crate2nix", "empty": "empty", "flake-compat": "flake-compat", @@ -1236,6 +1621,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], @@ -1245,6 +1631,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], @@ -1254,11 +1641,12 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "repo-git": "repo-git", "rust-overlay": "rust-overlay_2", @@ -1268,6 +1656,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], @@ -1277,6 +1666,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "versions" ] }, @@ -1301,56 +1691,179 @@ "narHash": "sha256-aaixbhm+R0urE900zRpIhHWQUOtQCP2gAAxz+jcx80s=", "owner": "holochain", "repo": "holochain", - "rev": "cb671524080332983281baa2db7c1851344e79d2", + "rev": "cb671524080332983281baa2db7c1851344e79d2", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3.0-beta-dev.39", + "repo": "holochain", + "type": "github" + } + }, + "holochain_11": { + "inputs": { + "cargo-chef": "cargo-chef_6", + "cargo-rdme": "cargo-rdme_6", + "crane": "crane_13", + "crate2nix": "crate2nix_6", + "empty": "empty_6", + "flake-compat": "flake-compat_6", + "flake-parts": "flake-parts_6", + "holochain": [ + "hcUtils", + "holochain", + "empty" + ], + "lair": [ + "hcUtils", + "holochain", + "empty" + ], + "launcher": [ + "hcUtils", + "holochain", + "empty" + ], + "nix-filter": "nix-filter_6", + "nixpkgs": "nixpkgs_14", + "pre-commit-hooks-nix": "pre-commit-hooks-nix_6", + "repo-git": "repo-git_6", + "rust-overlay": "rust-overlay_12", + "scaffolding": [ + "hcUtils", + "holochain", + "empty" + ], + "versions": [ + "hcUtils", + "versions" + ] + }, + "locked": { + "lastModified": 1710225101, + "narHash": "sha256-vf2FT9x5Ua8/LA4TGXss2Y3y6xokwBauCDKsK9PcH3g=", + "owner": "holochain", + "repo": "holochain", + "rev": "eff052624aa039576c6b4d4598a7ad860a7afd50", + "type": "github" + }, + "original": { + "owner": "holochain", + "repo": "holochain", + "type": "github" + } + }, + "holochain_12": { + "flake": false, + "locked": { + "lastModified": 1709687030, + "narHash": "sha256-aaixbhm+R0urE900zRpIhHWQUOtQCP2gAAxz+jcx80s=", + "owner": "holochain", + "repo": "holochain", + "rev": "cb671524080332983281baa2db7c1851344e79d2", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3.0-beta-dev.39", + "repo": "holochain", + "type": "github" + } + }, + "holochain_13": { + "inputs": { + "cargo-chef": "cargo-chef_7", + "cargo-rdme": "cargo-rdme_7", + "crane": "crane_14", + "crate2nix": "crate2nix_7", + "empty": "empty_7", + "flake-compat": "flake-compat_7", + "flake-parts": "flake-parts_7", + "holochain": [ + "holochain", + "empty" + ], + "lair": [ + "holochain", + "empty" + ], + "launcher": [ + "holochain", + "empty" + ], + "nix-filter": "nix-filter_7", + "nixpkgs": "nixpkgs_15", + "pre-commit-hooks-nix": "pre-commit-hooks-nix_7", + "repo-git": "repo-git_7", + "rust-overlay": "rust-overlay_14", + "scaffolding": [ + "holochain", + "empty" + ], + "versions": [ + "versions" + ] + }, + "locked": { + "lastModified": 1710225101, + "narHash": "sha256-vf2FT9x5Ua8/LA4TGXss2Y3y6xokwBauCDKsK9PcH3g=", + "owner": "holochain", + "repo": "holochain", + "rev": "eff052624aa039576c6b4d4598a7ad860a7afd50", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3.0-beta-dev.39", "repo": "holochain", "type": "github" } }, - "holochain_11": { + "holochain_14": { "inputs": { - "cargo-chef": "cargo-chef_6", - "cargo-rdme": "cargo-rdme_6", - "crane": "crane_12", - "crate2nix": "crate2nix_6", - "empty": "empty_6", - "flake-compat": "flake-compat_6", - "flake-parts": "flake-parts_6", + "cargo-chef": "cargo-chef_8", + "cargo-rdme": "cargo-rdme_8", + "crane": "crane_15", + "crate2nix": "crate2nix_8", + "empty": "empty_8", + "flake-compat": "flake-compat_9", + "flake-parts": "flake-parts_8", "holochain": [ + "profiles", "holochain", "empty" ], "lair": [ + "profiles", "holochain", "empty" ], "launcher": [ + "profiles", "holochain", "empty" ], - "nix-filter": "nix-filter_6", - "nixpkgs": "nixpkgs_13", - "pre-commit-hooks-nix": "pre-commit-hooks-nix_6", - "repo-git": "repo-git_6", - "rust-overlay": "rust-overlay_12", + "nix-filter": "nix-filter_8", + "nixpkgs": "nixpkgs_16", + "pre-commit-hooks-nix": "pre-commit-hooks-nix_8", + "repo-git": "repo-git_8", + "rust-overlay": "rust-overlay_16", "scaffolding": [ + "profiles", "holochain", "empty" ], "versions": [ + "profiles", "versions" ] }, "locked": { - "lastModified": 1710138828, - "narHash": "sha256-MyZxoUdRrjIaiywthLfaBh2nUuvmgl8HSikKOoj9rxs=", + "lastModified": 1707272574, + "narHash": "sha256-BEzrfEbrrW7YP3rBdqgpfKOBHE9sO5xBlElsRL3QPaM=", "owner": "holochain", "repo": "holochain", - "rev": "5fdb77016be1925ec89cde1fffa0e9c80f9bbd92", + "rev": "137b2b8ef82d90cab61f419ee7e7df8c10fdf774", "type": "github" }, "original": { @@ -1359,7 +1872,24 @@ "type": "github" } }, - "holochain_12": { + "holochain_15": { + "flake": false, + "locked": { + "lastModified": 1707245081, + "narHash": "sha256-l9WHMlD9IDuEv/N/3WDCsP3XLUUnZFrOBEZjbWnC+/Y=", + "owner": "holochain", + "repo": "holochain", + "rev": "0a3b2408b2d6482b913b9f0faf58a39b567f763a", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.2.6", + "repo": "holochain", + "type": "github" + } + }, + "holochain_16": { "flake": false, "locked": { "lastModified": 1709687030, @@ -1397,7 +1927,7 @@ "inputs": { "cargo-chef": "cargo-chef_2", "cargo-rdme": "cargo-rdme_2", - "crane": "crane_8", + "crane": "crane_9", "crate2nix": "crate2nix_2", "empty": "empty_2", "flake-compat": "flake-compat_2", @@ -1407,6 +1937,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], @@ -1415,6 +1946,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], @@ -1423,11 +1955,12 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], "nix-filter": "nix-filter_2", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "pre-commit-hooks-nix": "pre-commit-hooks-nix_2", "repo-git": "repo-git_2", "rust-overlay": "rust-overlay_4", @@ -1436,6 +1969,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], @@ -1444,6 +1978,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "versions" ] }, @@ -1482,7 +2017,7 @@ "inputs": { "cargo-chef": "cargo-chef_3", "cargo-rdme": "cargo-rdme_3", - "crane": "crane_9", + "crane": "crane_10", "crate2nix": "crate2nix_3", "empty": "empty_3", "flake-compat": "flake-compat_3", @@ -1491,6 +2026,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], @@ -1498,6 +2034,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], @@ -1505,11 +2042,12 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], "nix-filter": "nix-filter_3", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_11", "pre-commit-hooks-nix": "pre-commit-hooks-nix_3", "repo-git": "repo-git_3", "rust-overlay": "rust-overlay_6", @@ -1517,6 +2055,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], @@ -1524,6 +2063,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "versions" ] }, @@ -1562,41 +2102,46 @@ "inputs": { "cargo-chef": "cargo-chef_4", "cargo-rdme": "cargo-rdme_4", - "crane": "crane_10", + "crane": "crane_11", "crate2nix": "crate2nix_4", "empty": "empty_4", "flake-compat": "flake-compat_4", "flake-parts": "flake-parts_4", "holochain": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", "empty" ], "lair": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", "empty" ], "launcher": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", "empty" ], "nix-filter": "nix-filter_4", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "pre-commit-hooks-nix": "pre-commit-hooks-nix_4", "repo-git": "repo-git_4", "rust-overlay": "rust-overlay_8", "scaffolding": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", "empty" ], "versions": [ + "hcUtils", "hcUtils", "hcUtils", "versions" @@ -1637,37 +2182,42 @@ "inputs": { "cargo-chef": "cargo-chef_5", "cargo-rdme": "cargo-rdme_5", - "crane": "crane_11", + "crane": "crane_12", "crate2nix": "crate2nix_5", "empty": "empty_5", "flake-compat": "flake-compat_5", "flake-parts": "flake-parts_5", "holochain": [ + "hcUtils", "hcUtils", "holochain", "empty" ], "lair": [ + "hcUtils", "hcUtils", "holochain", "empty" ], "launcher": [ + "hcUtils", "hcUtils", "holochain", "empty" ], "nix-filter": "nix-filter_5", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_13", "pre-commit-hooks-nix": "pre-commit-hooks-nix_5", "repo-git": "repo-git_5", "rust-overlay": "rust-overlay_10", "scaffolding": [ + "hcUtils", "hcUtils", "holochain", "empty" ], "versions": [ + "hcUtils", "hcUtils", "versions" ] @@ -1788,6 +2338,40 @@ "type": "github" } }, + "lair_7": { + "flake": false, + "locked": { + "lastModified": 1706550351, + "narHash": "sha256-psVjtb+zj0pZnHTj1xNP2pGBd5Ua1cSwdOAdYdUe3yQ=", + "owner": "holochain", + "repo": "lair", + "rev": "b11e65eff11c8ac3bf938607946f5c7201298a65", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "lair_keystore-v0.4.2", + "repo": "lair", + "type": "github" + } + }, + "lair_8": { + "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": { @@ -1890,6 +2474,40 @@ "type": "github" } }, + "launcher_7": { + "flake": false, + "locked": { + "lastModified": 1684183666, + "narHash": "sha256-rOE/W/BBYyZKOyypKb8X9Vpc4ty1TNRoI/fV5+01JPw=", + "owner": "holochain", + "repo": "launcher", + "rev": "75ecdd0aa191ed830cc209a984a6030e656042ff", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.2", + "repo": "launcher", + "type": "github" + } + }, + "launcher_8": { + "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, @@ -1980,6 +2598,36 @@ "type": "github" } }, + "nix-filter_7": { + "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_8": { + "locked": { + "lastModified": 1675361037, + "narHash": "sha256-CTbDuDxFD3U3g/dWUB+r+B/snIe+qqP1R+1myuFGe2I=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "e1b2f96c2a31415f362268bc48c3fccf47dff6eb", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1709386671, @@ -2104,6 +2752,42 @@ "type": "github" } }, + "nixpkgs-lib_7": { + "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_8": { + "locked": { + "dir": "lib", + "lastModified": 1675183161, + "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_10": { "locked": { "lastModified": 1709479366, @@ -2120,6 +2804,21 @@ } }, "nixpkgs_11": { + "locked": { + "lastModified": 1709479366, + "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_12": { "locked": { "lastModified": 1709703039, "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", @@ -2134,7 +2833,7 @@ "type": "indirect" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1709961763, "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", @@ -2149,7 +2848,22 @@ "type": "indirect" } }, - "nixpkgs_13": { + "nixpkgs_14": { + "locked": { + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_15": { "locked": { "lastModified": 1709961763, "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", @@ -2164,6 +2878,21 @@ "type": "indirect" } }, + "nixpkgs_16": { + "locked": { + "lastModified": 1707092692, + "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1709386671, @@ -2214,11 +2943,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1706925685, - "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", + "lastModified": 1709386671, + "narHash": "sha256-VPqfBnIJ+cfa78pd4Y5Cr6sOWVW8GYHRVucxJGmRf8Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "79a13f1437e149dc7be2d1290c74d378dad60814", + "rev": "fa9a51752f1b5de583ad5213eb621be071806663", "type": "github" }, "original": { @@ -2246,41 +2975,42 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1708603017, - "narHash": "sha256-YVMXAorB6bE+y3nFJY0OUfQERI3tyLTDqd6zuPfewp8=", - "owner": "nixos", + "lastModified": 1706925685, + "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "2a56c2ca6814a31f8211dad09302398a06acbcdf", + "rev": "79a13f1437e149dc7be2d1290c74d378dad60814", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_8": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", - "owner": "NixOS", + "lastModified": 1708603017, + "narHash": "sha256-YVMXAorB6bE+y3nFJY0OUfQERI3tyLTDqd6zuPfewp8=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "2a56c2ca6814a31f8211dad09302398a06acbcdf", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_9": { "locked": { - "lastModified": 1709479366, - "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", "type": "github" }, "original": { @@ -2385,6 +3115,62 @@ "type": "github" } }, + "pre-commit-hooks-nix_7": { + "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_8": { + "flake": false, + "locked": { + "lastModified": 1676513100, + "narHash": "sha256-MK39nQV86L2ag4TmcK5/+r1ULpzRLPbbfvWbPvIoYJE=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "5f0cba88ac4d6dd8cad5c6f6f1540b3d6a21a798", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "profiles": { + "inputs": { + "holochain": "holochain_14", + "nixpkgs": [ + "profiles", + "holochain", + "nixpkgs" + ], + "versions": "versions_7" + }, + "locked": { + "lastModified": 1707296399, + "narHash": "sha256-70ZSPYET/HOtF45TSQS82OkcZFOL6l1zpgRFGDqNa0c=", + "owner": "holochain-open-dev", + "repo": "profiles", + "rev": "a1a487c8d6a8fd9910ba9b3f26e47df0bf0d09ae", + "type": "github" + }, + "original": { + "owner": "holochain-open-dev", + "repo": "profiles", + "type": "github" + } + }, "repo-git": { "flake": false, "locked": { @@ -2457,15 +3243,40 @@ "url": "file:/dev/null" } }, + "repo-git_7": { + "flake": false, + "locked": { + "narHash": "sha256-d6xi4mKdjkX2JFicDIv5niSzpyI0m/Hnm8GGAIU04kY=", + "type": "file", + "url": "file:/dev/null" + }, + "original": { + "type": "file", + "url": "file:/dev/null" + } + }, + "repo-git_8": { + "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_11", + "holochain": "holochain_13", "nixpkgs": [ "holochain", "nixpkgs" ], - "versions": "versions_6" + "profiles": "profiles", + "versions": "versions_8" } }, "rust-overlay": { @@ -2478,6 +3289,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "nixpkgs" ] }, @@ -2499,6 +3311,7 @@ "inputs": { "flake-utils": "flake-utils_10", "nixpkgs": [ + "hcUtils", "hcUtils", "holochain", "nixpkgs" @@ -2522,6 +3335,7 @@ "inputs": { "flake-utils": "flake-utils_11", "nixpkgs": [ + "hcUtils", "hcUtils", "nixpkgs" ] @@ -2544,16 +3358,113 @@ "inputs": { "flake-utils": "flake-utils_12", "nixpkgs": [ + "hcUtils", "holochain", "nixpkgs" ] }, "locked": { - "lastModified": 1710123130, - "narHash": "sha256-EoGL/WSM1M2L099Q91mPKO/FRV2iu2ZLOEp3y5sLfiE=", + "lastModified": 1710209426, + "narHash": "sha256-A7bXK9k6RdBGsmqU4DxHqDBty7kKNkh8Pv+iGE2i1Ac=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "73aca260afe5d41d3ebce932c8d896399c9d5174", + "rev": "405cdc2652fa89f2fcf392335d5b9364b0adc5c2", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_13": { + "inputs": { + "flake-utils": "flake-utils_13", + "nixpkgs": [ + "hcUtils", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1710209426, + "narHash": "sha256-A7bXK9k6RdBGsmqU4DxHqDBty7kKNkh8Pv+iGE2i1Ac=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "405cdc2652fa89f2fcf392335d5b9364b0adc5c2", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_14": { + "inputs": { + "flake-utils": "flake-utils_14", + "nixpkgs": [ + "holochain", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1710209426, + "narHash": "sha256-A7bXK9k6RdBGsmqU4DxHqDBty7kKNkh8Pv+iGE2i1Ac=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "405cdc2652fa89f2fcf392335d5b9364b0adc5c2", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_15": { + "inputs": { + "flake-utils": [ + "profiles", + "holochain", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "profiles", + "holochain", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1675391458, + "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_16": { + "inputs": { + "flake-utils": "flake-utils_16", + "nixpkgs": [ + "profiles", + "holochain", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1707185459, + "narHash": "sha256-+GdqwnFZQ9G6pOrTGA+XzD4hg+DZZwkx2/x46fuNkL8=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "be473291b92e4e84e84a1e04e57481c848060c6c", "type": "github" }, "original": { @@ -2571,6 +3482,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "nixpkgs" ] @@ -2598,6 +3510,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "nixpkgs" ] }, @@ -2623,6 +3536,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "nixpkgs" ] @@ -2649,6 +3563,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "nixpkgs" ] }, @@ -2673,6 +3588,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "nixpkgs" ] @@ -2698,6 +3614,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "nixpkgs" ] }, @@ -2719,6 +3636,7 @@ "inputs": { "flake-utils": "flake-utils_8", "nixpkgs": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", @@ -2743,6 +3661,7 @@ "inputs": { "flake-utils": "flake-utils_9", "nixpkgs": [ + "hcUtils", "hcUtils", "hcUtils", "nixpkgs" @@ -2864,6 +3783,40 @@ "type": "github" } }, + "scaffolding_7": { + "flake": false, + "locked": { + "lastModified": 1705076186, + "narHash": "sha256-O914XeBuFulky5RqTOvsog+fbO12v0ppW+mIdO6lvKU=", + "owner": "holochain", + "repo": "scaffolding", + "rev": "42e025fe23ac0b4cd659d95e6752d2d300a8d076", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.2", + "repo": "scaffolding", + "type": "github" + } + }, + "scaffolding_8": { + "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, @@ -2924,6 +3877,51 @@ "type": "github" } }, + "systems_13": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_14": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_15": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -3168,11 +4166,57 @@ }, "locked": { "dir": "versions/weekly", - "lastModified": 1710138828, - "narHash": "sha256-MyZxoUdRrjIaiywthLfaBh2nUuvmgl8HSikKOoj9rxs=", + "lastModified": 1710225101, + "narHash": "sha256-vf2FT9x5Ua8/LA4TGXss2Y3y6xokwBauCDKsK9PcH3g=", "owner": "holochain", "repo": "holochain", - "rev": "5fdb77016be1925ec89cde1fffa0e9c80f9bbd92", + "rev": "eff052624aa039576c6b4d4598a7ad860a7afd50", + "type": "github" + }, + "original": { + "dir": "versions/weekly", + "owner": "holochain", + "repo": "holochain", + "type": "github" + } + }, + "versions_7": { + "inputs": { + "holochain": "holochain_15", + "lair": "lair_7", + "launcher": "launcher_7", + "scaffolding": "scaffolding_7" + }, + "locked": { + "dir": "versions/0_2", + "lastModified": 1707272574, + "narHash": "sha256-BEzrfEbrrW7YP3rBdqgpfKOBHE9sO5xBlElsRL3QPaM=", + "owner": "holochain", + "repo": "holochain", + "rev": "137b2b8ef82d90cab61f419ee7e7df8c10fdf774", + "type": "github" + }, + "original": { + "dir": "versions/0_2", + "owner": "holochain", + "repo": "holochain", + "type": "github" + } + }, + "versions_8": { + "inputs": { + "holochain": "holochain_16", + "lair": "lair_8", + "launcher": "launcher_8", + "scaffolding": "scaffolding_8" + }, + "locked": { + "dir": "versions/weekly", + "lastModified": 1710225101, + "narHash": "sha256-vf2FT9x5Ua8/LA4TGXss2Y3y6xokwBauCDKsK9PcH3g=", + "owner": "holochain", + "repo": "holochain", + "rev": "eff052624aa039576c6b4d4598a7ad860a7afd50", "type": "github" }, "original": { diff --git a/nix/fixture/flake.nix b/nix/fixture/flake.nix index 4feef5d..7a6900e 100644 --- a/nix/fixture/flake.nix +++ b/nix/fixture/flake.nix @@ -11,13 +11,31 @@ inputs.versions.follows = "versions"; }; hcUtils.url = "path:../.."; + profiles.url = "github:holochain-open-dev/profiles"; }; outputs = inputs @ { ... }: inputs.holochain.inputs.flake-parts.lib.mkFlake { inherit inputs; - specialArgs.rootPath = ./.; + specialArgs = rec { + rootPath = ./.; + holochainSources = inputs': with inputs'; [ + profiles + # ... and add the name of the repository here as well + ]; + + # Aggregators: take all the packages from this repository and the upstream + # holochain sources and merge them + allHolochainPackages = { inputs', self' }: inputs.nixpkgs.lib.attrsets.mergeAttrsList ( + [ self'.packages ] + ++ builtins.map (s: s.packages) (holochainSources inputs') + ); + allZomes = { inputs', self' }: inputs.hcUtils.outputs.lib.filterZomes (allHolochainPackages { inherit inputs' self'; }); + allDnas = { inputs', self' }: inputs.hcUtils.outputs.lib.filterDnas (allHolochainPackages { inherit inputs' self'; }); + allHapps = { inputs', self' }: inputs.hcUtils.outputs.lib.filterHapps (allHolochainPackages { inherit inputs' self'; }); + allNpmPackages = { inputs', self' }: inputs.hcUtils.outputs.lib.filterNpmPackages (allHolochainPackages { inherit inputs' self'; }); + }; } { imports = [ @@ -39,7 +57,13 @@ nodejs_20 # more packages go here cargo-nextest + ] ++ [ + inputs'.hcUtils.packages.sync-npm-dependencies-with-nix ]; + + shellHook = '' + sync-npm-dependencies-with-nix ${builtins.trace config "hey"} + ''; }; }; diff --git a/nix/fixture/happ.nix b/nix/fixture/happ.nix index 3a149a7..4f53aed 100644 --- a/nix/fixture/happ.nix +++ b/nix/fixture/happ.nix @@ -1,4 +1,4 @@ -{ inputs, ... }: +{ inputs, allDnas, ... }: { imports = [./dna.nix]; @@ -16,9 +16,8 @@ packages = let happManifest = ./happ.yaml; - allDnas = inputs.hcUtils.lib.filterDnas self'.packages; - dnas = { - } // allDnas; + dnas = (allDnas { inherit self' inputs'; }) // { + }; in { my_happ = inputs.hcUtils.outputs.lib.happ { diff --git a/nix/fixture/package-lock.json b/nix/fixture/package-lock.json new file mode 100644 index 0000000..3401a5c --- /dev/null +++ b/nix/fixture/package-lock.json @@ -0,0 +1,64 @@ +{ + "name": "fixture", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "fixture", + "version": "1.0.0", + "license": "ISC", + "workspaces": [ + "./zome/" + ] + }, + "../../../../../../../../nix/store/hqsw2yppsm6gr4jdrqmxlrdm48j1397c--holochain-open-dev-profiles-0.0.0/lib/node_modules/@holochain-open-dev/profiles-dev": { + "version": "0.17.2", + "license": "MIT", + "dependencies": { + "@holochain-open-dev/elements": "^0.8.3", + "@holochain-open-dev/stores": "^0.8.11", + "@holochain-open-dev/utils": "^0.16.2", + "@holochain/client": "^0.17.0-dev.7", + "@lit/context": "^1.0.1", + "@lit/localize": "^0.12.0", + "@mdi/js": "^7.1.96", + "@shoelace-style/shoelace": "^2.11.0", + "lit": "^3.0.2" + }, + "devDependencies": { + "@custom-elements-manifest/analyzer": "^0.5.7", + "@lit/localize-tools": "^0.6.3", + "@open-wc/eslint-config": "^2.0.0", + "@types/node": "14.11.1", + "@typescript-eslint/eslint-plugin": "^5.49.0", + "@typescript-eslint/parser": "^5.49.0", + "bestzip": "^2.2.1", + "concurrently": "^5.1.0", + "deepmerge": "^3.2.0", + "eslint": "^7.1.0", + "eslint-config-prettier": "^6.11.0", + "prettier": "^2.0.4", + "tslib": "^2.0.0", + "typescript": "^4.9.0", + "vite": "^4.0.4", + "vite-plugin-checker": "^0.5.3" + } + }, + "node_modules/@holochain-open-dev/profiles": { + "resolved": "../../../../../../../../nix/store/hqsw2yppsm6gr4jdrqmxlrdm48j1397c--holochain-open-dev-profiles-0.0.0/lib/node_modules/@holochain-open-dev/profiles-dev", + "link": true + }, + "node_modules/zome": { + "resolved": "zome", + "link": true + }, + "zome": { + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "@holochain-open-dev/profiles": "file:/nix/store/hqsw2yppsm6gr4jdrqmxlrdm48j1397c--holochain-open-dev-profiles-0.0.0/lib/node_modules/@holochain-open-dev/profiles-dev" + } + } + } +} diff --git a/nix/fixture/package.json b/nix/fixture/package.json new file mode 100644 index 0000000..4429609 --- /dev/null +++ b/nix/fixture/package.json @@ -0,0 +1,9 @@ +{ + "name": "fixture", + "version": "1.0.0", + "description": "", + "workspaces": ["./zome/"], + "keywords": [], + "author": "", + "license": "ISC" +} diff --git a/nix/fixture/zome/index.js b/nix/fixture/zome/index.js new file mode 100644 index 0000000..02c5374 --- /dev/null +++ b/nix/fixture/zome/index.js @@ -0,0 +1 @@ +import { } from '@holochain-open-dev/profiles'; diff --git a/nix/fixture/zome/package.json b/nix/fixture/zome/package.json new file mode 100644 index 0000000..8692ca0 --- /dev/null +++ b/nix/fixture/zome/package.json @@ -0,0 +1,16 @@ +{ + "name": "zome", + "version": "1.0.0", + "description": "", + "main": "index.js", + "type": "module", + "scripts": { + "start": "node index.js" + }, + "dependencies": { + "@holochain-open-dev/profiles": "file:/nix/store/hqsw2yppsm6gr4jdrqmxlrdm48j1397c--holochain-open-dev-profiles-0.0.0/lib/node_modules/@holochain-open-dev/profiles-dev" + }, + "keywords": [], + "author": "", + "license": "ISC" +} diff --git a/nix/ui-package.nix b/nix/ui-package.nix new file mode 100644 index 0000000..aca1f1b --- /dev/null +++ b/nix/ui-package.nix @@ -0,0 +1,32 @@ +{ + pkgs, + workspacePath, + rootPath +}: + +let + rootPackageJson = builtins.fromJSON (builtins.readFile "${rootPath}/package.json"); + packageJson = builtins.fromJSON (builtins.readFile "${workspacePath}/package.json"); + builtNodeModules = pkgs.buildNpmPackage { + pname = packageJson.name; + version = "0.0.0"; + src = rootPath; + npmWorkspace = workspacePath; + npmDeps = pkgs.importNpmLock { + npmRoot = rootPath; + }; + npmConfigHook = pkgs.importNpmLock.npmConfigHook; + }; +in + pkgs.runCommandLocal packageJson.name { + meta = { + holochainPackageType = "npm"; + packageName = packageJson.name; + }; + } '' + set -e + cd ${builtNodeModules}/lib/node_modules/${rootPackageJson.name} + mkdir $out + mkdir $out/lib + ${pkgs.rsync}/bin/rsync -aP --exclude=node_modules ./* $out/lib + ''