From f2ec9d3b6e8e36aa0b4f8dd5b533479a01e0525d Mon Sep 17 00:00:00 2001 From: Khushboo Mehta Date: Wed, 25 Feb 2026 15:25:00 +0100 Subject: [PATCH] fix: update nix to be able to run the standalone app again --- flake.lock | 932 +++++++++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 15 +- nix/app.nix | 19 +- 3 files changed, 938 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 6a380b9..ec7ff04 100644 --- a/flake.lock +++ b/flake.lock @@ -143,6 +143,86 @@ "type": "github" } }, + "logos-capability-module_6": { + "inputs": { + "logos-cpp-sdk": "logos-cpp-sdk_22", + "logos-liblogos": "logos-liblogos_11", + "nixpkgs": [ + "logos-package-manager", + "logos-liblogos", + "logos-capability-module", + "logos-liblogos", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1767809111, + "narHash": "sha256-jehjsB+BpDJlVu3I7x+vFVOdXmy9MDmFTJtRqzFUONo=", + "owner": "logos-co", + "repo": "logos-capability-module", + "rev": "7b35383e0aa4e28a4633ed18a87efb57636939b1", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-capability-module", + "type": "github" + } + }, + "logos-capability-module_7": { + "inputs": { + "logos-cpp-sdk": "logos-cpp-sdk_26", + "logos-liblogos": "logos-liblogos_13", + "nixpkgs": [ + "logos-package-manager", + "logos-package", + "logos-liblogos", + "logos-capability-module", + "logos-liblogos", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1767809111, + "narHash": "sha256-jehjsB+BpDJlVu3I7x+vFVOdXmy9MDmFTJtRqzFUONo=", + "owner": "logos-co", + "repo": "logos-capability-module", + "rev": "7b35383e0aa4e28a4633ed18a87efb57636939b1", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-capability-module", + "type": "github" + } + }, + "logos-capability-module_8": { + "inputs": { + "logos-cpp-sdk": "logos-cpp-sdk_30", + "logos-liblogos": "logos-liblogos_15", + "nixpkgs": [ + "nix-bundle-lgx", + "logos-package", + "logos-liblogos", + "logos-capability-module", + "logos-liblogos", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1767809111, + "narHash": "sha256-jehjsB+BpDJlVu3I7x+vFVOdXmy9MDmFTJtRqzFUONo=", + "owner": "logos-co", + "repo": "logos-capability-module", + "rev": "7b35383e0aa4e28a4633ed18a87efb57636939b1", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-capability-module", + "type": "github" + } + }, "logos-core": { "inputs": { "nixpkgs": "nixpkgs_4" @@ -395,9 +475,9 @@ "type": "github" } }, - "logos-cpp-sdk_3": { + "logos-cpp-sdk_21": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_24" }, "locked": { "lastModified": 1770132997, @@ -413,6 +493,240 @@ "type": "github" } }, + "logos-cpp-sdk_22": { + "inputs": { + "nixpkgs": "nixpkgs_25" + }, + "locked": { + "lastModified": 1761230734, + "narHash": "sha256-CMRUwXH7pJZ1OI6bd/TDDDXKqQ1tQZHQEOOwK8TgYHI=", + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "rev": "4b143922c190df00bb3835441c9f0075cb28283b", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "type": "github" + } + }, + "logos-cpp-sdk_23": { + "inputs": { + "nixpkgs": "nixpkgs_26" + }, + "locked": { + "lastModified": 1761230734, + "narHash": "sha256-CMRUwXH7pJZ1OI6bd/TDDDXKqQ1tQZHQEOOwK8TgYHI=", + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "rev": "4b143922c190df00bb3835441c9f0075cb28283b", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "type": "github" + } + }, + "logos-cpp-sdk_24": { + "inputs": { + "nixpkgs": "nixpkgs_27" + }, + "locked": { + "lastModified": 1767724329, + "narHash": "sha256-UPkqxqxbKwU5Dmu00TnjiJVXUmfVylF3p1qziEuYwIE=", + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "rev": "32f1d7080d784ff044d91d076ef2f0c7305d4784", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "type": "github" + } + }, + "logos-cpp-sdk_25": { + "inputs": { + "nixpkgs": "nixpkgs_28" + }, + "locked": { + "lastModified": 1767724329, + "narHash": "sha256-UPkqxqxbKwU5Dmu00TnjiJVXUmfVylF3p1qziEuYwIE=", + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "rev": "32f1d7080d784ff044d91d076ef2f0c7305d4784", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "type": "github" + } + }, + "logos-cpp-sdk_26": { + "inputs": { + "nixpkgs": "nixpkgs_29" + }, + "locked": { + "lastModified": 1761230734, + "narHash": "sha256-CMRUwXH7pJZ1OI6bd/TDDDXKqQ1tQZHQEOOwK8TgYHI=", + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "rev": "4b143922c190df00bb3835441c9f0075cb28283b", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "type": "github" + } + }, + "logos-cpp-sdk_27": { + "inputs": { + "nixpkgs": "nixpkgs_30" + }, + "locked": { + "lastModified": 1761230734, + "narHash": "sha256-CMRUwXH7pJZ1OI6bd/TDDDXKqQ1tQZHQEOOwK8TgYHI=", + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "rev": "4b143922c190df00bb3835441c9f0075cb28283b", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "type": "github" + } + }, + "logos-cpp-sdk_28": { + "inputs": { + "nixpkgs": "nixpkgs_31" + }, + "locked": { + "lastModified": 1767724329, + "narHash": "sha256-UPkqxqxbKwU5Dmu00TnjiJVXUmfVylF3p1qziEuYwIE=", + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "rev": "32f1d7080d784ff044d91d076ef2f0c7305d4784", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "type": "github" + } + }, + "logos-cpp-sdk_29": { + "inputs": { + "nixpkgs": "nixpkgs_32" + }, + "locked": { + "lastModified": 1767724329, + "narHash": "sha256-UPkqxqxbKwU5Dmu00TnjiJVXUmfVylF3p1qziEuYwIE=", + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "rev": "32f1d7080d784ff044d91d076ef2f0c7305d4784", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "type": "github" + } + }, + "logos-cpp-sdk_3": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1772028960, + "narHash": "sha256-BDWFjaKeoJW8oWDlPphNINt5U3P1xt1z1Y4f9jyC7uU=", + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "rev": "95f763b48d74bcdc63093b05159f43500cab139e", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "type": "github" + } + }, + "logos-cpp-sdk_30": { + "inputs": { + "nixpkgs": "nixpkgs_33" + }, + "locked": { + "lastModified": 1761230734, + "narHash": "sha256-CMRUwXH7pJZ1OI6bd/TDDDXKqQ1tQZHQEOOwK8TgYHI=", + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "rev": "4b143922c190df00bb3835441c9f0075cb28283b", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "type": "github" + } + }, + "logos-cpp-sdk_31": { + "inputs": { + "nixpkgs": "nixpkgs_34" + }, + "locked": { + "lastModified": 1761230734, + "narHash": "sha256-CMRUwXH7pJZ1OI6bd/TDDDXKqQ1tQZHQEOOwK8TgYHI=", + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "rev": "4b143922c190df00bb3835441c9f0075cb28283b", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "type": "github" + } + }, + "logos-cpp-sdk_32": { + "inputs": { + "nixpkgs": "nixpkgs_35" + }, + "locked": { + "lastModified": 1767724329, + "narHash": "sha256-UPkqxqxbKwU5Dmu00TnjiJVXUmfVylF3p1qziEuYwIE=", + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "rev": "32f1d7080d784ff044d91d076ef2f0c7305d4784", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "type": "github" + } + }, + "logos-cpp-sdk_33": { + "inputs": { + "nixpkgs": "nixpkgs_36" + }, + "locked": { + "lastModified": 1767724329, + "narHash": "sha256-UPkqxqxbKwU5Dmu00TnjiJVXUmfVylF3p1qziEuYwIE=", + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "rev": "32f1d7080d784ff044d91d076ef2f0c7305d4784", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-cpp-sdk", + "type": "github" + } + }, "logos-cpp-sdk_4": { "inputs": { "nixpkgs": "nixpkgs_6" @@ -528,11 +842,11 @@ ] }, "locked": { - "lastModified": 1771862755, - "narHash": "sha256-uRQztNMMLhHnQw0P2ZisB1LZ1V7pNqkZRI3pe0wUIts=", + "lastModified": 1772034067, + "narHash": "sha256-gHRlOZoBvNne7A8gP7+YH8WNas50mIgJGP/ZZzhCyLo=", "owner": "logos-co", "repo": "logos-design-system", - "rev": "4d55203607759c9ef042be4505bbc6efffbbd444", + "rev": "b3d5bda6765dace3a5aeefe9da74d8298490681b", "type": "github" }, "original": { @@ -548,11 +862,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1771604479, - "narHash": "sha256-DxgL4uT8+F0ALuEpENkbJ0OcyNhdFgX8Mr8tezMnZ5E=", + "lastModified": 1771943853, + "narHash": "sha256-Wmu7G0G/aWAJ/BcVX98Vm+YA4q0hsY9b6trn9WKW6EU=", "owner": "logos-blockchain", "repo": "lssa", - "rev": "bc84d5cf31b3f6967060c35a5b98618d99780ade", + "rev": "7ba888ce7d76218c6e4d31b62d7fc793c414dce0", "type": "github" }, "original": { @@ -574,11 +888,11 @@ ] }, "locked": { - "lastModified": 1771922567, - "narHash": "sha256-ObbXljdS/hR0PCgBosZgzwMHWRxvSGWmaxgFEy3OvOE=", + "lastModified": 1771945559, + "narHash": "sha256-jnkm3nA5KYBZdCuf+MYofGOKiJVmORISpsRgQGeuQBw=", "owner": "logos-blockchain", "repo": "logos-execution-zone-module", - "rev": "8474602359b69f56cfad232b052b52ae2701f74c", + "rev": "fe4c5a90c19bb5ec00ecde746397f8dffe430c2f", "type": "github" }, "original": { @@ -611,6 +925,166 @@ "type": "github" } }, + "logos-liblogos_10": { + "inputs": { + "logos-capability-module": "logos-capability-module_6", + "logos-cpp-sdk": "logos-cpp-sdk_24", + "logos-module": "logos-module_4", + "nixpkgs": [ + "logos-package-manager", + "logos-liblogos", + "logos-cpp-sdk", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1771871578, + "narHash": "sha256-6Mu3cmdhd8e7i+n8OWcaIBye+i12gwlwt1fhd9QCbCI=", + "owner": "logos-co", + "repo": "logos-liblogos", + "rev": "19d29d4ef99292d9285b3a561cb7ea8029be3b74", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-liblogos", + "type": "github" + } + }, + "logos-liblogos_11": { + "inputs": { + "logos-cpp-sdk": "logos-cpp-sdk_23", + "nixpkgs": [ + "logos-package-manager", + "logos-liblogos", + "logos-capability-module", + "logos-liblogos", + "logos-cpp-sdk", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1761845775, + "narHash": "sha256-ulK8xq05ejK6qIgZ7WtWb/MJt2rk5BKfDA2z7mM3wq8=", + "owner": "logos-co", + "repo": "logos-liblogos", + "rev": "a92c2c1268bc70764c8f73c7bce07d21024f5af9", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-liblogos", + "type": "github" + } + }, + "logos-liblogos_12": { + "inputs": { + "logos-capability-module": "logos-capability-module_7", + "logos-cpp-sdk": "logos-cpp-sdk_28", + "logos-module": "logos-module_5", + "nixpkgs": [ + "logos-package-manager", + "logos-package", + "logos-liblogos", + "logos-cpp-sdk", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1770154824, + "narHash": "sha256-WGI+3FkPdeytfLJ3ZJYr1O8esUnQjcmMJEYwB/EBZMs=", + "owner": "logos-co", + "repo": "logos-liblogos", + "rev": "901dd86d47216b15b6f1260b7b6bb4ecd88a8f9d", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-liblogos", + "type": "github" + } + }, + "logos-liblogos_13": { + "inputs": { + "logos-cpp-sdk": "logos-cpp-sdk_27", + "nixpkgs": [ + "logos-package-manager", + "logos-package", + "logos-liblogos", + "logos-capability-module", + "logos-liblogos", + "logos-cpp-sdk", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1761845775, + "narHash": "sha256-ulK8xq05ejK6qIgZ7WtWb/MJt2rk5BKfDA2z7mM3wq8=", + "owner": "logos-co", + "repo": "logos-liblogos", + "rev": "a92c2c1268bc70764c8f73c7bce07d21024f5af9", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-liblogos", + "type": "github" + } + }, + "logos-liblogos_14": { + "inputs": { + "logos-capability-module": "logos-capability-module_8", + "logos-cpp-sdk": "logos-cpp-sdk_32", + "logos-module": "logos-module_6", + "nixpkgs": [ + "nix-bundle-lgx", + "logos-package", + "logos-liblogos", + "logos-cpp-sdk", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1770154824, + "narHash": "sha256-WGI+3FkPdeytfLJ3ZJYr1O8esUnQjcmMJEYwB/EBZMs=", + "owner": "logos-co", + "repo": "logos-liblogos", + "rev": "901dd86d47216b15b6f1260b7b6bb4ecd88a8f9d", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-liblogos", + "type": "github" + } + }, + "logos-liblogos_15": { + "inputs": { + "logos-cpp-sdk": "logos-cpp-sdk_31", + "nixpkgs": [ + "nix-bundle-lgx", + "logos-package", + "logos-liblogos", + "logos-capability-module", + "logos-liblogos", + "logos-cpp-sdk", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1761845775, + "narHash": "sha256-ulK8xq05ejK6qIgZ7WtWb/MJt2rk5BKfDA2z7mM3wq8=", + "owner": "logos-co", + "repo": "logos-liblogos", + "rev": "a92c2c1268bc70764c8f73c7bce07d21024f5af9", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-liblogos", + "type": "github" + } + }, "logos-liblogos_2": { "inputs": { "logos-capability-module": "logos-capability-module_2", @@ -624,11 +1098,11 @@ ] }, "locked": { - "lastModified": 1770837874, - "narHash": "sha256-wr75lv1q4U1FS5+l/6ypwzJFJe06l2RyUvx1npoRS88=", + "lastModified": 1771871578, + "narHash": "sha256-6Mu3cmdhd8e7i+n8OWcaIBye+i12gwlwt1fhd9QCbCI=", "owner": "logos-co", "repo": "logos-liblogos", - "rev": "e3741c01fd3abf6b7bd9ff2fa8edf89c41fc0cea", + "rev": "19d29d4ef99292d9285b3a561cb7ea8029be3b74", "type": "github" }, "original": { @@ -921,6 +1395,83 @@ "type": "github" } }, + "logos-module_4": { + "inputs": { + "logos-cpp-sdk": "logos-cpp-sdk_25", + "nixpkgs": [ + "logos-package-manager", + "logos-liblogos", + "logos-module", + "logos-cpp-sdk", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1770062426, + "narHash": "sha256-zc7ZxDTlqOCYGyEHhrTA/7GS1EWh7+4amdPUKh+gGds=", + "owner": "logos-co", + "repo": "logos-module", + "rev": "f7ee69d9ad9f27c84f04f59896e9194125e951dc", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-module", + "type": "github" + } + }, + "logos-module_5": { + "inputs": { + "logos-cpp-sdk": "logos-cpp-sdk_29", + "nixpkgs": [ + "logos-package-manager", + "logos-package", + "logos-liblogos", + "logos-module", + "logos-cpp-sdk", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1770062426, + "narHash": "sha256-zc7ZxDTlqOCYGyEHhrTA/7GS1EWh7+4amdPUKh+gGds=", + "owner": "logos-co", + "repo": "logos-module", + "rev": "f7ee69d9ad9f27c84f04f59896e9194125e951dc", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-module", + "type": "github" + } + }, + "logos-module_6": { + "inputs": { + "logos-cpp-sdk": "logos-cpp-sdk_33", + "nixpkgs": [ + "nix-bundle-lgx", + "logos-package", + "logos-liblogos", + "logos-module", + "logos-cpp-sdk", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1770062426, + "narHash": "sha256-zc7ZxDTlqOCYGyEHhrTA/7GS1EWh7+4amdPUKh+gGds=", + "owner": "logos-co", + "repo": "logos-module", + "rev": "f7ee69d9ad9f27c84f04f59896e9194125e951dc", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-module", + "type": "github" + } + }, "logos-package": { "inputs": { "nixpkgs": "nixpkgs_19" @@ -966,6 +1517,117 @@ "type": "github" } }, + "logos-package-manager_2": { + "inputs": { + "logos-cpp-sdk": "logos-cpp-sdk_21", + "logos-liblogos": "logos-liblogos_10", + "logos-package": "logos-package_2", + "nixpkgs": [ + "logos-package-manager", + "logos-liblogos", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772035982, + "narHash": "sha256-8wTp9oR2oBesld3woYx2OXXhKBtAo/6qkTbHMsAI3f4=", + "owner": "logos-co", + "repo": "logos-package-manager-module", + "rev": "1dbbc2452aa965f35cc7bb2e75242ad8f21e0d4d", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-package-manager-module", + "type": "github" + } + }, + "logos-package_2": { + "inputs": { + "logos-liblogos": "logos-liblogos_12", + "nixpkgs": [ + "logos-package-manager", + "logos-package", + "logos-liblogos", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1771887671, + "narHash": "sha256-eIzmR3N5QnR5lcBT3N58v49ggl9MzUYSRgQznex1ayM=", + "owner": "logos-co", + "repo": "logos-package", + "rev": "d9a741359b17b928afae59cf3c6ee00057b7d93e", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-package", + "type": "github" + } + }, + "logos-package_3": { + "inputs": { + "logos-liblogos": "logos-liblogos_14", + "nixpkgs": [ + "nix-bundle-lgx", + "logos-package", + "logos-liblogos", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1771887671, + "narHash": "sha256-eIzmR3N5QnR5lcBT3N58v49ggl9MzUYSRgQznex1ayM=", + "owner": "logos-co", + "repo": "logos-package", + "rev": "d9a741359b17b928afae59cf3c6ee00057b7d93e", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-package", + "type": "github" + } + }, + "nix-bundle-dir": { + "inputs": { + "nixpkgs": "nixpkgs_37" + }, + "locked": { + "lastModified": 1771971384, + "narHash": "sha256-fq0H+sxQhkGN054jdN+ZfHZibbOjHA+KD5SpRH78T1g=", + "owner": "logos-co", + "repo": "nix-bundle-dir", + "rev": "1ecb9662145a1ad84007a970b4bef50a4af159c9", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-dir", + "type": "github" + } + }, + "nix-bundle-lgx": { + "inputs": { + "logos-package": "logos-package_3", + "nix-bundle-dir": "nix-bundle-dir", + "nixpkgs": "nixpkgs_38" + }, + "locked": { + "lastModified": 1771975580, + "narHash": "sha256-CsIfBpRHicYvLgRrpEQGvW4gqhcuiv6QyUUl0dvJm70=", + "owner": "logos-co", + "repo": "nix-bundle-lgx", + "rev": "8487211a10a4b4c79300685758ad2fa8a89d29be", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-lgx", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1759036355, @@ -1222,6 +1884,102 @@ "type": "github" } }, + "nixpkgs_24": { + "locked": { + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_25": { + "locked": { + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_26": { + "locked": { + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_27": { + "locked": { + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_28": { + "locked": { + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_29": { + "locked": { + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_3": { "locked": { "lastModified": 1759036355, @@ -1238,6 +1996,150 @@ "type": "github" } }, + "nixpkgs_30": { + "locked": { + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_31": { + "locked": { + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_32": { + "locked": { + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_33": { + "locked": { + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_34": { + "locked": { + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_35": { + "locked": { + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_36": { + "locked": { + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_37": { + "locked": { + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_38": { + "locked": { + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_4": { "locked": { "lastModified": 1759036355, @@ -1341,6 +2243,8 @@ "logos-design-system": "logos-design-system", "logos-execution-zone-module": "logos-execution-zone-module", "logos-liblogos": "logos-liblogos_8", + "logos-package-manager": "logos-package-manager_2", + "nix-bundle-lgx": "nix-bundle-lgx", "nixpkgs": [ "logos-liblogos", "nixpkgs" diff --git a/flake.nix b/flake.nix index bd6578d..52cd099 100644 --- a/flake.nix +++ b/flake.nix @@ -9,9 +9,11 @@ logos-capability-module.url = "github:logos-co/logos-capability-module"; logos-design-system.url = "github:logos-co/logos-design-system"; logos-design-system.inputs.nixpkgs.follows = "nixpkgs"; + nix-bundle-lgx.url = "github:logos-co/nix-bundle-lgx"; + logos-package-manager.url = "github:logos-co/logos-package-manager-module"; }; - outputs = { self, nixpkgs, logos-cpp-sdk, logos-liblogos, logos-execution-zone-module, logos-capability-module, logos-design-system }: + outputs = { self, nixpkgs, logos-cpp-sdk, logos-liblogos, logos-execution-zone-module, logos-capability-module, logos-design-system, nix-bundle-lgx, logos-package-manager }: let systems = [ "aarch64-darwin" "x86_64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-windows" ]; forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f { @@ -21,10 +23,12 @@ logosExecutionZoneModule = logos-execution-zone-module.packages.${system}.default; logosCapabilityModule = logos-capability-module.packages.${system}.default; logosDesignSystem = logos-design-system.packages.${system}.default; + lgxBundler = nix-bundle-lgx.bundlers.${system}.default; + lgpm = logos-package-manager.packages.${system}.cli; }); in { - packages = forAllSystems ({ pkgs, logosSdk, logosLiblogos, logosExecutionZoneModule, logosCapabilityModule, logosDesignSystem }: + packages = forAllSystems ({ pkgs, logosSdk, logosLiblogos, logosExecutionZoneModule, logosCapabilityModule, logosDesignSystem, lgxBundler, lgpm }: let common = import ./nix/default.nix { inherit pkgs logosSdk logosLiblogos; @@ -35,8 +39,11 @@ inherit pkgs common src logosExecutionZoneModule; }; + logosCapabilityModuleLgx = lgxBundler logosCapabilityModule; + logosExecutionZoneModuleLgx = lgxBundler logosExecutionZoneModule; + app = import ./nix/app.nix { - inherit pkgs common src logosLiblogos logosExecutionZoneModule logosCapabilityModule logosDesignSystem; + inherit pkgs common src logosLiblogos logosExecutionZoneModule logosCapabilityModule logosDesignSystem lgpm logosCapabilityModuleLgx logosExecutionZoneModuleLgx; logosExecutionZoneWalletUI = lib; }; in @@ -56,7 +63,7 @@ }; }); - devShells = forAllSystems ({ pkgs, logosSdk, logosLiblogos, logosExecutionZoneModule, logosCapabilityModule, logosDesignSystem }: { + devShells = forAllSystems ({ pkgs, logosSdk, logosLiblogos, logosExecutionZoneModule, logosCapabilityModule, logosDesignSystem, lgpm, ... }: { default = pkgs.mkShell { nativeBuildInputs = [ pkgs.cmake diff --git a/nix/app.nix b/nix/app.nix index 2609c8f..4bf459f 100644 --- a/nix/app.nix +++ b/nix/app.nix @@ -1,5 +1,5 @@ # Builds the logos-execution-zone-wallet-ui-app standalone application -{ pkgs, common, src, logosLiblogos, logosExecutionZoneModule, logosCapabilityModule, logosExecutionZoneWalletUI, logosDesignSystem }: +{ pkgs, common, src, logosLiblogos, logosExecutionZoneModule, logosCapabilityModule, logosExecutionZoneWalletUI, logosDesignSystem, lgpm, logosCapabilityModuleLgx, logosExecutionZoneModuleLgx }: pkgs.stdenv.mkDerivation rec { pname = "logos-execution-zone-wallet-ui-app"; @@ -144,15 +144,14 @@ pkgs.stdenv.mkDerivation rec { MINGW*|MSYS*|CYGWIN*) OS_EXT="dll";; esac - if [ -f "${logosCapabilityModule}/lib/capability_module_plugin.$OS_EXT" ]; then - cp -L "${logosCapabilityModule}/lib/capability_module_plugin.$OS_EXT" "$out/modules/" - fi - if [ -f "${logosExecutionZoneModule}/lib/liblogos_execution_zone_wallet_module.$OS_EXT" ]; then - cp -L "${logosExecutionZoneModule}/lib/liblogos_execution_zone_wallet_module.$OS_EXT" "$out/modules/" - fi - if [ -f "${logosExecutionZoneModule}/lib/libwallet_ffi.$OS_EXT" ]; then - cp -L "${logosExecutionZoneModule}/lib/libwallet_ffi.$OS_EXT" "$out/modules/" - fi + for lgxFile in ${logosCapabilityModuleLgx}/*.lgx; do + echo "Installing $lgxFile via lgpm..." + ${lgpm}/bin/lgpm --modules-dir "$out/modules" install --file "$lgxFile" + done + for lgxFile in ${logosExecutionZoneModuleLgx}/*.lgx; do + echo "Installing $lgxFile via lgpm..." + ${lgpm}/bin/lgpm --modules-dir "$out/modules" install --file "$lgxFile" + done if [ -f "${logosExecutionZoneWalletUI}/lib/logos_execution_zone_wallet_ui.$OS_EXT" ]; then cp -L "${logosExecutionZoneWalletUI}/lib/logos_execution_zone_wallet_ui.$OS_EXT" "$out/"