From af0b17cad1a9992427f18c81a8644c3488276853 Mon Sep 17 00:00:00 2001 From: "guillem.cordoba" Date: Fri, 8 Mar 2024 23:00:42 +0100 Subject: [PATCH] WIP --- flake.lock | 582 +++++++++++++++++++++++++-- nix/fixture/Cargo.toml | 4 +- nix/fixture/flake.lock | 663 ++++++++++++++++++++++++++++--- nix/vendored-sources-config.toml | 6 + nix/zome.nix | 28 +- 5 files changed, 1188 insertions(+), 95 deletions(-) create mode 100644 nix/vendored-sources-config.toml diff --git a/flake.lock b/flake.lock index 3ef6419..181397e 100644 --- a/flake.lock +++ b/flake.lock @@ -51,6 +51,23 @@ "type": "github" } }, + "cargo-chef_4": { + "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": { @@ -102,6 +119,23 @@ "type": "github" } }, + "cargo-rdme_4": { + "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" @@ -143,11 +177,11 @@ "nixpkgs": "nixpkgs_3" }, "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": { @@ -175,8 +209,27 @@ } }, "crane_5": { + "inputs": { + "nixpkgs": "nixpkgs_5" + }, + "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_6": { "inputs": { "nixpkgs": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", @@ -197,9 +250,10 @@ "type": "github" } }, - "crane_6": { + "crane_7": { "inputs": { "nixpkgs": [ + "hcUtils", "hcUtils", "holochain", "nixpkgs" @@ -219,7 +273,29 @@ "type": "github" } }, - "crane_7": { + "crane_8": { + "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_9": { "inputs": { "nixpkgs": [ "holochain", @@ -288,6 +364,22 @@ "type": "github" } }, + "crate2nix_4": { + "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": { @@ -336,6 +428,22 @@ "type": "github" } }, + "empty_4": { + "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": { @@ -384,6 +492,22 @@ "type": "github" } }, + "flake-compat_4": { + "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" @@ -435,6 +559,23 @@ "type": "indirect" } }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_4" + }, + "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" @@ -561,12 +702,76 @@ "type": "github" } }, + "flake-utils_8": { + "inputs": { + "systems": "systems_8" + }, + "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_9": { + "inputs": { + "systems": "systems_9" + }, + "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_2", "hcUtils": "hcUtils_2", + "holochain": "holochain_5", + "nixpkgs": [ + "hcUtils", + "holochain", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_7", + "versions": "versions_3" + }, + "locked": { + "lastModified": 1709847264, + "narHash": "sha256-209E9O8Ck/2fHMkjLVQ7/RlDfQtHJRh/vP+B8jFDQHE=", + "owner": "holochain-open-dev", + "repo": "common", + "rev": "5b8365d3a970df9038a4518dee76c0e40a5de813", + "type": "github" + }, + "original": { + "owner": "holochain-open-dev", + "repo": "common", + "type": "github" + } + }, + "hcUtils_2": { + "inputs": { + "crane": "crane_3", + "hcUtils": "hcUtils_3", "holochain": "holochain_3", "nixpkgs": [ + "hcUtils", "hcUtils", "holochain", "nixpkgs" @@ -588,12 +793,13 @@ "type": "github" } }, - "hcUtils_2": { + "hcUtils_3": { "inputs": { - "crane": "crane_3", - "hcUtils": "hcUtils_3", + "crane": "crane_4", + "hcUtils": "hcUtils_4", "holochain": "holochain", "nixpkgs": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", @@ -616,10 +822,10 @@ "type": "github" } }, - "hcUtils_3": { + "hcUtils_4": { "inputs": { - "crane": "crane_4", - "nixpkgs": "nixpkgs_5", + "crane": "crane_5", + "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay" }, "locked": { @@ -640,41 +846,46 @@ "inputs": { "cargo-chef": "cargo-chef", "cargo-rdme": "cargo-rdme", - "crane": "crane_5", + "crane": "crane_6", "crate2nix": "crate2nix", "empty": "empty", "flake-compat": "flake-compat", "flake-parts": "flake-parts", "holochain": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", "empty" ], "lair": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", "empty" ], "launcher": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", "empty" ], "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "repo-git": "repo-git", "rust-overlay": "rust-overlay_2", "scaffolding": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", "empty" ], "versions": [ + "hcUtils", "hcUtils", "hcUtils", "versions" @@ -715,37 +926,42 @@ "inputs": { "cargo-chef": "cargo-chef_2", "cargo-rdme": "cargo-rdme_2", - "crane": "crane_6", + "crane": "crane_7", "crate2nix": "crate2nix_2", "empty": "empty_2", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", "holochain": [ + "hcUtils", "hcUtils", "holochain", "empty" ], "lair": [ + "hcUtils", "hcUtils", "holochain", "empty" ], "launcher": [ + "hcUtils", "hcUtils", "holochain", "empty" ], "nix-filter": "nix-filter_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "pre-commit-hooks-nix": "pre-commit-hooks-nix_2", "repo-git": "repo-git_2", "rust-overlay": "rust-overlay_4", "scaffolding": [ + "hcUtils", "hcUtils", "holochain", "empty" ], "versions": [ + "hcUtils", "hcUtils", "versions" ] @@ -785,33 +1001,38 @@ "inputs": { "cargo-chef": "cargo-chef_3", "cargo-rdme": "cargo-rdme_3", - "crane": "crane_7", + "crane": "crane_8", "crate2nix": "crate2nix_3", "empty": "empty_3", "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_3", "holochain": [ + "hcUtils", "holochain", "empty" ], "lair": [ + "hcUtils", "holochain", "empty" ], "launcher": [ + "hcUtils", "holochain", "empty" ], "nix-filter": "nix-filter_3", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "pre-commit-hooks-nix": "pre-commit-hooks-nix_3", "repo-git": "repo-git_3", "rust-overlay": "rust-overlay_6", "scaffolding": [ + "hcUtils", "holochain", "empty" ], "versions": [ + "hcUtils", "versions" ] }, @@ -846,6 +1067,71 @@ "type": "github" } }, + "holochain_7": { + "inputs": { + "cargo-chef": "cargo-chef_4", + "cargo-rdme": "cargo-rdme_4", + "crane": "crane_9", + "crate2nix": "crate2nix_4", + "empty": "empty_4", + "flake-compat": "flake-compat_4", + "flake-parts": "flake-parts_4", + "holochain": [ + "holochain", + "empty" + ], + "lair": [ + "holochain", + "empty" + ], + "launcher": [ + "holochain", + "empty" + ], + "nix-filter": "nix-filter_4", + "nixpkgs": "nixpkgs_10", + "pre-commit-hooks-nix": "pre-commit-hooks-nix_4", + "repo-git": "repo-git_4", + "rust-overlay": "rust-overlay_8", + "scaffolding": [ + "holochain", + "empty" + ], + "versions": [ + "versions" + ] + }, + "locked": { + "lastModified": 1709879507, + "narHash": "sha256-62ksNmQzgtsOlA6OFsdmVwUd6Me8g114DO9U4G23Ovk=", + "owner": "holochain", + "repo": "holochain", + "rev": "ef5d8cb9f6b57e208dff52ea173f13a1aaf46cce", + "type": "github" + }, + "original": { + "owner": "holochain", + "repo": "holochain", + "type": "github" + } + }, + "holochain_8": { + "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" + } + }, "lair": { "flake": false, "locked": { @@ -897,6 +1183,23 @@ "type": "github" } }, + "lair_4": { + "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": { @@ -948,6 +1251,23 @@ "type": "github" } }, + "launcher_4": { + "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, @@ -993,6 +1313,21 @@ "type": "github" } }, + "nix-filter_4": { + "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, @@ -1063,6 +1398,39 @@ "type": "github" } }, + "nixpkgs-lib_4": { + "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": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1709386671, @@ -1080,6 +1448,22 @@ } }, "nixpkgs_3": { + "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_4": { "locked": { "lastModified": 1706925685, "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", @@ -1095,7 +1479,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1706925685, "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", @@ -1111,7 +1495,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1708603017, "narHash": "sha256-YVMXAorB6bE+y3nFJY0OUfQERI3tyLTDqd6zuPfewp8=", @@ -1126,7 +1510,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1708475490, "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", @@ -1141,7 +1525,7 @@ "type": "indirect" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1709479366, "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", @@ -1156,7 +1540,7 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1709479366, "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", @@ -1219,6 +1603,22 @@ "type": "github" } }, + "pre-commit-hooks-nix_4": { + "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": { @@ -1255,17 +1655,29 @@ "url": "file:/dev/null" } }, + "repo-git_4": { + "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_5", + "holochain": "holochain_7", "nixpkgs": [ "holochain", "nixpkgs" ], - "rust-overlay": "rust-overlay_7", - "versions": "versions_3" + "rust-overlay": "rust-overlay_9", + "versions": "versions_4" } }, "rust-overlay": { @@ -1275,6 +1687,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "nixpkgs" ] }, @@ -1296,6 +1709,7 @@ "inputs": { "flake-utils": "flake-utils_2", "nixpkgs": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", @@ -1320,6 +1734,7 @@ "inputs": { "flake-utils": "flake-utils_3", "nixpkgs": [ + "hcUtils", "hcUtils", "hcUtils", "nixpkgs" @@ -1343,6 +1758,7 @@ "inputs": { "flake-utils": "flake-utils_4", "nixpkgs": [ + "hcUtils", "hcUtils", "holochain", "nixpkgs" @@ -1366,6 +1782,7 @@ "inputs": { "flake-utils": "flake-utils_5", "nixpkgs": [ + "hcUtils", "hcUtils", "nixpkgs" ] @@ -1388,6 +1805,7 @@ "inputs": { "flake-utils": "flake-utils_6", "nixpkgs": [ + "hcUtils", "holochain", "nixpkgs" ] @@ -1410,6 +1828,7 @@ "inputs": { "flake-utils": "flake-utils_7", "nixpkgs": [ + "hcUtils", "nixpkgs" ] }, @@ -1427,6 +1846,49 @@ "type": "github" } }, + "rust-overlay_8": { + "inputs": { + "flake-utils": "flake-utils_8", + "nixpkgs": [ + "holochain", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709863839, + "narHash": "sha256-QpEL5FmZNi2By3sKZY55wGniFXc4wEn9PQczlE8TG0o=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "e5ab9ee98f479081ad971473d2bc13c59e9fbc0a", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_9": { + "inputs": { + "flake-utils": "flake-utils_9", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709863839, + "narHash": "sha256-QpEL5FmZNi2By3sKZY55wGniFXc4wEn9PQczlE8TG0o=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "e5ab9ee98f479081ad971473d2bc13c59e9fbc0a", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "scaffolding": { "flake": false, "locked": { @@ -1478,6 +1940,23 @@ "type": "github" } }, + "scaffolding_4": { + "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, @@ -1583,6 +2062,36 @@ "type": "github" } }, + "systems_8": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_9": { + "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", @@ -1651,6 +2160,29 @@ "repo": "holochain", "type": "github" } + }, + "versions_4": { + "inputs": { + "holochain": "holochain_8", + "lair": "lair_4", + "launcher": "launcher_4", + "scaffolding": "scaffolding_4" + }, + "locked": { + "dir": "versions/weekly", + "lastModified": 1709879507, + "narHash": "sha256-62ksNmQzgtsOlA6OFsdmVwUd6Me8g114DO9U4G23Ovk=", + "owner": "holochain", + "repo": "holochain", + "rev": "ef5d8cb9f6b57e208dff52ea173f13a1aaf46cce", + "type": "github" + }, + "original": { + "dir": "versions/weekly", + "owner": "holochain", + "repo": "holochain", + "type": "github" + } } }, "root": "root", diff --git a/nix/fixture/Cargo.toml b/nix/fixture/Cargo.toml index 968730a..2025ab1 100644 --- a/nix/fixture/Cargo.toml +++ b/nix/fixture/Cargo.toml @@ -1,4 +1,4 @@ -cargo-features = ["trim-paths"] +# cargo-features = ["trim-paths"] [workspace] members = ["zome"] @@ -12,6 +12,6 @@ serde = "1" [profile.release] opt-level = "z" -trim-paths = true +# trim-paths = true codegen-units = 1 # remap-debuginfo = true diff --git a/nix/fixture/flake.lock b/nix/fixture/flake.lock index fd64eef..41e3ee4 100644 --- a/nix/fixture/flake.lock +++ b/nix/fixture/flake.lock @@ -68,6 +68,23 @@ "type": "github" } }, + "cargo-chef_5": { + "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": { @@ -136,6 +153,23 @@ "type": "github" } }, + "cargo-rdme_5": { + "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" @@ -154,6 +188,27 @@ "type": "github" } }, + "crane_10": { + "inputs": { + "nixpkgs": [ + "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_2": { "inputs": { "nixpkgs": "nixpkgs_2" @@ -177,11 +232,11 @@ "nixpkgs": "nixpkgs_3" }, "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": { @@ -209,11 +264,30 @@ } }, "crane_5": { + "inputs": { + "nixpkgs": "nixpkgs_5" + }, + "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_6": { "inputs": { "nixpkgs": [ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "nixpkgs" ] @@ -232,9 +306,10 @@ "type": "github" } }, - "crane_6": { + "crane_7": { "inputs": { "nixpkgs": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", @@ -255,9 +330,10 @@ "type": "github" } }, - "crane_7": { + "crane_8": { "inputs": { "nixpkgs": [ + "hcUtils", "hcUtils", "holochain", "nixpkgs" @@ -277,9 +353,10 @@ "type": "github" } }, - "crane_8": { + "crane_9": { "inputs": { "nixpkgs": [ + "hcUtils", "holochain", "nixpkgs" ] @@ -362,6 +439,22 @@ "type": "github" } }, + "crate2nix_5": { + "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": { @@ -426,6 +519,22 @@ "type": "github" } }, + "empty_5": { + "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": { @@ -490,6 +599,22 @@ "type": "github" } }, + "flake-compat_5": { + "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" @@ -558,6 +683,23 @@ "type": "indirect" } }, + "flake-parts_5": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_5" + }, + "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" @@ -576,6 +718,24 @@ "type": "github" } }, + "flake-utils_10": { + "inputs": { + "systems": "systems_10" + }, + "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" @@ -702,22 +862,40 @@ "type": "github" } }, + "flake-utils_9": { + "inputs": { + "systems": "systems_9" + }, + "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_5", + "holochain": "holochain_7", "nixpkgs": [ "hcUtils", "holochain", "nixpkgs" ], - "rust-overlay": "rust-overlay_7", - "versions": "versions_3" + "rust-overlay": "rust-overlay_9", + "versions": "versions_4" }, "locked": { "lastModified": 0, - "narHash": "sha256-tGdMa5qZOHvnpo3VE55aW/37bxlMUHsvNsFz6uoxKtU=", + "narHash": "sha256-UVmiSzZu340XYZW134mqFl58eHvTFIx6s3QTejbLplA=", "path": "../..", "type": "path" }, @@ -730,8 +908,37 @@ "inputs": { "crane": "crane_2", "hcUtils": "hcUtils_3", + "holochain": "holochain_5", + "nixpkgs": [ + "hcUtils", + "hcUtils", + "holochain", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_7", + "versions": "versions_3" + }, + "locked": { + "lastModified": 1709847264, + "narHash": "sha256-209E9O8Ck/2fHMkjLVQ7/RlDfQtHJRh/vP+B8jFDQHE=", + "owner": "holochain-open-dev", + "repo": "common", + "rev": "5b8365d3a970df9038a4518dee76c0e40a5de813", + "type": "github" + }, + "original": { + "owner": "holochain-open-dev", + "repo": "common", + "type": "github" + } + }, + "hcUtils_3": { + "inputs": { + "crane": "crane_3", + "hcUtils": "hcUtils_4", "holochain": "holochain_3", "nixpkgs": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", @@ -754,15 +961,16 @@ "type": "github" } }, - "hcUtils_3": { + "hcUtils_4": { "inputs": { - "crane": "crane_3", - "hcUtils": "hcUtils_4", + "crane": "crane_4", + "hcUtils": "hcUtils_5", "holochain": "holochain", "nixpkgs": [ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "nixpkgs" ], @@ -783,10 +991,10 @@ "type": "github" } }, - "hcUtils_4": { + "hcUtils_5": { "inputs": { - "crane": "crane_4", - "nixpkgs": "nixpkgs_5", + "crane": "crane_5", + "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay" }, "locked": { @@ -807,7 +1015,7 @@ "inputs": { "cargo-chef": "cargo-chef", "cargo-rdme": "cargo-rdme", - "crane": "crane_5", + "crane": "crane_6", "crate2nix": "crate2nix", "empty": "empty", "flake-compat": "flake-compat", @@ -816,6 +1024,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], @@ -823,6 +1032,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], @@ -830,11 +1040,12 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "repo-git": "repo-git", "rust-overlay": "rust-overlay_2", @@ -842,6 +1053,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "empty" ], @@ -849,6 +1061,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "versions" ] }, @@ -866,6 +1079,23 @@ "type": "github" } }, + "holochain_10": { + "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": { @@ -887,41 +1117,46 @@ "inputs": { "cargo-chef": "cargo-chef_2", "cargo-rdme": "cargo-rdme_2", - "crane": "crane_6", + "crane": "crane_7", "crate2nix": "crate2nix_2", "empty": "empty_2", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", "holochain": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", "empty" ], "lair": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", "empty" ], "launcher": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", "empty" ], "nix-filter": "nix-filter_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "pre-commit-hooks-nix": "pre-commit-hooks-nix_2", "repo-git": "repo-git_2", "rust-overlay": "rust-overlay_4", "scaffolding": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", "empty" ], "versions": [ + "hcUtils", "hcUtils", "hcUtils", "versions" @@ -962,37 +1197,42 @@ "inputs": { "cargo-chef": "cargo-chef_3", "cargo-rdme": "cargo-rdme_3", - "crane": "crane_7", + "crane": "crane_8", "crate2nix": "crate2nix_3", "empty": "empty_3", "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_3", "holochain": [ + "hcUtils", "hcUtils", "holochain", "empty" ], "lair": [ + "hcUtils", "hcUtils", "holochain", "empty" ], "launcher": [ + "hcUtils", "hcUtils", "holochain", "empty" ], "nix-filter": "nix-filter_3", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "pre-commit-hooks-nix": "pre-commit-hooks-nix_3", "repo-git": "repo-git_3", "rust-overlay": "rust-overlay_6", "scaffolding": [ + "hcUtils", "hcUtils", "holochain", "empty" ], "versions": [ + "hcUtils", "hcUtils", "versions" ] @@ -1032,42 +1272,47 @@ "inputs": { "cargo-chef": "cargo-chef_4", "cargo-rdme": "cargo-rdme_4", - "crane": "crane_8", + "crane": "crane_9", "crate2nix": "crate2nix_4", "empty": "empty_4", "flake-compat": "flake-compat_4", "flake-parts": "flake-parts_4", "holochain": [ + "hcUtils", "holochain", "empty" ], "lair": [ + "hcUtils", "holochain", "empty" ], "launcher": [ + "hcUtils", "holochain", "empty" ], "nix-filter": "nix-filter_4", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "pre-commit-hooks-nix": "pre-commit-hooks-nix_4", "repo-git": "repo-git_4", "rust-overlay": "rust-overlay_8", "scaffolding": [ + "hcUtils", "holochain", "empty" ], "versions": [ + "hcUtils", "versions" ] }, "locked": { - "lastModified": 1709815034, - "narHash": "sha256-38D5vqw30r6eYGfPUtjD5YqnkZDMLTlsn3NGmzWOUaQ=", + "lastModified": 1709879507, + "narHash": "sha256-62ksNmQzgtsOlA6OFsdmVwUd6Me8g114DO9U4G23Ovk=", "owner": "holochain", "repo": "holochain", - "rev": "adb0030cf2de28895437026c49e2b5c6ff876895", + "rev": "ef5d8cb9f6b57e208dff52ea173f13a1aaf46cce", "type": "github" }, "original": { @@ -1082,18 +1327,83 @@ "lastModified": 1709687030, "narHash": "sha256-aaixbhm+R0urE900zRpIhHWQUOtQCP2gAAxz+jcx80s=", "owner": "holochain", - "repo": "holochain", - "rev": "cb671524080332983281baa2db7c1851344e79d2", + "repo": "holochain", + "rev": "cb671524080332983281baa2db7c1851344e79d2", + "type": "github" + }, + "original": { + "owner": "holochain", + "ref": "holochain-0.3.0-beta-dev.39", + "repo": "holochain", + "type": "github" + } + }, + "holochain_9": { + "inputs": { + "cargo-chef": "cargo-chef_5", + "cargo-rdme": "cargo-rdme_5", + "crane": "crane_10", + "crate2nix": "crate2nix_5", + "empty": "empty_5", + "flake-compat": "flake-compat_5", + "flake-parts": "flake-parts_5", + "holochain": [ + "holochain", + "empty" + ], + "lair": [ + "holochain", + "empty" + ], + "launcher": [ + "holochain", + "empty" + ], + "nix-filter": "nix-filter_5", + "nixpkgs": "nixpkgs_11", + "pre-commit-hooks-nix": "pre-commit-hooks-nix_5", + "repo-git": "repo-git_5", + "rust-overlay": "rust-overlay_10", + "scaffolding": [ + "holochain", + "empty" + ], + "versions": [ + "versions" + ] + }, + "locked": { + "lastModified": 1709918081, + "narHash": "sha256-g51IqIcrFQAyLocRFXgQV7mskTqLC6yQypX3gQFKmG8=", + "owner": "holochain", + "repo": "holochain", + "rev": "f76e144e3ae96156207b665c9cc686452e430017", + "type": "github" + }, + "original": { + "owner": "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": "holochain-0.3.0-beta-dev.39", - "repo": "holochain", + "ref": "lair_keystore-v0.4.3", + "repo": "lair", "type": "github" } }, - "lair": { + "lair_2": { "flake": false, "locked": { "lastModified": 1706569525, @@ -1110,7 +1420,7 @@ "type": "github" } }, - "lair_2": { + "lair_3": { "flake": false, "locked": { "lastModified": 1706569525, @@ -1127,7 +1437,7 @@ "type": "github" } }, - "lair_3": { + "lair_4": { "flake": false, "locked": { "lastModified": 1706569525, @@ -1144,7 +1454,7 @@ "type": "github" } }, - "lair_4": { + "lair_5": { "flake": false, "locked": { "lastModified": 1706569525, @@ -1229,6 +1539,23 @@ "type": "github" } }, + "launcher_5": { + "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, @@ -1289,6 +1616,21 @@ "type": "github" } }, + "nix-filter_5": { + "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, @@ -1377,6 +1719,54 @@ "type": "github" } }, + "nixpkgs-lib_5": { + "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": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1709386671, @@ -1394,6 +1784,22 @@ } }, "nixpkgs_3": { + "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_4": { "locked": { "lastModified": 1706925685, "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", @@ -1409,7 +1815,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1706925685, "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", @@ -1425,7 +1831,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1708603017, "narHash": "sha256-YVMXAorB6bE+y3nFJY0OUfQERI3tyLTDqd6zuPfewp8=", @@ -1440,7 +1846,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1708475490, "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", @@ -1455,7 +1861,7 @@ "type": "indirect" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1709479366, "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", @@ -1470,7 +1876,7 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1709479366, "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", @@ -1485,22 +1891,23 @@ "type": "indirect" } }, - "nixpkgs_9": { + "pre-commit-hooks-nix": { + "flake": false, "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "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, @@ -1516,7 +1923,7 @@ "type": "github" } }, - "pre-commit-hooks-nix_2": { + "pre-commit-hooks-nix_3": { "flake": false, "locked": { "lastModified": 1707297608, @@ -1532,7 +1939,7 @@ "type": "github" } }, - "pre-commit-hooks-nix_3": { + "pre-commit-hooks-nix_4": { "flake": false, "locked": { "lastModified": 1707297608, @@ -1548,7 +1955,7 @@ "type": "github" } }, - "pre-commit-hooks-nix_4": { + "pre-commit-hooks-nix_5": { "flake": false, "locked": { "lastModified": 1707297608, @@ -1612,15 +2019,27 @@ "url": "file:/dev/null" } }, + "repo-git_5": { + "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_7", + "holochain": "holochain_9", "nixpkgs": [ "holochain", "nixpkgs" ], - "versions": "versions_4" + "versions": "versions_5" } }, "rust-overlay": { @@ -1631,6 +2050,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "nixpkgs" ] }, @@ -1648,6 +2068,28 @@ "type": "github" } }, + "rust-overlay_10": { + "inputs": { + "flake-utils": "flake-utils_10", + "nixpkgs": [ + "holochain", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709863839, + "narHash": "sha256-QpEL5FmZNi2By3sKZY55wGniFXc4wEn9PQczlE8TG0o=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "e5ab9ee98f479081ad971473d2bc13c59e9fbc0a", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "rust-overlay_2": { "inputs": { "flake-utils": "flake-utils_2", @@ -1655,6 +2097,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "holochain", "nixpkgs" ] @@ -1680,6 +2123,7 @@ "hcUtils", "hcUtils", "hcUtils", + "hcUtils", "nixpkgs" ] }, @@ -1701,6 +2145,7 @@ "inputs": { "flake-utils": "flake-utils_4", "nixpkgs": [ + "hcUtils", "hcUtils", "hcUtils", "holochain", @@ -1725,6 +2170,7 @@ "inputs": { "flake-utils": "flake-utils_5", "nixpkgs": [ + "hcUtils", "hcUtils", "hcUtils", "nixpkgs" @@ -1748,6 +2194,7 @@ "inputs": { "flake-utils": "flake-utils_6", "nixpkgs": [ + "hcUtils", "hcUtils", "holochain", "nixpkgs" @@ -1771,6 +2218,7 @@ "inputs": { "flake-utils": "flake-utils_7", "nixpkgs": [ + "hcUtils", "hcUtils", "nixpkgs" ] @@ -1793,16 +2241,39 @@ "inputs": { "flake-utils": "flake-utils_8", "nixpkgs": [ + "hcUtils", "holochain", "nixpkgs" ] }, "locked": { - "lastModified": 1709777204, - "narHash": "sha256-ORUtu+GmrQwNc51mCIjxa/8DdOS901npphBL7k5aXX0=", + "lastModified": 1709863839, + "narHash": "sha256-QpEL5FmZNi2By3sKZY55wGniFXc4wEn9PQczlE8TG0o=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "e5ab9ee98f479081ad971473d2bc13c59e9fbc0a", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_9": { + "inputs": { + "flake-utils": "flake-utils_9", + "nixpkgs": [ + "hcUtils", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709863839, + "narHash": "sha256-QpEL5FmZNi2By3sKZY55wGniFXc4wEn9PQczlE8TG0o=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7fdb7a7a846dc1f407cd6b24af04a0b8d018c3de", + "rev": "e5ab9ee98f479081ad971473d2bc13c59e9fbc0a", "type": "github" }, "original": { @@ -1879,6 +2350,23 @@ "type": "github" } }, + "scaffolding_5": { + "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, @@ -1894,6 +2382,21 @@ "type": "github" } }, + "systems_10": { + "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, @@ -1999,6 +2502,21 @@ "type": "github" } }, + "systems_9": { + "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", @@ -2077,11 +2595,34 @@ }, "locked": { "dir": "versions/weekly", - "lastModified": 1709815034, - "narHash": "sha256-38D5vqw30r6eYGfPUtjD5YqnkZDMLTlsn3NGmzWOUaQ=", + "lastModified": 1709879507, + "narHash": "sha256-62ksNmQzgtsOlA6OFsdmVwUd6Me8g114DO9U4G23Ovk=", + "owner": "holochain", + "repo": "holochain", + "rev": "ef5d8cb9f6b57e208dff52ea173f13a1aaf46cce", + "type": "github" + }, + "original": { + "dir": "versions/weekly", + "owner": "holochain", + "repo": "holochain", + "type": "github" + } + }, + "versions_5": { + "inputs": { + "holochain": "holochain_10", + "lair": "lair_5", + "launcher": "launcher_5", + "scaffolding": "scaffolding_5" + }, + "locked": { + "dir": "versions/weekly", + "lastModified": 1709918081, + "narHash": "sha256-g51IqIcrFQAyLocRFXgQV7mskTqLC6yQypX3gQFKmG8=", "owner": "holochain", "repo": "holochain", - "rev": "adb0030cf2de28895437026c49e2b5c6ff876895", + "rev": "f76e144e3ae96156207b665c9cc686452e430017", "type": "github" }, "original": { diff --git a/nix/vendored-sources-config.toml b/nix/vendored-sources-config.toml new file mode 100644 index 0000000..9bba4a8 --- /dev/null +++ b/nix/vendored-sources-config.toml @@ -0,0 +1,6 @@ +[source.nix-sources] +directory = "/build/vendor" +[source.crates-io] +registry = "https://github.com/rust-lang/crates.io-index" +replace-with = "nix-sources" + diff --git a/nix/zome.nix b/nix/zome.nix index 1c1e476..a91e905 100644 --- a/nix/zome.nix +++ b/nix/zome.nix @@ -1,4 +1,5 @@ { + pkgs, runCommandLocal, runCommandNoCC, binaryen, @@ -50,20 +51,33 @@ let pname = "happ-workspace"; version = "workspace"; }); - wasm = deterministicCraneLib.buildPackage (commonArgs // { - cargoToml = crateCargoToml; - cargoLock = workspacePath + /Cargo.lock; - cargoArtifacts = wasmDeps; - cargoExtraArgs = "-p ${crate} --locked"; - pname = crate; + + # wasm = deterministicCraneLib.buildPackage (commonArgs // { + # cargoToml = crateCargoToml; + # cargoLock = workspacePath + /Cargo.lock; + # cargoArtifacts = wasmDeps; + # cargoBuildCommand = "mkdir /build/vendor && cd $cargoVendorDir && echo '${builtins.readFile ./vendored-sources-config.toml}' > /build/source/.cargo-home/config.toml && cat /build/source/.cargo-home/config.toml && cargo build --profile release -v"; + # cargoExtraArgs = "-p ${crate} --locked"; + # pname = crate; + # version = cargoToml.package.version; + # }); + wasm = pkgs.rustPlatform.buildRustPackage { + src = workspacePath; + pname = crate; version = cargoToml.package.version; - }); + cargoLock = { + lockFile = "${workspacePath}/Cargo.lock"; + }; + cargoBuildFlags = "--target wasm32-unknown-unknown"; + doCheck = false; + }; in runCommandLocal "${crate}-deterministic" { meta = { holochainPackageType = "zome"; }; } '' + ls ${wasm}/lib cp ${wasm}/lib/${crate}.wasm $out ''; in