From 3ef4d62ec3adfbe0f9afb4b7d766515c63e0aa14 Mon Sep 17 00:00:00 2001 From: Ricardo Guilherme Schmidt <3esmit@gmail.com> Date: Thu, 16 Jul 2026 12:29:14 -0300 Subject: [PATCH] fix(amm): lock macOS flake inputs --- apps/amm/flake.lock | 36 ++++++++++++++++++++++++------------ apps/amm/flake.nix | 14 ++++++++++---- 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/apps/amm/flake.lock b/apps/amm/flake.lock index c91830c..165e659 100644 --- a/apps/amm/flake.lock +++ b/apps/amm/flake.lock @@ -6,14 +6,19 @@ "nixpkgs": "nixpkgs" }, "locked": { - "path": "../..", - "type": "path" + "lastModified": 1784212840, + "narHash": "sha256-UKdadH6igQ2LG1chaiYPwK9I38QqkyHbAdEZOgSL9j8=", + "owner": "logos-blockchain", + "repo": "lez-programs", + "rev": "2538f0c460c11d1331b904b59a2a4530104e2df8", + "type": "github" }, "original": { - "path": "../..", - "type": "path" - }, - "parent": [] + "owner": "logos-blockchain", + "ref": "feat/amm-pool-creation", + "repo": "lez-programs", + "type": "github" + } }, "crane": { "locked": { @@ -26901,14 +26906,21 @@ "shared_wallet": { "flake": false, "locked": { - "path": "../shared/wallet", - "type": "path" + "dir": "apps/shared/wallet", + "lastModified": 1784212840, + "narHash": "sha256-UKdadH6igQ2LG1chaiYPwK9I38QqkyHbAdEZOgSL9j8=", + "owner": "logos-blockchain", + "repo": "lez-programs", + "rev": "2538f0c460c11d1331b904b59a2a4530104e2df8", + "type": "github" }, "original": { - "path": "../shared/wallet", - "type": "path" - }, - "parent": [] + "dir": "apps/shared/wallet", + "owner": "logos-blockchain", + "ref": "feat/amm-pool-creation", + "repo": "lez-programs", + "type": "github" + } } }, "root": "root", diff --git a/apps/amm/flake.nix b/apps/amm/flake.nix index 9750ffd..b8442f1 100644 --- a/apps/amm/flake.nix +++ b/apps/amm/flake.nix @@ -4,9 +4,10 @@ inputs = { logos-module-builder.url = "github:logos-co/logos-module-builder"; - # Shared C++ wallet access and Logos.Wallet QML sources. + # Shared C++ wallet access and Logos.Wallet QML sources. Nix 2.25 rejects + # committed relative-path locks, so flake.lock pins this Git source. shared_wallet = { - url = "path:../shared/wallet"; + url = "github:logos-blockchain/lez-programs/feat/amm-pool-creation?dir=apps/shared/wallet"; flake = false; }; @@ -27,7 +28,10 @@ "github:logos-blockchain/logos-execution-zone?rev=a7e06a660940a00093b1760560d37ff84aff5a05"; }; - amm_client.url = "path:../.."; + # Nix 2.25 rejects a committed lock entry for the relative repository root. + # The lock pins this PR's root flake to an immutable Git revision, so + # consumers can evaluate the AMM flake without local lock overrides. + amm_client.url = "github:logos-blockchain/lez-programs/feat/amm-pool-creation"; }; outputs = inputs@{ logos-module-builder, shared_wallet, ... }: @@ -36,7 +40,9 @@ configFile = ./metadata.json; flakeInputs = inputs; preConfigure = '' - cmakeFlagsArray+=("-DLOGOS_WALLET_SOURCE_DIR=${shared_wallet}") + # A non-flake Git input is materialized at the repository root; its + # `dir` selector is retained in the lock but does not change this path. + cmakeFlagsArray+=("-DLOGOS_WALLET_SOURCE_DIR=${shared_wallet}/apps/shared/wallet") ''; externalLibInputs = { amm_client = {