From 22ba247a29cc26b8828e2ce1deeef95ff920131d Mon Sep 17 00:00:00 2001 From: "guillem.cordoba" Date: Mon, 2 Sep 2024 12:56:43 +0200 Subject: [PATCH] Updated to new holonix --- crates/coordinator/zome.nix | 4 +- crates/integrity/zome.nix | 2 +- flake.lock | 663 +++++++++--------------------------- flake.nix | 16 +- 4 files changed, 168 insertions(+), 517 deletions(-) diff --git a/crates/coordinator/zome.nix b/crates/coordinator/zome.nix index 350b7a7c0..ea174f3a5 100644 --- a/crates/coordinator/zome.nix +++ b/crates/coordinator/zome.nix @@ -3,14 +3,14 @@ { perSystem = { inputs', config, pkgs, system, lib, options, self', ... }: { packages.profiles = inputs.hc-infra.outputs.lib.rustZome { + inherit system; workspacePath = inputs.self.outPath; - holochain = inputs'.holochain; crateCargoToml = ./Cargo.toml; }; checks.profiles = inputs.hc-infra.outputs.lib.sweettest { + inherit system; workspacePath = inputs.self.outPath; - holochain = inputs'.holochain; dna = inputs.hc-infra.outputs.lib.dna { dnaManifest = builtins.toFile "dna.yaml" '' --- diff --git a/crates/integrity/zome.nix b/crates/integrity/zome.nix index 70a9b2ad4..974f1558c 100644 --- a/crates/integrity/zome.nix +++ b/crates/integrity/zome.nix @@ -3,8 +3,8 @@ { perSystem = { inputs', config, pkgs, system, lib, options, ... }: { packages.profiles_integrity = inputs.hc-infra.outputs.lib.rustZome { + inherit system; workspacePath = inputs.self.outPath; - holochain = inputs'.holochain; crateCargoToml = ./Cargo.toml; }; }; diff --git a/flake.lock b/flake.lock index f1f33b550..c22faeda4 100644 --- a/flake.lock +++ b/flake.lock @@ -1,87 +1,19 @@ { "nodes": { - "cargo-chef": { - "flake": false, - "locked": { - "lastModified": 1716357509, - "narHash": "sha256-7iSxwTaJnDLqaFu4ydxkx7ivhDvSQQcXWKawv/e4NHE=", - "owner": "LukeMathWalker", - "repo": "cargo-chef", - "rev": "b468537839bfc7c23d744b85d7a5090954626550", - "type": "github" - }, - "original": { - "owner": "LukeMathWalker", - "ref": "main", - "repo": "cargo-chef", - "type": "github" - } - }, - "cargo-chef_2": { - "flake": false, - "locked": { - "lastModified": 1716357509, - "narHash": "sha256-7iSxwTaJnDLqaFu4ydxkx7ivhDvSQQcXWKawv/e4NHE=", - "owner": "LukeMathWalker", - "repo": "cargo-chef", - "rev": "b468537839bfc7c23d744b85d7a5090954626550", - "type": "github" - }, - "original": { - "owner": "LukeMathWalker", - "ref": "main", - "repo": "cargo-chef", - "type": "github" - } - }, - "cargo-rdme": { - "flake": false, - "locked": { - "lastModified": 1718044745, - "narHash": "sha256-Oa667BTz/PdxZmhGSP+qfPcUbORlk7nP5OrCJyYqVQg=", - "owner": "orium", - "repo": "cargo-rdme", - "rev": "22d756971037ad4c7953db882c5b96a662364f15", - "type": "github" - }, - "original": { - "owner": "orium", - "ref": "v1.4.4", - "repo": "cargo-rdme", - "type": "github" - } - }, - "cargo-rdme_2": { - "flake": false, - "locked": { - "lastModified": 1718044745, - "narHash": "sha256-Oa667BTz/PdxZmhGSP+qfPcUbORlk7nP5OrCJyYqVQg=", - "owner": "orium", - "repo": "cargo-rdme", - "rev": "22d756971037ad4c7953db882c5b96a662364f15", - "type": "github" - }, - "original": { - "owner": "orium", - "ref": "v1.4.4", - "repo": "cargo-rdme", - "type": "github" - } - }, "crane": { "inputs": { "nixpkgs": [ "hc-infra", - "holochain", + "holonix", "nixpkgs" ] }, "locked": { - "lastModified": 1721322122, - "narHash": "sha256-a0G1NvyXGzdwgu6e1HQpmK5R5yLsfxeBe07nNDyYd+g=", + "lastModified": 1724537630, + "narHash": "sha256-gpqINM71zp3kw5XYwUXa84ZtPnCmLLnByuFoYesT1bY=", "owner": "ipetkov", "repo": "crane", - "rev": "8a68b987c476a33e90f203f0927614a75c3f47ea", + "rev": "3e08f4b1fc9aaede5dd511d8f5f4ef27501e49b0", "type": "github" }, "original": { @@ -93,16 +25,16 @@ "crane_2": { "inputs": { "nixpkgs": [ - "holochain", + "holonix", "nixpkgs" ] }, "locked": { - "lastModified": 1721322122, - "narHash": "sha256-a0G1NvyXGzdwgu6e1HQpmK5R5yLsfxeBe07nNDyYd+g=", + "lastModified": 1724537630, + "narHash": "sha256-gpqINM71zp3kw5XYwUXa84ZtPnCmLLnByuFoYesT1bY=", "owner": "ipetkov", "repo": "crane", - "rev": "8a68b987c476a33e90f203f0927614a75c3f47ea", + "rev": "3e08f4b1fc9aaede5dd511d8f5f4ef27501e49b0", "type": "github" }, "original": { @@ -111,117 +43,22 @@ "type": "github" } }, - "crate2nix": { - "flake": false, - "locked": { - "lastModified": 1719760654, - "narHash": "sha256-L3VIJ9182wsYJqP27xO5qiWwfK+a00x0JHiy8ns3NQE=", - "owner": "kolloch", - "repo": "crate2nix", - "rev": "a6ca1e58132bab26fc08572f22a34bbb86f4d91d", - "type": "github" - }, - "original": { - "owner": "kolloch", - "repo": "crate2nix", - "type": "github" - } - }, - "crate2nix_2": { - "flake": false, - "locked": { - "lastModified": 1719760654, - "narHash": "sha256-L3VIJ9182wsYJqP27xO5qiWwfK+a00x0JHiy8ns3NQE=", - "owner": "kolloch", - "repo": "crate2nix", - "rev": "a6ca1e58132bab26fc08572f22a34bbb86f4d91d", - "type": "github" - }, - "original": { - "owner": "kolloch", - "repo": "crate2nix", - "type": "github" - } - }, - "empty": { - "flake": false, - "locked": { - "lastModified": 1683792623, - "narHash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=", - "owner": "steveej", - "repo": "empty", - "rev": "8e328e450e4cd32e072eba9e99fe92cf2a1ef5cf", - "type": "github" - }, - "original": { - "owner": "steveej", - "repo": "empty", - "type": "github" - } - }, - "empty_2": { - "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": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { - "id": "flake-parts", - "type": "indirect" + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" } }, "flake-parts_2": { @@ -229,44 +66,44 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { - "id": "flake-parts", - "type": "indirect" + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" } }, "hc-infra": { "inputs": { "crane": [ "hc-infra", - "holochain", + "holonix", "crane" ], - "holochain": "holochain", + "holonix": "holonix", "nixpkgs": [ "hc-infra", - "holochain", + "holonix", "nixpkgs" ], "rust-overlay": [ "hc-infra", - "holochain", + "holonix", "rust-overlay" - ], - "versions": "versions" + ] }, "locked": { - "lastModified": 1724253734, - "narHash": "sha256-fpwdfFe1Gywxqi5Ax7lD6Jcm/eHP6CleclTTAWtqog4=", + "lastModified": 1725274427, + "narHash": "sha256-JSPsz9hN9TrlAd7Pg7u7tTz2uFLyHR8JCvC0gXGwBVo=", "owner": "holochain-open-dev", "repo": "infrastructure", - "rev": "566eac8ff3b889c234e89858e5165e96beb09f58", + "rev": "4e152d1d93cc1c41985bd7dc79088a47360d6a09", "type": "github" }, "original": { @@ -275,374 +112,274 @@ "type": "github" } }, - "holochain": { - "inputs": { - "cargo-chef": "cargo-chef", - "cargo-rdme": "cargo-rdme", - "crane": "crane", - "crate2nix": "crate2nix", - "empty": "empty", - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "holochain": [ - "hc-infra", - "holochain", - "empty" - ], - "lair": [ - "hc-infra", - "holochain", - "empty" - ], - "launcher": [ - "hc-infra", - "holochain", - "empty" - ], - "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs", - "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "repo-git": "repo-git", - "rust-overlay": "rust-overlay", - "scaffolding": [ - "hc-infra", - "holochain", - "empty" - ], - "versions": [ - "hc-infra", - "versions" - ] - }, + "hc-launch": { + "flake": false, "locked": { - "lastModified": 1724194090, - "narHash": "sha256-YvU701DBSLYiwvhGcpSBYx0zRrcphgxr/vkYOTH++yw=", + "lastModified": 1717431387, + "narHash": "sha256-+VvWwBmxcgePV1L6kU2mSkg3emMiMgpdQnCqvQJkRPk=", "owner": "holochain", - "repo": "holochain", - "rev": "1bd7194eb934916b48a3c132af53365a106c64d3", + "repo": "hc-launch", + "rev": "9d9cab5e6b57e1c278113921ff203e515c8bbd2e", "type": "github" }, "original": { "owner": "holochain", - "repo": "holochain", + "ref": "holochain-0.3", + "repo": "hc-launch", "type": "github" } }, - "holochain_2": { + "hc-launch_2": { "flake": false, "locked": { - "lastModified": 1722347117, - "narHash": "sha256-Jv4DxaVtdbO+fOD4woFoepCCOtRN/HF94xJSwViz3ck=", + "lastModified": 1717431387, + "narHash": "sha256-+VvWwBmxcgePV1L6kU2mSkg3emMiMgpdQnCqvQJkRPk=", "owner": "holochain", - "repo": "holochain", - "rev": "97d86050b177829b623461970db5c3b64fbd74c1", + "repo": "hc-launch", + "rev": "9d9cab5e6b57e1c278113921ff203e515c8bbd2e", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3.2", - "repo": "holochain", + "ref": "holochain-0.3", + "repo": "hc-launch", "type": "github" } }, - "holochain_3": { - "inputs": { - "cargo-chef": "cargo-chef_2", - "cargo-rdme": "cargo-rdme_2", - "crane": "crane_2", - "crate2nix": "crate2nix_2", - "empty": "empty_2", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", - "holochain": [ - "holochain", - "empty" - ], - "lair": [ - "holochain", - "empty" - ], - "launcher": [ - "holochain", - "empty" - ], - "nix-filter": "nix-filter_2", - "nixpkgs": "nixpkgs_2", - "pre-commit-hooks-nix": "pre-commit-hooks-nix_2", - "repo-git": "repo-git_2", - "rust-overlay": "rust-overlay_2", - "scaffolding": [ - "holochain", - "empty" - ], - "versions": [ - "versions" - ] - }, + "hc-scaffold": { + "flake": false, "locked": { - "lastModified": 1724237517, - "narHash": "sha256-qIknCOCKy2Dj1U0wygmY3O1DkSmXhVJS/3ChTRfkel0=", + "lastModified": 1724073530, + "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", "owner": "holochain", - "repo": "holochain", - "rev": "6f7c1cd4c4e93bf181ceca238002b9b482575a94", + "repo": "scaffolding", + "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", "type": "github" }, "original": { "owner": "holochain", - "repo": "holochain", + "ref": "holochain-0.3", + "repo": "scaffolding", "type": "github" } }, - "holochain_4": { + "hc-scaffold_2": { "flake": false, "locked": { - "lastModified": 1722347117, - "narHash": "sha256-Jv4DxaVtdbO+fOD4woFoepCCOtRN/HF94xJSwViz3ck=", + "lastModified": 1724073530, + "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", "owner": "holochain", - "repo": "holochain", - "rev": "97d86050b177829b623461970db5c3b64fbd74c1", + "repo": "scaffolding", + "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3.2", - "repo": "holochain", + "ref": "holochain-0.3", + "repo": "scaffolding", "type": "github" } }, - "lair": { + "holochain": { "flake": false, "locked": { - "lastModified": 1717684904, - "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=", + "lastModified": 1722347117, + "narHash": "sha256-Jv4DxaVtdbO+fOD4woFoepCCOtRN/HF94xJSwViz3ck=", "owner": "holochain", - "repo": "lair", - "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066", + "repo": "holochain", + "rev": "97d86050b177829b623461970db5c3b64fbd74c1", "type": "github" }, "original": { "owner": "holochain", - "ref": "lair_keystore-v0.4.5", - "repo": "lair", + "ref": "holochain-0.3.2", + "repo": "holochain", "type": "github" } }, - "lair_2": { + "holochain_2": { "flake": false, "locked": { - "lastModified": 1717684904, - "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=", + "lastModified": 1722347117, + "narHash": "sha256-Jv4DxaVtdbO+fOD4woFoepCCOtRN/HF94xJSwViz3ck=", "owner": "holochain", - "repo": "lair", - "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066", + "repo": "holochain", + "rev": "97d86050b177829b623461970db5c3b64fbd74c1", "type": "github" }, "original": { "owner": "holochain", - "ref": "lair_keystore-v0.4.5", - "repo": "lair", + "ref": "holochain-0.3.2", + "repo": "holochain", "type": "github" } }, - "launcher": { - "flake": false, + "holonix": { + "inputs": { + "crane": "crane", + "flake-parts": "flake-parts", + "hc-launch": "hc-launch", + "hc-scaffold": "hc-scaffold", + "holochain": "holochain", + "lair-keystore": "lair-keystore", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" + }, "locked": { - "lastModified": 1717431387, - "narHash": "sha256-+VvWwBmxcgePV1L6kU2mSkg3emMiMgpdQnCqvQJkRPk=", + "lastModified": 1724935136, + "narHash": "sha256-TAxGCtBJXv/B6gdBD/TNisuRAs7tC9ati89DZr73ddo=", "owner": "holochain", - "repo": "hc-launch", - "rev": "9d9cab5e6b57e1c278113921ff203e515c8bbd2e", + "repo": "holonix", + "rev": "f1a543d4188adbe6ff1cd9229120d5fe3cb96103", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3", - "repo": "hc-launch", + "ref": "main-0.3", + "repo": "holonix", "type": "github" } }, - "launcher_2": { - "flake": false, + "holonix_2": { + "inputs": { + "crane": "crane_2", + "flake-parts": "flake-parts_2", + "hc-launch": "hc-launch_2", + "hc-scaffold": "hc-scaffold_2", + "holochain": "holochain_2", + "lair-keystore": "lair-keystore_2", + "nixpkgs": "nixpkgs_2", + "rust-overlay": "rust-overlay_2" + }, "locked": { - "lastModified": 1717431387, - "narHash": "sha256-+VvWwBmxcgePV1L6kU2mSkg3emMiMgpdQnCqvQJkRPk=", + "lastModified": 1724935136, + "narHash": "sha256-TAxGCtBJXv/B6gdBD/TNisuRAs7tC9ati89DZr73ddo=", "owner": "holochain", - "repo": "hc-launch", - "rev": "9d9cab5e6b57e1c278113921ff203e515c8bbd2e", + "repo": "holonix", + "rev": "f1a543d4188adbe6ff1cd9229120d5fe3cb96103", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3", - "repo": "hc-launch", + "ref": "main-0.3", + "repo": "holonix", "type": "github" } }, - "nix-filter": { + "lair-keystore": { + "flake": false, "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", + "lastModified": 1717684904, + "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=", + "owner": "holochain", + "repo": "lair", + "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066", "type": "github" }, "original": { - "owner": "numtide", - "repo": "nix-filter", + "owner": "holochain", + "ref": "lair_keystore-v0.4.5", + "repo": "lair", "type": "github" } }, - "nix-filter_2": { + "lair-keystore_2": { + "flake": false, "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", + "lastModified": 1717684904, + "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=", + "owner": "holochain", + "repo": "lair", + "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066", "type": "github" }, "original": { - "owner": "numtide", - "repo": "nix-filter", + "owner": "holochain", + "ref": "lair_keystore-v0.4.5", + "repo": "lair", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", - "owner": "NixOS", + "lastModified": 1717179513, + "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" + "owner": "nixos", + "ref": "24.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1719876945, - "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "lastModified": 1722555339, + "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" } }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1719876945, - "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "lastModified": 1722555339, + "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" } }, "nixpkgs_2": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", - "owner": "NixOS", + "lastModified": 1717179513, + "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, - "pre-commit-hooks-nix": { - "flake": false, - "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks-nix_2": { - "flake": false, - "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", + "owner": "nixos", + "ref": "24.05", + "repo": "nixpkgs", "type": "github" } }, - "repo-git": { - "flake": false, - "locked": { - "narHash": "sha256-d6xi4mKdjkX2JFicDIv5niSzpyI0m/Hnm8GGAIU04kY=", - "type": "file", - "url": "file:/dev/null" - }, - "original": { - "type": "file", - "url": "file:/dev/null" - } - }, - "repo-git_2": { - "flake": false, - "locked": { - "narHash": "sha256-d6xi4mKdjkX2JFicDIv5niSzpyI0m/Hnm8GGAIU04kY=", - "type": "file", - "url": "file:/dev/null" - }, - "original": { - "type": "file", - "url": "file:/dev/null" - } - }, "root": { "inputs": { "hc-infra": "hc-infra", - "holochain": "holochain_3", + "holonix": "holonix_2", "nixpkgs": [ - "holochain", + "holonix", "nixpkgs" - ], - "versions": "versions_2" + ] } }, "rust-overlay": { "inputs": { "nixpkgs": [ "hc-infra", - "holochain", + "holonix", "nixpkgs" ] }, "locked": { - "lastModified": 1723947704, - "narHash": "sha256-TcVf66N2NgGhxORFytzgqWcg0XJ+kk8uNLNsTRI5sYM=", + "lastModified": 1724898214, + "narHash": "sha256-4yMO9+Lsr3zqTf4clAGGag/bfNTmc/ITOXbJQcOEok4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "456e78a55feade2c3bc6d7bc0bf5e710c9d86120", + "rev": "0bc2c784e3a6ce30a2ab1b9f47325ccbed13039f", "type": "github" }, "original": { @@ -654,16 +391,16 @@ "rust-overlay_2": { "inputs": { "nixpkgs": [ - "holochain", + "holonix", "nixpkgs" ] }, "locked": { - "lastModified": 1723947704, - "narHash": "sha256-TcVf66N2NgGhxORFytzgqWcg0XJ+kk8uNLNsTRI5sYM=", + "lastModified": 1724898214, + "narHash": "sha256-4yMO9+Lsr3zqTf4clAGGag/bfNTmc/ITOXbJQcOEok4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "456e78a55feade2c3bc6d7bc0bf5e710c9d86120", + "rev": "0bc2c784e3a6ce30a2ab1b9f47325ccbed13039f", "type": "github" }, "original": { @@ -671,86 +408,6 @@ "repo": "rust-overlay", "type": "github" } - }, - "scaffolding": { - "flake": false, - "locked": { - "lastModified": 1724073530, - "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", - "owner": "holochain", - "repo": "scaffolding", - "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", - "type": "github" - }, - "original": { - "owner": "holochain", - "ref": "holochain-0.3", - "repo": "scaffolding", - "type": "github" - } - }, - "scaffolding_2": { - "flake": false, - "locked": { - "lastModified": 1724073530, - "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", - "owner": "holochain", - "repo": "scaffolding", - "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", - "type": "github" - }, - "original": { - "owner": "holochain", - "ref": "holochain-0.3", - "repo": "scaffolding", - "type": "github" - } - }, - "versions": { - "inputs": { - "holochain": "holochain_2", - "lair": "lair", - "launcher": "launcher", - "scaffolding": "scaffolding" - }, - "locked": { - "dir": "versions/0_3", - "lastModified": 1724194090, - "narHash": "sha256-YvU701DBSLYiwvhGcpSBYx0zRrcphgxr/vkYOTH++yw=", - "owner": "holochain", - "repo": "holochain", - "rev": "1bd7194eb934916b48a3c132af53365a106c64d3", - "type": "github" - }, - "original": { - "dir": "versions/0_3", - "owner": "holochain", - "repo": "holochain", - "type": "github" - } - }, - "versions_2": { - "inputs": { - "holochain": "holochain_4", - "lair": "lair_2", - "launcher": "launcher_2", - "scaffolding": "scaffolding_2" - }, - "locked": { - "dir": "versions/0_3", - "lastModified": 1724237517, - "narHash": "sha256-qIknCOCKy2Dj1U0wygmY3O1DkSmXhVJS/3ChTRfkel0=", - "owner": "holochain", - "repo": "holochain", - "rev": "6f7c1cd4c4e93bf181ceca238002b9b482575a94", - "type": "github" - }, - "original": { - "dir": "versions/0_3", - "owner": "holochain", - "repo": "holochain", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d3796c0ac..ae62ed527 100644 --- a/flake.nix +++ b/flake.nix @@ -2,14 +2,8 @@ description = "Template for Holochain app development"; inputs = { - nixpkgs.follows = "holochain/nixpkgs"; - - versions.url = "github:holochain/holochain?dir=versions/0_3"; - - holochain = { - url = "github:holochain/holochain"; - inputs.versions.follows = "versions"; - }; + nixpkgs.follows = "holonix/nixpkgs"; + holonix.url = "github:holochain/holonix/main-0.3"; hc-infra.url = "github:holochain-open-dev/infrastructure"; }; @@ -21,13 +15,13 @@ }; outputs = inputs@{ ... }: - inputs.holochain.inputs.flake-parts.lib.mkFlake { inherit inputs; } { + inputs.holonix.inputs.flake-parts.lib.mkFlake { inherit inputs; } { imports = [ ./crates/coordinator/zome.nix ./crates/integrity/zome.nix ]; - systems = builtins.attrNames inputs.holochain.devShells; + systems = builtins.attrNames inputs.holonix.devShells; perSystem = { inputs', config, pkgs, system, lib, ... }: { devShells.default = pkgs.mkShell { - inputsFrom = [ inputs'.holochain.devShells.holonix ]; + inputsFrom = [ inputs'.holonix.devShells.default ]; packages = with pkgs; [ nodejs_20 ]; };