From ef0558b49ca318fe1dfabbb7a120cced24b249b4 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 16 Dec 2024 12:42:16 +0100 Subject: [PATCH] fix: use holo-nxipkgs develop artifact --- flake.lock | 143 ++++++++++++++++++++++++++++++++++------------------- flake.nix | 2 +- 2 files changed, 93 insertions(+), 52 deletions(-) diff --git a/flake.lock b/flake.lock index ecbfdc0..0adfd41 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,38 @@ { "nodes": { + "bombon": { + "inputs": { + "flake-parts": [ + "holoNixpkgs", + "flake-parts" + ], + "nixpkgs": [ + "holoNixpkgs", + "nixpkgs" + ], + "pre-commit-hooks-nix": [ + "holoNixpkgs", + "pre-commit-hooks" + ], + "systems": [ + "holoNixpkgs", + "systems" + ] + }, + "locked": { + "lastModified": 1733499251, + "narHash": "sha256-pdwEr7JAf6q6BFRZFoSv8ldGUL3+dMpOalHP7rhmeEE=", + "owner": "nikstur", + "repo": "bombon", + "rev": "194bd3e298a83d07e5541a1d6faa8d25480b4857", + "type": "github" + }, + "original": { + "owner": "nikstur", + "repo": "bombon", + "type": "github" + } + }, "buildbot-nix": { "inputs": { "flake-parts": "flake-parts", @@ -410,19 +443,23 @@ }, "flake-parts_3": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": [ + "holoNixpkgs", + "nixpkgs" + ] }, "locked": { - "lastModified": 1675295133, - "narHash": "sha256-dU8fuLL98WFXG0VnRgM00bqKX6CEPBLybhiIDIgO45o=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bf53492df08f3178ce85e0c9df8ed8d03c030c9f", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { - "id": "flake-parts", - "type": "indirect" + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" } }, "flake-utils": { @@ -529,6 +566,7 @@ }, "holoNixpkgs": { "inputs": { + "bombon": "bombon", "cargo-to-nix": "cargo-to-nix", "crane": [ "crane" @@ -539,6 +577,7 @@ "flake-compat": [ "flake-compat" ], + "flake-parts": "flake-parts_3", "flake-utils": [ "flake-utils" ], @@ -556,19 +595,20 @@ "rust-overlay": [ "rust-overlay" ], + "systems": "systems_2", "treefmt-nix": [ "treefmt-nix" ], "versions": "versions" }, "locked": { - "narHash": "sha256-EwKzTn3/LhIFtaflp4X96RUcAIyJKzftSfUM+vz6wCk=", + "narHash": "sha256-mUz5eNKrlhGXxdz4w9Pad+GOHhhT46TdrzW+EJziwT8=", "type": "tarball", - "url": "https://hydra.holo.host/channel/custom/holo-nixpkgs/2112/holo-nixpkgs/nixexprs.tar.xz" + "url": "https://hydra.holo.host/channel/custom/holo-nixpkgs/develop/holo-nixpkgs/nixexprs.tar.xz" }, "original": { "type": "tarball", - "url": "https://hydra.holo.host/channel/custom/holo-nixpkgs/2112/holo-nixpkgs/nixexprs.tar.xz" + "url": "https://hydra.holo.host/channel/custom/holo-nixpkgs/develop/holo-nixpkgs/nixexprs.tar.xz" } }, "holochain": { @@ -585,7 +625,10 @@ "holoNixpkgs", "flake-compat" ], - "flake-parts": "flake-parts_3", + "flake-parts": [ + "holoNixpkgs", + "flake-parts" + ], "holochain": [ "holoNixpkgs", "holochain", @@ -667,16 +710,16 @@ "holochain_2": { "flake": false, "locked": { - "lastModified": 1707245081, - "narHash": "sha256-l9WHMlD9IDuEv/N/3WDCsP3XLUUnZFrOBEZjbWnC+/Y=", + "lastModified": 1724408854, + "narHash": "sha256-sWA4dKp92TPDVuOS2wHTaqXdXUWYPFnsbSobUtgpluM=", "owner": "holochain", "repo": "holochain", - "rev": "0a3b2408b2d6482b913b9f0faf58a39b567f763a", + "rev": "89e195974eb4bec05a8215adb7029923f2fac6af", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.2.6", + "ref": "holochain-0.4.0-dev.20", "repo": "holochain", "type": "github" } @@ -847,16 +890,16 @@ "lair": { "flake": false, "locked": { - "lastModified": 1706550351, - "narHash": "sha256-psVjtb+zj0pZnHTj1xNP2pGBd5Ua1cSwdOAdYdUe3yQ=", + "lastModified": 1724340490, + "narHash": "sha256-zKcYTefiJaDkgNLhH7bUEmL6j1QfiSNCK/hwBv9/Hxs=", "owner": "holochain", "repo": "lair", - "rev": "b11e65eff11c8ac3bf938607946f5c7201298a65", + "rev": "70e2bd906af7f757cc03ac54b257df884b442ae8", "type": "github" }, "original": { "owner": "holochain", - "ref": "lair_keystore-v0.4.2", + "ref": "lair_keystore-v0.5.0", "repo": "lair", "type": "github" } @@ -881,17 +924,17 @@ "launcher": { "flake": false, "locked": { - "lastModified": 1684183666, - "narHash": "sha256-rOE/W/BBYyZKOyypKb8X9Vpc4ty1TNRoI/fV5+01JPw=", + "lastModified": 1727250978, + "narHash": "sha256-6u/VjFRV4eQQS4H0he7C0n7uNjzBBtkeoyN46jTO0mc=", "owner": "holochain", - "repo": "launcher", - "rev": "75ecdd0aa191ed830cc209a984a6030e656042ff", + "repo": "hc-launch", + "rev": "92afce654187be5abef67d34df20bd6464524cf3", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.2", - "repo": "launcher", + "ref": "holochain-weekly", + "repo": "hc-launch", "type": "github" } }, @@ -1276,24 +1319,6 @@ "type": "github" } }, - "nixpkgs-lib_2": { - "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-regression": { "locked": { "lastModified": 1643052045, @@ -1513,16 +1538,16 @@ "scaffolding": { "flake": false, "locked": { - "lastModified": 1705076186, - "narHash": "sha256-O914XeBuFulky5RqTOvsog+fbO12v0ppW+mIdO6lvKU=", + "lastModified": 1732649741, + "narHash": "sha256-Hn9ckh1eZblZ1uZ2SDsoEjgFbkRE4FCyPWp19duZOlU=", "owner": "holochain", "repo": "scaffolding", - "rev": "42e025fe23ac0b4cd659d95e6752d2d300a8d076", + "rev": "bf8826dc48b5d828c62bd2ea8bf40c7ea471642d", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.2", + "ref": "holochain-weekly", "repo": "scaffolding", "type": "github" } @@ -1600,6 +1625,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "threefold-rfs": { "inputs": { "crane": [ @@ -1695,17 +1735,18 @@ "scaffolding": "scaffolding" }, "locked": { - "dir": "versions/0_2", - "lastModified": 1707272574, - "narHash": "sha256-BEzrfEbrrW7YP3rBdqgpfKOBHE9sO5xBlElsRL3QPaM=", + "dir": "versions/weekly", + "lastModified": 1724408854, + "narHash": "sha256-sWA4dKp92TPDVuOS2wHTaqXdXUWYPFnsbSobUtgpluM=", "owner": "holochain", "repo": "holochain", - "rev": "137b2b8ef82d90cab61f419ee7e7df8c10fdf774", + "rev": "89e195974eb4bec05a8215adb7029923f2fac6af", "type": "github" }, "original": { - "dir": "versions/0_2", + "dir": "versions/weekly", "owner": "holochain", + "ref": "holochain-0.4.0-dev.20", "repo": "holochain", "type": "github" } diff --git a/flake.nix b/flake.nix index e17b00e..7553813 100644 --- a/flake.nix +++ b/flake.nix @@ -170,7 +170,7 @@ }; holoNixpkgs = { - url = "https://hydra.holo.host/channel/custom/holo-nixpkgs/2112/holo-nixpkgs/nixexprs.tar.xz"; + url = "https://hydra.holo.host/channel/custom/holo-nixpkgs/develop/holo-nixpkgs/nixexprs.tar.xz"; inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.follows = "flake-utils";