From 5f5b4cf7338218733d3af1d6baf692bbed93fc47 Mon Sep 17 00:00:00 2001 From: "guillem.cordoba" Date: Sat, 28 Dec 2024 18:53:52 +0100 Subject: [PATCH] Updated flake --- examples/holochain-runtime/flake.nix | 2 +- flake.lock | 113 ++++++++++----------------- flake.nix | 10 +-- 3 files changed, 48 insertions(+), 77 deletions(-) diff --git a/examples/holochain-runtime/flake.nix b/examples/holochain-runtime/flake.nix index 8cab2950..40a21d2c 100644 --- a/examples/holochain-runtime/flake.nix +++ b/examples/holochain-runtime/flake.nix @@ -2,7 +2,7 @@ description = "Template for Holochain app development"; inputs = { - holonix.url = "github:holochain/holonix"; + holonix.url = "github:holochain/holonix/main-0.4"; nixpkgs.follows = "holonix/nixpkgs"; flake-parts.follows = "holonix/flake-parts"; diff --git a/flake.lock b/flake.lock index 9546792e..8c81a742 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ }, "crane": { "locked": { - "lastModified": 1734324364, - "narHash": "sha256-omYTR59TdH0AumP1cfh49fBnWZ52HjfdNfaLzCMZBx0=", + "lastModified": 1734808813, + "narHash": "sha256-3aH/0Y6ajIlfy7j52FGZ+s4icVX0oHhqBzRdlOeztqg=", "owner": "ipetkov", "repo": "crane", - "rev": "60d7623f1320470bf2fdb92fd2dca1e9a27b98ce", + "rev": "72e2d02dbac80c8c86bf6bf3e785536acf8ee926", "type": "github" }, "original": { @@ -38,27 +38,11 @@ }, "crane_2": { "locked": { - "lastModified": 1732906089, - "narHash": "sha256-NvYSSiKsC0rqn9yY0a9zglLXrFp92EwKhTFZC38voCQ=", + "lastModified": 1734808813, + "narHash": "sha256-3aH/0Y6ajIlfy7j52FGZ+s4icVX0oHhqBzRdlOeztqg=", "owner": "ipetkov", "repo": "crane", - "rev": "9ed3180f45c2d1499e5af98c4ab7ffee8e886f5f", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "rev": "9ed3180f45c2d1499e5af98c4ab7ffee8e886f5f", - "type": "github" - } - }, - "crane_3": { - "locked": { - "lastModified": 1734324364, - "narHash": "sha256-omYTR59TdH0AumP1cfh49fBnWZ52HjfdNfaLzCMZBx0=", - "owner": "ipetkov", - "repo": "crane", - "rev": "60d7623f1320470bf2fdb92fd2dca1e9a27b98ce", + "rev": "72e2d02dbac80c8c86bf6bf3e785536acf8ee926", "type": "github" }, "original": { @@ -198,11 +182,11 @@ "hc-scaffold": { "flake": false, "locked": { - "lastModified": 1734527936, - "narHash": "sha256-kTbGAyd/OOYJsl0+IeH5ichzExvwtc/KXOFfVpIntkQ=", + "lastModified": 1734716209, + "narHash": "sha256-nJkYMXTM6tDXuPEjnlT/z8mRM3S9i1latFSZ4ABhy0M=", "owner": "holochain", "repo": "scaffolding", - "rev": "cda84333095c20987828f7f882431dff628f7c5a", + "rev": "13c57210109e4df44b3ea9ae88013d95dc6c399d", "type": "github" }, "original": { @@ -215,11 +199,11 @@ "hc-scaffold_2": { "flake": false, "locked": { - "lastModified": 1734527936, - "narHash": "sha256-kTbGAyd/OOYJsl0+IeH5ichzExvwtc/KXOFfVpIntkQ=", + "lastModified": 1734716209, + "narHash": "sha256-nJkYMXTM6tDXuPEjnlT/z8mRM3S9i1latFSZ4ABhy0M=", "owner": "holochain", "repo": "scaffolding", - "rev": "cda84333095c20987828f7f882431dff628f7c5a", + "rev": "13c57210109e4df44b3ea9ae88013d95dc6c399d", "type": "github" }, "original": { @@ -275,11 +259,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1734547504, - "narHash": "sha256-H99QVtcQjHvfZ3mZ5F+PYk3KInttnutI2lR8kMn7t9w=", + "lastModified": 1735318660, + "narHash": "sha256-36GaLinGqrTDS44agibiHbfAJv/F5PZbR4TCMEBQ9/0=", "owner": "holochain", "repo": "holonix", - "rev": "ae95497a33a7a8b4e9129be8e75b14836dd3adfb", + "rev": "d7e811d568f6d713a16961991efd6bf0047844f3", "type": "github" }, "original": { @@ -291,7 +275,7 @@ }, "holonix_2": { "inputs": { - "crane": "crane_3", + "crane": "crane_2", "flake-parts": "flake-parts_2", "hc-launch": "hc-launch_2", "hc-scaffold": "hc-scaffold_2", @@ -301,11 +285,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1734547504, - "narHash": "sha256-H99QVtcQjHvfZ3mZ5F+PYk3KInttnutI2lR8kMn7t9w=", + "lastModified": 1735318660, + "narHash": "sha256-36GaLinGqrTDS44agibiHbfAJv/F5PZbR4TCMEBQ9/0=", "owner": "holochain", "repo": "holonix", - "rev": "ae95497a33a7a8b4e9129be8e75b14836dd3adfb", + "rev": "d7e811d568f6d713a16961991efd6bf0047844f3", "type": "github" }, "original": { @@ -391,43 +375,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1717179513, - "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", + "lastModified": 1734875076, + "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", + "rev": "1807c2b91223227ad5599d7067a61665c52d1295", "type": "github" }, "original": { "owner": "nixos", - "ref": "24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1717179513, - "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "pnpmnixpkgs": { - "locked": { - "lastModified": 1734323986, - "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", + "lastModified": 1734875076, + "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "394571358ce82dff7411395829aa6a3aad45b907", + "rev": "1807c2b91223227ad5599d7067a61665c52d1295", "type": "github" }, "original": { @@ -441,12 +409,12 @@ "inputs": { "android-nixpkgs": "android-nixpkgs", "crane": [ - "tnesh-stack", + "holonix", "crane" ], "holonix": "holonix", "nixpkgs": [ - "tnesh-stack", + "holonix", "nixpkgs" ], "rust-overlay": [ @@ -464,11 +432,11 @@ ] }, "locked": { - "lastModified": 1734489114, - "narHash": "sha256-dKBBZr2pw7KDI/7GeiN5qPccqqtvnK2jqAMcMo4rVvU=", + "lastModified": 1734834660, + "narHash": "sha256-bm8V+Cu8rWJA+vKQnc94mXTpSDgvedyoDKxTVi/uJfw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b2e385f8e5c1d7c0d9ce738d650955c2e94555ae", + "rev": "b070e6030118680977bc2388868c4b3963872134", "type": "github" }, "original": { @@ -486,11 +454,11 @@ ] }, "locked": { - "lastModified": 1734489114, - "narHash": "sha256-dKBBZr2pw7KDI/7GeiN5qPccqqtvnK2jqAMcMo4rVvU=", + "lastModified": 1734834660, + "narHash": "sha256-bm8V+Cu8rWJA+vKQnc94mXTpSDgvedyoDKxTVi/uJfw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b2e385f8e5c1d7c0d9ce738d650955c2e94555ae", + "rev": "b070e6030118680977bc2388868c4b3963872134", "type": "github" }, "original": { @@ -531,14 +499,17 @@ }, "tnesh-stack": { "inputs": { - "crane": "crane_2", + "crane": [ + "tnesh-stack", + "holonix", + "crane" + ], "holonix": "holonix_2", "nixpkgs": [ "tnesh-stack", "holonix", "nixpkgs" ], - "pnpmnixpkgs": "pnpmnixpkgs", "rust-overlay": [ "tnesh-stack", "holonix", @@ -546,11 +517,11 @@ ] }, "locked": { - "lastModified": 1734634137, - "narHash": "sha256-dJ3ZV/Dcl8n3xUdo0sT9/JDrXAjhIN2sEJgVH/sw+NM=", + "lastModified": 1735408276, + "narHash": "sha256-FFzQvLyu8/KFezfPUOfBmuQ2MGmsAi/E7i/5zGYGnbE=", "owner": "darksoil-studio", "repo": "tnesh-stack", - "rev": "7784aebe033285bc89288346f4cf7d8d0b8d4fb1", + "rev": "2240feadc7b1b6b72126f682c132ae59b8d6b952", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 124cf049..c3ee05cd 100644 --- a/flake.nix +++ b/flake.nix @@ -2,15 +2,15 @@ description = "Build cross-platform holochain apps and runtimes"; inputs = { - nixpkgs.follows = "tnesh-stack/nixpkgs"; - holonix.url = "github:holochain/holonix/main-0.4"; + nixpkgs.follows = "holonix/nixpkgs"; rust-overlay.follows = "holonix/rust-overlay"; - android-nixpkgs.url = - "github:tadfisher/android-nixpkgs/4aeeeec599210e54aee0ac31d4fcb512f87351a0"; + crane.follows = "holonix/crane"; tnesh-stack.url = "github:darksoil-studio/tnesh-stack/main-0.4"; - crane.follows = "tnesh-stack/crane"; + + android-nixpkgs.url = + "github:tadfisher/android-nixpkgs/4aeeeec599210e54aee0ac31d4fcb512f87351a0"; }; nixConfig = {