diff --git a/logos-calc-module/flake.lock b/logos-calc-module/flake.lock index 6ab210e..03a7da8 100644 --- a/logos-calc-module/flake.lock +++ b/logos-calc-module/flake.lock @@ -70,11 +70,11 @@ ] }, "locked": { - "lastModified": 1774530738, - "narHash": "sha256-EXZ0nsVbBHdeFuXZsSeMNsTi10kA/tpxwea1PJny7G8=", + "lastModified": 1774988975, + "narHash": "sha256-wJ7Bv3TL754bZcTL2qilI0JahiVag7fLDzw8Y6Qz0pk=", "owner": "logos-co", "repo": "logos-cpp-sdk", - "rev": "01221559b7e5d7db1362128f5888adddd8a23bda", + "rev": "d633575677a3d19a8bf1d5ff687398dace532938", "type": "github" }, "original": { @@ -95,11 +95,11 @@ ] }, "locked": { - "lastModified": 1774530738, - "narHash": "sha256-EXZ0nsVbBHdeFuXZsSeMNsTi10kA/tpxwea1PJny7G8=", + "lastModified": 1774988975, + "narHash": "sha256-wJ7Bv3TL754bZcTL2qilI0JahiVag7fLDzw8Y6Qz0pk=", "owner": "logos-co", "repo": "logos-cpp-sdk", - "rev": "01221559b7e5d7db1362128f5888adddd8a23bda", + "rev": "d633575677a3d19a8bf1d5ff687398dace532938", "type": "github" }, "original": { @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1774530738, - "narHash": "sha256-EXZ0nsVbBHdeFuXZsSeMNsTi10kA/tpxwea1PJny7G8=", + "lastModified": 1774988975, + "narHash": "sha256-wJ7Bv3TL754bZcTL2qilI0JahiVag7fLDzw8Y6Qz0pk=", "owner": "logos-co", "repo": "logos-cpp-sdk", - "rev": "01221559b7e5d7db1362128f5888adddd8a23bda", + "rev": "d633575677a3d19a8bf1d5ff687398dace532938", "type": "github" }, "original": { @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1774633164, - "narHash": "sha256-TobXeKMS1RWYKo30ujYJNnrDVhu4U1JFdtL31yIOu8c=", + "lastModified": 1774988698, + "narHash": "sha256-Ugngv17u5CA3lOSNHN6nJ+/WpIyNn8yui0M2VDdkENk=", "owner": "logos-co", "repo": "logos-module", - "rev": "8ed727449a4a6713a8c819c213b0d5d25f575580", + "rev": "337223f2a72710d8052ca750510cd25d33e05047", "type": "github" }, "original": { @@ -272,6 +272,7 @@ "logos-plugin-qt": "logos-plugin-qt", "logos-standalone-app": "logos-standalone-app", "nix-bundle-lgx": "nix-bundle-lgx_2", + "nix-bundle-logos-module-install": "nix-bundle-logos-module-install", "nixpkgs": [ "logos-module-builder", "logos-nix", @@ -279,17 +280,17 @@ ] }, "locked": { - "lastModified": 1774976015, - "narHash": "sha256-aPwn9elrwVI7TWLomTYwTV4hviKbaCB16SQcnQth2r8=", + "lastModified": 1775052121, + "narHash": "sha256-Z/RUMEw0eNs/rRp52zWbrG0f1RpSWLzNH9LwOArFPuo=", "owner": "logos-co", "repo": "logos-module-builder", - "rev": "b6cf87d30e2995e023496fcfc7f06e8127c6ac5b", + "rev": "46a51e5fc321ac11b966c1cc2a2cff21d36fef95", "type": "github" }, "original": { "owner": "logos-co", "repo": "logos-module-builder", - "rev": "b6cf87d30e2995e023496fcfc7f06e8127c6ac5b", + "rev": "46a51e5fc321ac11b966c1cc2a2cff21d36fef95", "type": "github" } }, @@ -305,11 +306,11 @@ ] }, "locked": { - "lastModified": 1774633164, - "narHash": "sha256-TobXeKMS1RWYKo30ujYJNnrDVhu4U1JFdtL31yIOu8c=", + "lastModified": 1774988698, + "narHash": "sha256-Ugngv17u5CA3lOSNHN6nJ+/WpIyNn8yui0M2VDdkENk=", "owner": "logos-co", "repo": "logos-module", - "rev": "8ed727449a4a6713a8c819c213b0d5d25f575580", + "rev": "337223f2a72710d8052ca750510cd25d33e05047", "type": "github" }, "original": { @@ -829,6 +830,168 @@ "type": "github" } }, + "logos-nix_31": { + "inputs": { + "nixpkgs": "nixpkgs_31" + }, + "locked": { + "lastModified": 1774455309, + "narHash": "sha256-3AN7aFnArdysrbQQ2UskWzjNSFADb4hDCsnx69Fa0ng=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "e637a1f5e871244d1c2df1e3c52a067f2eb406f2", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_32": { + "inputs": { + "nixpkgs": "nixpkgs_32" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_33": { + "inputs": { + "nixpkgs": "nixpkgs_33" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_34": { + "inputs": { + "nixpkgs": "nixpkgs_34" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_35": { + "inputs": { + "nixpkgs": "nixpkgs_35" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_36": { + "inputs": { + "nixpkgs": "nixpkgs_36" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_37": { + "inputs": { + "nixpkgs": "nixpkgs_37" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_38": { + "inputs": { + "nixpkgs": "nixpkgs_38" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_39": { + "inputs": { + "nixpkgs": "nixpkgs_39" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, "logos-nix_4": { "inputs": { "nixpkgs": "nixpkgs_4" @@ -993,6 +1156,34 @@ "type": "github" } }, + "logos-package-manager_2": { + "inputs": { + "logos-nix": "logos-nix_32", + "logos-package": "logos-package_4", + "nix-bundle-appimage": "nix-bundle-appimage_2", + "nix-bundle-dir": "nix-bundle-dir_6", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "logos-package-manager", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1774635434, + "narHash": "sha256-9LRXf/Wy500rNO9IhDSH+PSuadS3TguNFCbcbI4YYZU=", + "owner": "logos-co", + "repo": "logos-package-manager", + "rev": "e5c25989861f4487c3dc8c7b3bc0062bcbc3221f", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-package-manager", + "type": "github" + } + }, "logos-package_2": { "inputs": { "logos-nix": "logos-nix_26", @@ -1044,6 +1235,58 @@ "type": "github" } }, + "logos-package_4": { + "inputs": { + "logos-nix": "logos-nix_33", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "logos-package-manager", + "logos-package", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773965173, + "narHash": "sha256-toDnGXUthRcQm7vcEYzb2bLI7FE1tbfzH8Ie2Cnb9mk=", + "owner": "logos-co", + "repo": "logos-package", + "rev": "9e3730d5c0e3ec955761c05b50e3a6047ee4030b", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-package", + "type": "github" + } + }, + "logos-package_5": { + "inputs": { + "logos-nix": "logos-nix_38", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "nix-bundle-lgx", + "logos-package", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773965173, + "narHash": "sha256-toDnGXUthRcQm7vcEYzb2bLI7FE1tbfzH8Ie2Cnb9mk=", + "owner": "logos-co", + "repo": "logos-package", + "rev": "9e3730d5c0e3ec955761c05b50e3a6047ee4030b", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-package", + "type": "github" + } + }, "logos-plugin-core": { "inputs": { "logos-cpp-sdk": "logos-cpp-sdk", @@ -1057,11 +1300,11 @@ ] }, "locked": { - "lastModified": 1774706519, - "narHash": "sha256-DJwgxju0ZVxYV5cxVDO//ync2qnOb9q7Gc82SGL/Mkk=", + "lastModified": 1774989388, + "narHash": "sha256-Ovo8q2+JxrGomrA5/iFx9TGUwWQWY0CapU6ni1gLo0s=", "owner": "logos-co", "repo": "logos-plugin-qt", - "rev": "5305602e80f76efea4208ef4c83a88f9ed7fb8e3", + "rev": "d37ad1dc16a19ff1e907d48986f04903ee86a9ac", "type": "github" }, "original": { @@ -1083,11 +1326,11 @@ ] }, "locked": { - "lastModified": 1774706519, - "narHash": "sha256-DJwgxju0ZVxYV5cxVDO//ync2qnOb9q7Gc82SGL/Mkk=", + "lastModified": 1774989388, + "narHash": "sha256-Ovo8q2+JxrGomrA5/iFx9TGUwWQWY0CapU6ni1gLo0s=", "owner": "logos-co", "repo": "logos-plugin-qt", - "rev": "5305602e80f76efea4208ef4c83a88f9ed7fb8e3", + "rev": "d37ad1dc16a19ff1e907d48986f04903ee86a9ac", "type": "github" }, "original": { @@ -1112,11 +1355,11 @@ ] }, "locked": { - "lastModified": 1774975654, - "narHash": "sha256-U4wEYQHHQqO8TobyDdcSiLf/rJ7ApYQRoaAhILlz3tw=", + "lastModified": 1775052093, + "narHash": "sha256-HJfrILACOcdkhT8nvK7LvzcGor6uZv5IYbACkfHGv+0=", "owner": "logos-co", "repo": "logos-standalone-app", - "rev": "4ab3e4267e66093f92ecf17c7df6a5dfe9657e8b", + "rev": "f6e13eabd144b4cf87b533cce7318536cbd03123", "type": "github" }, "original": { @@ -1153,6 +1396,33 @@ "type": "github" } }, + "nix-bundle-appimage_2": { + "inputs": { + "logos-nix": "logos-nix_34", + "nix-bundle-dir": "nix-bundle-dir_5", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "logos-package-manager", + "nix-bundle-appimage", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773961597, + "narHash": "sha256-UEUlp3VRXBcj2YlOMTQdeW3qjyGJl2V3+GMf8IXwSWA=", + "owner": "logos-co", + "repo": "nix-bundle-appimage", + "rev": "7343f6df1ebab357f51f23dff0af9d7e468638cb", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-appimage", + "type": "github" + } + }, "nix-bundle-dir": { "inputs": { "logos-nix": "logos-nix_21", @@ -1257,6 +1527,83 @@ "type": "github" } }, + "nix-bundle-dir_5": { + "inputs": { + "logos-nix": "logos-nix_35", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "logos-package-manager", + "nix-bundle-appimage", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773961179, + "narHash": "sha256-bpaTvz//R8WFP5xnnDLv3a9l7unDmBwJjCewx3wCjzM=", + "owner": "logos-co", + "repo": "nix-bundle-dir", + "rev": "cd214dbf15487d80967389847ae2210468be6ebf", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-dir", + "type": "github" + } + }, + "nix-bundle-dir_6": { + "inputs": { + "logos-nix": "logos-nix_36", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "logos-package-manager", + "nix-bundle-dir", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773961179, + "narHash": "sha256-bpaTvz//R8WFP5xnnDLv3a9l7unDmBwJjCewx3wCjzM=", + "owner": "logos-co", + "repo": "nix-bundle-dir", + "rev": "cd214dbf15487d80967389847ae2210468be6ebf", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-dir", + "type": "github" + } + }, + "nix-bundle-dir_7": { + "inputs": { + "logos-nix": "logos-nix_39", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "nix-bundle-lgx", + "nix-bundle-dir", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773961179, + "narHash": "sha256-bpaTvz//R8WFP5xnnDLv3a9l7unDmBwJjCewx3wCjzM=", + "owner": "logos-co", + "repo": "nix-bundle-dir", + "rev": "cd214dbf15487d80967389847ae2210468be6ebf", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-dir", + "type": "github" + } + }, "nix-bundle-lgx": { "inputs": { "logos-nix": "logos-nix_25", @@ -1309,6 +1656,59 @@ "type": "github" } }, + "nix-bundle-lgx_3": { + "inputs": { + "logos-nix": "logos-nix_37", + "logos-package": "logos-package_5", + "nix-bundle-dir": "nix-bundle-dir_7", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "nix-bundle-lgx", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1774455541, + "narHash": "sha256-ku5gG6qKIZeWzJ/jNOxfsx1rwJ3kPrCw8/wnBKq1Uyw=", + "owner": "logos-co", + "repo": "nix-bundle-lgx", + "rev": "9d6f9016c865b9d2793672bc3c45a50b59753c78", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-lgx", + "type": "github" + } + }, + "nix-bundle-logos-module-install": { + "inputs": { + "logos-nix": "logos-nix_31", + "logos-package-manager": "logos-package-manager_2", + "nix-bundle-lgx": "nix-bundle-lgx_3", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1774899467, + "narHash": "sha256-osJph/UNShD8/i80ajUugizxJW0P4IEaZzSOsaSWCsI=", + "owner": "logos-co", + "repo": "nix-bundle-logos-module-install", + "rev": "87afbb0241a6f7c1865a12f855dce63c68d1dd7f", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-logos-module-install", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1759036355, @@ -1693,6 +2093,150 @@ "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": 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_38": { + "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_39": { + "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_4": { "locked": { "lastModified": 1759036355, diff --git a/logos-calc-module/flake.nix b/logos-calc-module/flake.nix index fbabc5a..e43378f 100644 --- a/logos-calc-module/flake.nix +++ b/logos-calc-module/flake.nix @@ -2,7 +2,7 @@ description = "Calculator module - wraps libcalc C library for Logos"; inputs = { - logos-module-builder.url = "github:logos-co/logos-module-builder/b6cf87d30e2995e023496fcfc7f06e8127c6ac5b"; + logos-module-builder.url = "github:logos-co/logos-module-builder/46a51e5fc321ac11b966c1cc2a2cff21d36fef95"; }; outputs = inputs@{ logos-module-builder, ... }: diff --git a/logos-calc-ui-cpp/flake.lock b/logos-calc-ui-cpp/flake.lock index db9e93c..719c81d 100644 --- a/logos-calc-ui-cpp/flake.lock +++ b/logos-calc-ui-cpp/flake.lock @@ -6,11 +6,11 @@ }, "locked": { "dir": "logos-calc-module", - "lastModified": 1775036670, - "narHash": "sha256-YHNxfw4jBVB9biuw1vG4iYX8t+MlvfXV0qlSdZq19rI=", + "lastModified": 1775039115, + "narHash": "sha256-58zYovNcJkpNAe4GzPKIkbUY5sE7YEBzXK/A5BoJf5M=", "owner": "logos-co", "repo": "logos-tutorial", - "rev": "321fe4a41a8782d2aa8ddeb9eeafc7ee353eb031", + "rev": "3085ead08566019467cce302d81029027d46ce46", "type": "github" }, "original": { @@ -311,11 +311,11 @@ ] }, "locked": { - "lastModified": 1774530738, - "narHash": "sha256-EXZ0nsVbBHdeFuXZsSeMNsTi10kA/tpxwea1PJny7G8=", + "lastModified": 1774988975, + "narHash": "sha256-wJ7Bv3TL754bZcTL2qilI0JahiVag7fLDzw8Y6Qz0pk=", "owner": "logos-co", "repo": "logos-cpp-sdk", - "rev": "01221559b7e5d7db1362128f5888adddd8a23bda", + "rev": "d633575677a3d19a8bf1d5ff687398dace532938", "type": "github" }, "original": { @@ -336,11 +336,11 @@ ] }, "locked": { - "lastModified": 1774530738, - "narHash": "sha256-EXZ0nsVbBHdeFuXZsSeMNsTi10kA/tpxwea1PJny7G8=", + "lastModified": 1774988975, + "narHash": "sha256-wJ7Bv3TL754bZcTL2qilI0JahiVag7fLDzw8Y6Qz0pk=", "owner": "logos-co", "repo": "logos-cpp-sdk", - "rev": "01221559b7e5d7db1362128f5888adddd8a23bda", + "rev": "d633575677a3d19a8bf1d5ff687398dace532938", "type": "github" }, "original": { @@ -361,11 +361,11 @@ ] }, "locked": { - "lastModified": 1774530738, - "narHash": "sha256-EXZ0nsVbBHdeFuXZsSeMNsTi10kA/tpxwea1PJny7G8=", + "lastModified": 1774988975, + "narHash": "sha256-wJ7Bv3TL754bZcTL2qilI0JahiVag7fLDzw8Y6Qz0pk=", "owner": "logos-co", "repo": "logos-cpp-sdk", - "rev": "01221559b7e5d7db1362128f5888adddd8a23bda", + "rev": "d633575677a3d19a8bf1d5ff687398dace532938", "type": "github" }, "original": { @@ -573,6 +573,7 @@ "logos-plugin-qt": "logos-plugin-qt_2", "logos-standalone-app": "logos-standalone-app_2", "nix-bundle-lgx": "nix-bundle-lgx_4", + "nix-bundle-logos-module-install": "nix-bundle-logos-module-install", "nixpkgs": [ "logos-module-builder", "logos-nix", @@ -580,17 +581,17 @@ ] }, "locked": { - "lastModified": 1774976015, - "narHash": "sha256-aPwn9elrwVI7TWLomTYwTV4hviKbaCB16SQcnQth2r8=", + "lastModified": 1775052121, + "narHash": "sha256-Z/RUMEw0eNs/rRp52zWbrG0f1RpSWLzNH9LwOArFPuo=", "owner": "logos-co", "repo": "logos-module-builder", - "rev": "b6cf87d30e2995e023496fcfc7f06e8127c6ac5b", + "rev": "46a51e5fc321ac11b966c1cc2a2cff21d36fef95", "type": "github" }, "original": { "owner": "logos-co", "repo": "logos-module-builder", - "rev": "b6cf87d30e2995e023496fcfc7f06e8127c6ac5b", + "rev": "46a51e5fc321ac11b966c1cc2a2cff21d36fef95", "type": "github" } }, @@ -740,11 +741,11 @@ ] }, "locked": { - "lastModified": 1774633164, - "narHash": "sha256-TobXeKMS1RWYKo30ujYJNnrDVhu4U1JFdtL31yIOu8c=", + "lastModified": 1774988698, + "narHash": "sha256-Ugngv17u5CA3lOSNHN6nJ+/WpIyNn8yui0M2VDdkENk=", "owner": "logos-co", "repo": "logos-module", - "rev": "8ed727449a4a6713a8c819c213b0d5d25f575580", + "rev": "337223f2a72710d8052ca750510cd25d33e05047", "type": "github" }, "original": { @@ -765,11 +766,11 @@ ] }, "locked": { - "lastModified": 1774633164, - "narHash": "sha256-TobXeKMS1RWYKo30ujYJNnrDVhu4U1JFdtL31yIOu8c=", + "lastModified": 1774988698, + "narHash": "sha256-Ugngv17u5CA3lOSNHN6nJ+/WpIyNn8yui0M2VDdkENk=", "owner": "logos-co", "repo": "logos-module", - "rev": "8ed727449a4a6713a8c819c213b0d5d25f575580", + "rev": "337223f2a72710d8052ca750510cd25d33e05047", "type": "github" }, "original": { @@ -1857,6 +1858,168 @@ "type": "github" } }, + "logos-nix_61": { + "inputs": { + "nixpkgs": "nixpkgs_61" + }, + "locked": { + "lastModified": 1774455309, + "narHash": "sha256-3AN7aFnArdysrbQQ2UskWzjNSFADb4hDCsnx69Fa0ng=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "e637a1f5e871244d1c2df1e3c52a067f2eb406f2", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_62": { + "inputs": { + "nixpkgs": "nixpkgs_62" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_63": { + "inputs": { + "nixpkgs": "nixpkgs_63" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_64": { + "inputs": { + "nixpkgs": "nixpkgs_64" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_65": { + "inputs": { + "nixpkgs": "nixpkgs_65" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_66": { + "inputs": { + "nixpkgs": "nixpkgs_66" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_67": { + "inputs": { + "nixpkgs": "nixpkgs_67" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_68": { + "inputs": { + "nixpkgs": "nixpkgs_68" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_69": { + "inputs": { + "nixpkgs": "nixpkgs_69" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, "logos-nix_7": { "inputs": { "nixpkgs": "nixpkgs_7" @@ -1998,6 +2161,34 @@ "type": "github" } }, + "logos-package-manager_3": { + "inputs": { + "logos-nix": "logos-nix_62", + "logos-package": "logos-package_7", + "nix-bundle-appimage": "nix-bundle-appimage_3", + "nix-bundle-dir": "nix-bundle-dir_10", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "logos-package-manager", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1774635434, + "narHash": "sha256-9LRXf/Wy500rNO9IhDSH+PSuadS3TguNFCbcbI4YYZU=", + "owner": "logos-co", + "repo": "logos-package-manager", + "rev": "e5c25989861f4487c3dc8c7b3bc0062bcbc3221f", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-package-manager", + "type": "github" + } + }, "logos-package_2": { "inputs": { "logos-nix": "logos-nix_26", @@ -2129,6 +2320,58 @@ "type": "github" } }, + "logos-package_7": { + "inputs": { + "logos-nix": "logos-nix_63", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "logos-package-manager", + "logos-package", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773965173, + "narHash": "sha256-toDnGXUthRcQm7vcEYzb2bLI7FE1tbfzH8Ie2Cnb9mk=", + "owner": "logos-co", + "repo": "logos-package", + "rev": "9e3730d5c0e3ec955761c05b50e3a6047ee4030b", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-package", + "type": "github" + } + }, + "logos-package_8": { + "inputs": { + "logos-nix": "logos-nix_68", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "nix-bundle-lgx", + "logos-package", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773965173, + "narHash": "sha256-toDnGXUthRcQm7vcEYzb2bLI7FE1tbfzH8Ie2Cnb9mk=", + "owner": "logos-co", + "repo": "logos-package", + "rev": "9e3730d5c0e3ec955761c05b50e3a6047ee4030b", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-package", + "type": "github" + } + }, "logos-plugin-core": { "inputs": { "logos-cpp-sdk": "logos-cpp-sdk", @@ -2169,11 +2412,11 @@ ] }, "locked": { - "lastModified": 1774706519, - "narHash": "sha256-DJwgxju0ZVxYV5cxVDO//ync2qnOb9q7Gc82SGL/Mkk=", + "lastModified": 1774989388, + "narHash": "sha256-Ovo8q2+JxrGomrA5/iFx9TGUwWQWY0CapU6ni1gLo0s=", "owner": "logos-co", "repo": "logos-plugin-qt", - "rev": "5305602e80f76efea4208ef4c83a88f9ed7fb8e3", + "rev": "d37ad1dc16a19ff1e907d48986f04903ee86a9ac", "type": "github" }, "original": { @@ -2222,11 +2465,11 @@ ] }, "locked": { - "lastModified": 1774706519, - "narHash": "sha256-DJwgxju0ZVxYV5cxVDO//ync2qnOb9q7Gc82SGL/Mkk=", + "lastModified": 1774989388, + "narHash": "sha256-Ovo8q2+JxrGomrA5/iFx9TGUwWQWY0CapU6ni1gLo0s=", "owner": "logos-co", "repo": "logos-plugin-qt", - "rev": "5305602e80f76efea4208ef4c83a88f9ed7fb8e3", + "rev": "d37ad1dc16a19ff1e907d48986f04903ee86a9ac", "type": "github" }, "original": { @@ -2281,11 +2524,11 @@ ] }, "locked": { - "lastModified": 1774975654, - "narHash": "sha256-U4wEYQHHQqO8TobyDdcSiLf/rJ7ApYQRoaAhILlz3tw=", + "lastModified": 1775052093, + "narHash": "sha256-HJfrILACOcdkhT8nvK7LvzcGor6uZv5IYbACkfHGv+0=", "owner": "logos-co", "repo": "logos-standalone-app", - "rev": "4ab3e4267e66093f92ecf17c7df6a5dfe9657e8b", + "rev": "f6e13eabd144b4cf87b533cce7318536cbd03123", "type": "github" }, "original": { @@ -2351,6 +2594,33 @@ "type": "github" } }, + "nix-bundle-appimage_3": { + "inputs": { + "logos-nix": "logos-nix_64", + "nix-bundle-dir": "nix-bundle-dir_9", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "logos-package-manager", + "nix-bundle-appimage", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773961597, + "narHash": "sha256-UEUlp3VRXBcj2YlOMTQdeW3qjyGJl2V3+GMf8IXwSWA=", + "owner": "logos-co", + "repo": "nix-bundle-appimage", + "rev": "7343f6df1ebab357f51f23dff0af9d7e468638cb", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-appimage", + "type": "github" + } + }, "nix-bundle-dir": { "inputs": { "logos-nix": "logos-nix_21", @@ -2378,6 +2648,58 @@ "type": "github" } }, + "nix-bundle-dir_10": { + "inputs": { + "logos-nix": "logos-nix_66", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "logos-package-manager", + "nix-bundle-dir", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773961179, + "narHash": "sha256-bpaTvz//R8WFP5xnnDLv3a9l7unDmBwJjCewx3wCjzM=", + "owner": "logos-co", + "repo": "nix-bundle-dir", + "rev": "cd214dbf15487d80967389847ae2210468be6ebf", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-dir", + "type": "github" + } + }, + "nix-bundle-dir_11": { + "inputs": { + "logos-nix": "logos-nix_69", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "nix-bundle-lgx", + "nix-bundle-dir", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773961179, + "narHash": "sha256-bpaTvz//R8WFP5xnnDLv3a9l7unDmBwJjCewx3wCjzM=", + "owner": "logos-co", + "repo": "nix-bundle-dir", + "rev": "cd214dbf15487d80967389847ae2210468be6ebf", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-dir", + "type": "github" + } + }, "nix-bundle-dir_2": { "inputs": { "logos-nix": "logos-nix_22", @@ -2563,6 +2885,31 @@ "type": "github" } }, + "nix-bundle-dir_9": { + "inputs": { + "logos-nix": "logos-nix_65", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "logos-package-manager", + "nix-bundle-appimage", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773961179, + "narHash": "sha256-bpaTvz//R8WFP5xnnDLv3a9l7unDmBwJjCewx3wCjzM=", + "owner": "logos-co", + "repo": "nix-bundle-dir", + "rev": "cd214dbf15487d80967389847ae2210468be6ebf", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-dir", + "type": "github" + } + }, "nix-bundle-lgx": { "inputs": { "logos-nix": "logos-nix_25", @@ -2669,6 +3016,59 @@ "type": "github" } }, + "nix-bundle-lgx_5": { + "inputs": { + "logos-nix": "logos-nix_67", + "logos-package": "logos-package_8", + "nix-bundle-dir": "nix-bundle-dir_11", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "nix-bundle-lgx", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1774455541, + "narHash": "sha256-ku5gG6qKIZeWzJ/jNOxfsx1rwJ3kPrCw8/wnBKq1Uyw=", + "owner": "logos-co", + "repo": "nix-bundle-lgx", + "rev": "9d6f9016c865b9d2793672bc3c45a50b59753c78", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-lgx", + "type": "github" + } + }, + "nix-bundle-logos-module-install": { + "inputs": { + "logos-nix": "logos-nix_61", + "logos-package-manager": "logos-package-manager_3", + "nix-bundle-lgx": "nix-bundle-lgx_5", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1774899467, + "narHash": "sha256-osJph/UNShD8/i80ajUugizxJW0P4IEaZzSOsaSWCsI=", + "owner": "logos-co", + "repo": "nix-bundle-logos-module-install", + "rev": "87afbb0241a6f7c1865a12f855dce63c68d1dd7f", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-logos-module-install", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1759036355, @@ -3581,6 +3981,150 @@ "type": "github" } }, + "nixpkgs_61": { + "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_62": { + "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_63": { + "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_64": { + "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_65": { + "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_66": { + "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_67": { + "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_68": { + "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_69": { + "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_7": { "locked": { "lastModified": 1759036355, diff --git a/logos-calc-ui-cpp/flake.nix b/logos-calc-ui-cpp/flake.nix index 1c92725..3443e3e 100644 --- a/logos-calc-ui-cpp/flake.nix +++ b/logos-calc-ui-cpp/flake.nix @@ -2,7 +2,7 @@ description = "Calculator C++ UI plugin for Logos - widget frontend for calc_module"; inputs = { - logos-module-builder.url = "github:logos-co/logos-module-builder/b6cf87d30e2995e023496fcfc7f06e8127c6ac5b"; + logos-module-builder.url = "github:logos-co/logos-module-builder/46a51e5fc321ac11b966c1cc2a2cff21d36fef95"; calc_module.url = "github:logos-co/logos-tutorial/tutorial-v1?dir=logos-calc-module"; }; diff --git a/logos-calc-ui/flake.lock b/logos-calc-ui/flake.lock index db9e93c..719c81d 100644 --- a/logos-calc-ui/flake.lock +++ b/logos-calc-ui/flake.lock @@ -6,11 +6,11 @@ }, "locked": { "dir": "logos-calc-module", - "lastModified": 1775036670, - "narHash": "sha256-YHNxfw4jBVB9biuw1vG4iYX8t+MlvfXV0qlSdZq19rI=", + "lastModified": 1775039115, + "narHash": "sha256-58zYovNcJkpNAe4GzPKIkbUY5sE7YEBzXK/A5BoJf5M=", "owner": "logos-co", "repo": "logos-tutorial", - "rev": "321fe4a41a8782d2aa8ddeb9eeafc7ee353eb031", + "rev": "3085ead08566019467cce302d81029027d46ce46", "type": "github" }, "original": { @@ -311,11 +311,11 @@ ] }, "locked": { - "lastModified": 1774530738, - "narHash": "sha256-EXZ0nsVbBHdeFuXZsSeMNsTi10kA/tpxwea1PJny7G8=", + "lastModified": 1774988975, + "narHash": "sha256-wJ7Bv3TL754bZcTL2qilI0JahiVag7fLDzw8Y6Qz0pk=", "owner": "logos-co", "repo": "logos-cpp-sdk", - "rev": "01221559b7e5d7db1362128f5888adddd8a23bda", + "rev": "d633575677a3d19a8bf1d5ff687398dace532938", "type": "github" }, "original": { @@ -336,11 +336,11 @@ ] }, "locked": { - "lastModified": 1774530738, - "narHash": "sha256-EXZ0nsVbBHdeFuXZsSeMNsTi10kA/tpxwea1PJny7G8=", + "lastModified": 1774988975, + "narHash": "sha256-wJ7Bv3TL754bZcTL2qilI0JahiVag7fLDzw8Y6Qz0pk=", "owner": "logos-co", "repo": "logos-cpp-sdk", - "rev": "01221559b7e5d7db1362128f5888adddd8a23bda", + "rev": "d633575677a3d19a8bf1d5ff687398dace532938", "type": "github" }, "original": { @@ -361,11 +361,11 @@ ] }, "locked": { - "lastModified": 1774530738, - "narHash": "sha256-EXZ0nsVbBHdeFuXZsSeMNsTi10kA/tpxwea1PJny7G8=", + "lastModified": 1774988975, + "narHash": "sha256-wJ7Bv3TL754bZcTL2qilI0JahiVag7fLDzw8Y6Qz0pk=", "owner": "logos-co", "repo": "logos-cpp-sdk", - "rev": "01221559b7e5d7db1362128f5888adddd8a23bda", + "rev": "d633575677a3d19a8bf1d5ff687398dace532938", "type": "github" }, "original": { @@ -573,6 +573,7 @@ "logos-plugin-qt": "logos-plugin-qt_2", "logos-standalone-app": "logos-standalone-app_2", "nix-bundle-lgx": "nix-bundle-lgx_4", + "nix-bundle-logos-module-install": "nix-bundle-logos-module-install", "nixpkgs": [ "logos-module-builder", "logos-nix", @@ -580,17 +581,17 @@ ] }, "locked": { - "lastModified": 1774976015, - "narHash": "sha256-aPwn9elrwVI7TWLomTYwTV4hviKbaCB16SQcnQth2r8=", + "lastModified": 1775052121, + "narHash": "sha256-Z/RUMEw0eNs/rRp52zWbrG0f1RpSWLzNH9LwOArFPuo=", "owner": "logos-co", "repo": "logos-module-builder", - "rev": "b6cf87d30e2995e023496fcfc7f06e8127c6ac5b", + "rev": "46a51e5fc321ac11b966c1cc2a2cff21d36fef95", "type": "github" }, "original": { "owner": "logos-co", "repo": "logos-module-builder", - "rev": "b6cf87d30e2995e023496fcfc7f06e8127c6ac5b", + "rev": "46a51e5fc321ac11b966c1cc2a2cff21d36fef95", "type": "github" } }, @@ -740,11 +741,11 @@ ] }, "locked": { - "lastModified": 1774633164, - "narHash": "sha256-TobXeKMS1RWYKo30ujYJNnrDVhu4U1JFdtL31yIOu8c=", + "lastModified": 1774988698, + "narHash": "sha256-Ugngv17u5CA3lOSNHN6nJ+/WpIyNn8yui0M2VDdkENk=", "owner": "logos-co", "repo": "logos-module", - "rev": "8ed727449a4a6713a8c819c213b0d5d25f575580", + "rev": "337223f2a72710d8052ca750510cd25d33e05047", "type": "github" }, "original": { @@ -765,11 +766,11 @@ ] }, "locked": { - "lastModified": 1774633164, - "narHash": "sha256-TobXeKMS1RWYKo30ujYJNnrDVhu4U1JFdtL31yIOu8c=", + "lastModified": 1774988698, + "narHash": "sha256-Ugngv17u5CA3lOSNHN6nJ+/WpIyNn8yui0M2VDdkENk=", "owner": "logos-co", "repo": "logos-module", - "rev": "8ed727449a4a6713a8c819c213b0d5d25f575580", + "rev": "337223f2a72710d8052ca750510cd25d33e05047", "type": "github" }, "original": { @@ -1857,6 +1858,168 @@ "type": "github" } }, + "logos-nix_61": { + "inputs": { + "nixpkgs": "nixpkgs_61" + }, + "locked": { + "lastModified": 1774455309, + "narHash": "sha256-3AN7aFnArdysrbQQ2UskWzjNSFADb4hDCsnx69Fa0ng=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "e637a1f5e871244d1c2df1e3c52a067f2eb406f2", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_62": { + "inputs": { + "nixpkgs": "nixpkgs_62" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_63": { + "inputs": { + "nixpkgs": "nixpkgs_63" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_64": { + "inputs": { + "nixpkgs": "nixpkgs_64" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_65": { + "inputs": { + "nixpkgs": "nixpkgs_65" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_66": { + "inputs": { + "nixpkgs": "nixpkgs_66" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_67": { + "inputs": { + "nixpkgs": "nixpkgs_67" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_68": { + "inputs": { + "nixpkgs": "nixpkgs_68" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, + "logos-nix_69": { + "inputs": { + "nixpkgs": "nixpkgs_69" + }, + "locked": { + "lastModified": 1773955630, + "narHash": "sha256-KqzMoWYIVp2xMgphs7v02T/BE54RKMFxpdC2duhJKG0=", + "owner": "logos-co", + "repo": "logos-nix", + "rev": "0e9e6d66ab8eb34f59e45ed448f7dc29130feb88", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-nix", + "type": "github" + } + }, "logos-nix_7": { "inputs": { "nixpkgs": "nixpkgs_7" @@ -1998,6 +2161,34 @@ "type": "github" } }, + "logos-package-manager_3": { + "inputs": { + "logos-nix": "logos-nix_62", + "logos-package": "logos-package_7", + "nix-bundle-appimage": "nix-bundle-appimage_3", + "nix-bundle-dir": "nix-bundle-dir_10", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "logos-package-manager", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1774635434, + "narHash": "sha256-9LRXf/Wy500rNO9IhDSH+PSuadS3TguNFCbcbI4YYZU=", + "owner": "logos-co", + "repo": "logos-package-manager", + "rev": "e5c25989861f4487c3dc8c7b3bc0062bcbc3221f", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-package-manager", + "type": "github" + } + }, "logos-package_2": { "inputs": { "logos-nix": "logos-nix_26", @@ -2129,6 +2320,58 @@ "type": "github" } }, + "logos-package_7": { + "inputs": { + "logos-nix": "logos-nix_63", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "logos-package-manager", + "logos-package", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773965173, + "narHash": "sha256-toDnGXUthRcQm7vcEYzb2bLI7FE1tbfzH8Ie2Cnb9mk=", + "owner": "logos-co", + "repo": "logos-package", + "rev": "9e3730d5c0e3ec955761c05b50e3a6047ee4030b", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-package", + "type": "github" + } + }, + "logos-package_8": { + "inputs": { + "logos-nix": "logos-nix_68", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "nix-bundle-lgx", + "logos-package", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773965173, + "narHash": "sha256-toDnGXUthRcQm7vcEYzb2bLI7FE1tbfzH8Ie2Cnb9mk=", + "owner": "logos-co", + "repo": "logos-package", + "rev": "9e3730d5c0e3ec955761c05b50e3a6047ee4030b", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "logos-package", + "type": "github" + } + }, "logos-plugin-core": { "inputs": { "logos-cpp-sdk": "logos-cpp-sdk", @@ -2169,11 +2412,11 @@ ] }, "locked": { - "lastModified": 1774706519, - "narHash": "sha256-DJwgxju0ZVxYV5cxVDO//ync2qnOb9q7Gc82SGL/Mkk=", + "lastModified": 1774989388, + "narHash": "sha256-Ovo8q2+JxrGomrA5/iFx9TGUwWQWY0CapU6ni1gLo0s=", "owner": "logos-co", "repo": "logos-plugin-qt", - "rev": "5305602e80f76efea4208ef4c83a88f9ed7fb8e3", + "rev": "d37ad1dc16a19ff1e907d48986f04903ee86a9ac", "type": "github" }, "original": { @@ -2222,11 +2465,11 @@ ] }, "locked": { - "lastModified": 1774706519, - "narHash": "sha256-DJwgxju0ZVxYV5cxVDO//ync2qnOb9q7Gc82SGL/Mkk=", + "lastModified": 1774989388, + "narHash": "sha256-Ovo8q2+JxrGomrA5/iFx9TGUwWQWY0CapU6ni1gLo0s=", "owner": "logos-co", "repo": "logos-plugin-qt", - "rev": "5305602e80f76efea4208ef4c83a88f9ed7fb8e3", + "rev": "d37ad1dc16a19ff1e907d48986f04903ee86a9ac", "type": "github" }, "original": { @@ -2281,11 +2524,11 @@ ] }, "locked": { - "lastModified": 1774975654, - "narHash": "sha256-U4wEYQHHQqO8TobyDdcSiLf/rJ7ApYQRoaAhILlz3tw=", + "lastModified": 1775052093, + "narHash": "sha256-HJfrILACOcdkhT8nvK7LvzcGor6uZv5IYbACkfHGv+0=", "owner": "logos-co", "repo": "logos-standalone-app", - "rev": "4ab3e4267e66093f92ecf17c7df6a5dfe9657e8b", + "rev": "f6e13eabd144b4cf87b533cce7318536cbd03123", "type": "github" }, "original": { @@ -2351,6 +2594,33 @@ "type": "github" } }, + "nix-bundle-appimage_3": { + "inputs": { + "logos-nix": "logos-nix_64", + "nix-bundle-dir": "nix-bundle-dir_9", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "logos-package-manager", + "nix-bundle-appimage", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773961597, + "narHash": "sha256-UEUlp3VRXBcj2YlOMTQdeW3qjyGJl2V3+GMf8IXwSWA=", + "owner": "logos-co", + "repo": "nix-bundle-appimage", + "rev": "7343f6df1ebab357f51f23dff0af9d7e468638cb", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-appimage", + "type": "github" + } + }, "nix-bundle-dir": { "inputs": { "logos-nix": "logos-nix_21", @@ -2378,6 +2648,58 @@ "type": "github" } }, + "nix-bundle-dir_10": { + "inputs": { + "logos-nix": "logos-nix_66", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "logos-package-manager", + "nix-bundle-dir", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773961179, + "narHash": "sha256-bpaTvz//R8WFP5xnnDLv3a9l7unDmBwJjCewx3wCjzM=", + "owner": "logos-co", + "repo": "nix-bundle-dir", + "rev": "cd214dbf15487d80967389847ae2210468be6ebf", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-dir", + "type": "github" + } + }, + "nix-bundle-dir_11": { + "inputs": { + "logos-nix": "logos-nix_69", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "nix-bundle-lgx", + "nix-bundle-dir", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773961179, + "narHash": "sha256-bpaTvz//R8WFP5xnnDLv3a9l7unDmBwJjCewx3wCjzM=", + "owner": "logos-co", + "repo": "nix-bundle-dir", + "rev": "cd214dbf15487d80967389847ae2210468be6ebf", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-dir", + "type": "github" + } + }, "nix-bundle-dir_2": { "inputs": { "logos-nix": "logos-nix_22", @@ -2563,6 +2885,31 @@ "type": "github" } }, + "nix-bundle-dir_9": { + "inputs": { + "logos-nix": "logos-nix_65", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "logos-package-manager", + "nix-bundle-appimage", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773961179, + "narHash": "sha256-bpaTvz//R8WFP5xnnDLv3a9l7unDmBwJjCewx3wCjzM=", + "owner": "logos-co", + "repo": "nix-bundle-dir", + "rev": "cd214dbf15487d80967389847ae2210468be6ebf", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-dir", + "type": "github" + } + }, "nix-bundle-lgx": { "inputs": { "logos-nix": "logos-nix_25", @@ -2669,6 +3016,59 @@ "type": "github" } }, + "nix-bundle-lgx_5": { + "inputs": { + "logos-nix": "logos-nix_67", + "logos-package": "logos-package_8", + "nix-bundle-dir": "nix-bundle-dir_11", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "nix-bundle-lgx", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1774455541, + "narHash": "sha256-ku5gG6qKIZeWzJ/jNOxfsx1rwJ3kPrCw8/wnBKq1Uyw=", + "owner": "logos-co", + "repo": "nix-bundle-lgx", + "rev": "9d6f9016c865b9d2793672bc3c45a50b59753c78", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-lgx", + "type": "github" + } + }, + "nix-bundle-logos-module-install": { + "inputs": { + "logos-nix": "logos-nix_61", + "logos-package-manager": "logos-package-manager_3", + "nix-bundle-lgx": "nix-bundle-lgx_5", + "nixpkgs": [ + "logos-module-builder", + "nix-bundle-logos-module-install", + "logos-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1774899467, + "narHash": "sha256-osJph/UNShD8/i80ajUugizxJW0P4IEaZzSOsaSWCsI=", + "owner": "logos-co", + "repo": "nix-bundle-logos-module-install", + "rev": "87afbb0241a6f7c1865a12f855dce63c68d1dd7f", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-logos-module-install", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1759036355, @@ -3581,6 +3981,150 @@ "type": "github" } }, + "nixpkgs_61": { + "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_62": { + "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_63": { + "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_64": { + "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_65": { + "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_66": { + "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_67": { + "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_68": { + "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_69": { + "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_7": { "locked": { "lastModified": 1759036355, diff --git a/logos-calc-ui/flake.nix b/logos-calc-ui/flake.nix index d64f727..f269a73 100644 --- a/logos-calc-ui/flake.nix +++ b/logos-calc-ui/flake.nix @@ -2,7 +2,7 @@ description = "Calculator QML UI Plugin for Logos - frontend for calc_module"; inputs = { - logos-module-builder.url = "github:logos-co/logos-module-builder/b6cf87d30e2995e023496fcfc7f06e8127c6ac5b"; + logos-module-builder.url = "github:logos-co/logos-module-builder/46a51e5fc321ac11b966c1cc2a2cff21d36fef95"; calc_module.url = "github:logos-co/logos-tutorial/tutorial-v1?dir=logos-calc-module"; }; diff --git a/logos-developer-guide.md b/logos-developer-guide.md index c9620f4..927e808 100644 --- a/logos-developer-guide.md +++ b/logos-developer-guide.md @@ -93,7 +93,8 @@ The **Logos platform** is a modular application framework built in C++ on top of | **logos-liblogos** | [logos-co/logos-liblogos](https://github.com/logos-co/logos-liblogos) | Core library (`logos_host`, `liblogos_core`) | | **logos-logoscore-cli** | [logos-co/logos-logoscore-cli](https://github.com/logos-co/logos-logoscore-cli) | Headless CLI runtime (`logoscore`) | | **logos-package** | [logos-co/logos-package](https://github.com/logos-co/logos-package) | LGX package format library + `lgx` CLI | -| **logos-package-manager-module** | [logos-co/logos-package-manager-module](https://github.com/logos-co/logos-package-manager-module) | Package manager module + `lgpm` CLI | +| **logos-package-manager** | [logos-co/logos-package-manager](https://github.com/logos-co/logos-package-manager) | Local package manager library + `lgpm` CLI | +| **logos-package-downloader** | [logos-co/logos-package-downloader](https://github.com/logos-co/logos-package-downloader) | Online catalog browser + `lgpd` CLI | | **logos-standalone-app** | [logos-co/logos-standalone-app](https://github.com/logos-co/logos-standalone-app) | Minimal shell for running/testing UI modules in isolation | | **logos-basecamp** | [logos-co/logos-basecamp](https://github.com/logos-co/logos-basecamp) | Desktop application shell | @@ -131,18 +132,20 @@ The fastest way to create a new module is using the **logos-module-builder** tem mkdir logos-my-module && cd logos-my-module # Scaffold a minimal core module (no external dependencies) -nix flake init -t github:logos-co/logos-module-builder/b6cf87d30e2995e023496fcfc7f06e8127c6ac5b +nix flake init -t github:logos-co/logos-module-builder/46a51e5fc321ac11b966c1cc2a2cff21d36fef95 # Or scaffold a module that wraps an external C/C++ library -nix flake init -t github:logos-co/logos-module-builder/b6cf87d30e2995e023496fcfc7f06e8127c6ac5b#with-external-lib +nix flake init -t github:logos-co/logos-module-builder/46a51e5fc321ac11b966c1cc2a2cff21d36fef95#with-external-lib # For UI modules (C++ Qt widget with logos-standalone-app runner) -nix flake init -t github:logos-co/logos-module-builder/b6cf87d30e2995e023496fcfc7f06e8127c6ac5b#ui-module +nix flake init -t github:logos-co/logos-module-builder/46a51e5fc321ac11b966c1cc2a2cff21d36fef95#ui-module # For QML UI modules (with logos-standalone-app runner) -nix flake init -t github:logos-co/logos-module-builder/b6cf87d30e2995e023496fcfc7f06e8127c6ac5b#ui-qml-module +nix flake init -t github:logos-co/logos-module-builder/46a51e5fc321ac11b966c1cc2a2cff21d36fef95#ui-qml-module ``` +> **Note:** The generated `flake.nix` uses an unpinned `logos-module-builder` URL. For reproducible builds, pin it to a specific commit — see the `flake.nix` examples in [Section 3.2](#32-building-lgx-packages) and the [tutorials](tutorial-wrapping-c-library.md#23-flakenix--nix-build-config). + **Available templates:** | Template | Use Case | @@ -421,7 +424,7 @@ This works because `logos-module-builder` includes `nix-bundle-lgx` as its own d ```nix { inputs = { - logos-module-builder.url = "github:logos-co/logos-module-builder/b6cf87d30e2995e023496fcfc7f06e8127c6ac5b"; + logos-module-builder.url = "github:logos-co/logos-module-builder/46a51e5fc321ac11b966c1cc2a2cff21d36fef95"; }; outputs = inputs@{ logos-module-builder, ... }: @@ -668,18 +671,18 @@ logos-basecamp produces two binary variants: ```bash # Build the development version -nix build 'github:logos-co/logos-basecamp/70169584a44d954f638e34842bcfebf741e6bcfe#app' --out-link ./logos-basecamp +nix build 'github:logos-co/logos-basecamp/4958efebce73eaa8776fdfa314d4c84fce656db1#app' --out-link ./logos-basecamp # Run the dev binary ./logos-basecamp/bin/logos-basecamp # Build the portable/distributed version -nix build 'github:logos-co/logos-basecamp/70169584a44d954f638e34842bcfebf741e6bcfe#portable' --out-link ./logos-basecamp-portable +nix build 'github:logos-co/logos-basecamp/4958efebce73eaa8776fdfa314d4c84fce656db1#portable' --out-link ./logos-basecamp-portable # Or build platform-specific distributions: -nix build 'github:logos-co/logos-basecamp/70169584a44d954f638e34842bcfebf741e6bcfe#bin-bundle-dir' # Flat directory bundle -nix build 'github:logos-co/logos-basecamp/70169584a44d954f638e34842bcfebf741e6bcfe#bin-appimage' # Linux AppImage -nix build 'github:logos-co/logos-basecamp/70169584a44d954f638e34842bcfebf741e6bcfe#bin-macos-app' # macOS .app bundle +nix build 'github:logos-co/logos-basecamp/4958efebce73eaa8776fdfa314d4c84fce656db1#bin-bundle-dir' # Flat directory bundle +nix build 'github:logos-co/logos-basecamp/4958efebce73eaa8776fdfa314d4c84fce656db1#bin-appimage' # Linux AppImage +nix build 'github:logos-co/logos-basecamp/4958efebce73eaa8776fdfa314d4c84fce656db1#bin-macos-app' # macOS .app bundle ``` > **Note:** When installing modules into logos-basecamp, the LGX variant type must match the build type. Dev builds of basecamp expect **dev** LGX variants (e.g., `darwin-arm64-dev`), while portable builds expect **portable** variants (e.g., `darwin-arm64`). Use the `dual` bundler (see [3.2](#32-bundling-with-nix-bundle-lgx)) to produce packages that work with both. @@ -923,7 +926,8 @@ When your module is installed via `lgpm`, its dependencies are automatically res | [logos-liblogos](https://github.com/logos-co/logos-liblogos) | Core library | `logos_host`, `liblogos_core` | | [logos-logoscore-cli](https://github.com/logos-co/logos-logoscore-cli) | Headless CLI runtime | `logoscore` (CLI) | | [logos-package](https://github.com/logos-co/logos-package) | Package format | `lgx` (CLI), `liblgx` (library) | -| [logos-package-manager-module](https://github.com/logos-co/logos-package-manager-module) | Package management | `lgpm` (CLI), `package_manager_plugin` | +| [logos-package-manager](https://github.com/logos-co/logos-package-manager) | Local package management | `lgpm` (CLI) | +| [logos-package-downloader](https://github.com/logos-co/logos-package-downloader) | Online catalog + downloads | `lgpd` (CLI) | | [logos-standalone-app](https://github.com/logos-co/logos-standalone-app) | Minimal UI module runner | `logos-standalone-app` (loads a single UI plugin for testing) | | [logos-basecamp](https://github.com/logos-co/logos-basecamp) | Desktop app shell | `LogosApp` (GUI), MDI workspace, plugin loader | @@ -953,15 +957,24 @@ logoscore stop # Stop daemon logoscore -m -l -c ".(args)" [--quit-on-finish] ``` -### `lgpm` -- Package Manager +### `lgpm` -- Local Package Manager ```bash -./package-manager/bin/lgpm search # Search packages -./package-manager/bin/lgpm list [--category ] [--installed] # List packages -./package-manager/bin/lgpm install [pkgs...] # Install with dependency resolution -./package-manager/bin/lgpm install --file # Install local file -./package-manager/bin/lgpm info # Package details -./package-manager/bin/lgpm categories # List categories +./package-manager/bin/lgpm --modules-dir install --file # Install from local .lgx file +./package-manager/bin/lgpm --modules-dir install --dir # Install all .lgx files in a directory +./package-manager/bin/lgpm --modules-dir list # List installed packages +./package-manager/bin/lgpm --modules-dir info # Show installed package details +``` + +### `lgpd` -- Package Downloader + +```bash +./downloader/bin/lgpd search # Search packages by name/description +./downloader/bin/lgpd list [--category ] # List available packages +./downloader/bin/lgpd categories # List available categories +./downloader/bin/lgpd info # Show package details from catalog +./downloader/bin/lgpd download [-o ] # Download .lgx package +./downloader/bin/lgpd --release download # Download from specific release ``` ### `logos-cpp-generator` -- SDK Code Generator @@ -1059,7 +1072,7 @@ When running a UI module with `nix run`, the standalone app automatically bundle 3. **Each dependency must have a matching flake input** — the flake input name must exactly match the dependency name in `metadata.json`: ```nix inputs = { - logos-module-builder.url = "github:logos-co/logos-module-builder/b6cf87d30e2995e023496fcfc7f06e8127c6ac5b"; + logos-module-builder.url = "github:logos-co/logos-module-builder/46a51e5fc321ac11b966c1cc2a2cff21d36fef95"; calc_module.url = "github:logos-co/logos-tutorial/tutorial-v1?dir=logos-calc-module"; storage_module.url = "github:logos-co/logos-storage-module"; }; @@ -1079,7 +1092,7 @@ When running a UI module with `nix run`, the standalone app automatically bundle { description = "My UI module"; inputs = { - logos-module-builder.url = "github:logos-co/logos-module-builder/b6cf87d30e2995e023496fcfc7f06e8127c6ac5b"; + logos-module-builder.url = "github:logos-co/logos-module-builder/46a51e5fc321ac11b966c1cc2a2cff21d36fef95"; calc_module.url = "github:logos-co/logos-tutorial/tutorial-v1?dir=logos-calc-module"; }; outputs = inputs@{ logos-module-builder, ... }: @@ -1096,7 +1109,7 @@ When running a UI module with `nix run`, the standalone app automatically bundle { description = "My QML UI module"; inputs = { - logos-module-builder.url = "github:logos-co/logos-module-builder/b6cf87d30e2995e023496fcfc7f06e8127c6ac5b"; + logos-module-builder.url = "github:logos-co/logos-module-builder/46a51e5fc321ac11b966c1cc2a2cff21d36fef95"; calc_module.url = "github:logos-co/logos-tutorial/tutorial-v1?dir=logos-calc-module"; }; outputs = inputs@{ logos-module-builder, ... }: @@ -1115,9 +1128,9 @@ If the module doesn't appear, check: ### Capability module not found -logos-basecamp requires the `capability` module to be installed. It is bundled as a preinstall `.lgx` package and installed on first launch. If you see errors about it: +logos-basecamp requires the `capability` module to be installed. It is bundled with basecamp and installed on first launch. If you see errors about it: -1. Check that the preinstall directory exists: `ls ./logos-basecamp/preinstall/` +1. Check that the `modules/` and `plugins/` directories exist next to `bin/` and `lib/` in the basecamp build output 2. Check that the capability module was extracted to the modules directory 3. Verify the LGX variant type matches your basecamp build (dev variant for dev build, portable for portable build) diff --git a/tutorial-cpp-ui-app.md b/tutorial-cpp-ui-app.md index a9f95cb..416c665 100644 --- a/tutorial-cpp-ui-app.md +++ b/tutorial-cpp-ui-app.md @@ -48,10 +48,12 @@ The plugin implements `createWidget()` which returns a `QWidget*`. The widget is ```bash mkdir logos-calc-ui-cpp && cd logos-calc-ui-cpp -nix flake init -t github:logos-co/logos-module-builder/b6cf87d30e2995e023496fcfc7f06e8127c6ac5b#ui-module +nix flake init -t github:logos-co/logos-module-builder/46a51e5fc321ac11b966c1cc2a2cff21d36fef95#ui-module git init && git add -A ``` +> **Note:** The generated `flake.nix` uses an unpinned `logos-module-builder` URL. Replace it with the pinned version shown in [Step 9](#step-9-flakenix) to ensure reproducible builds. + This gives you: ``` @@ -138,6 +140,8 @@ logos_module( src/calc_ui_cpp_plugin.cpp src/calc_backend.h src/calc_backend.cpp + INCLUDE_DIRS + ${CMAKE_CURRENT_SOURCE_DIR}/interfaces ) find_package(Qt6 REQUIRED COMPONENTS Widgets) @@ -170,11 +174,36 @@ Q_DECLARE_INTERFACE(CalcUiCppInterface, CalcUiCppInterface_iid) #endif // CALC_UI_CPP_INTERFACE_H ``` +The template also scaffolds `interfaces/IComponent.h` — the widget interface that `logos-basecamp` uses to load C++ UI plugins. You don't need to modify this file: + +```cpp +// interfaces/IComponent.h (scaffolded by the template — do not modify) +#pragma once + +#include +#include +#include + +class LogosAPI; + +class IComponent { +public: + virtual ~IComponent() = default; + virtual QWidget* createWidget(LogosAPI* logosAPI = nullptr) = 0; + virtual void destroyWidget(QWidget* widget) = 0; +}; + +#define IComponent_iid "com.logos.component.IComponent" +Q_DECLARE_INTERFACE(IComponent, IComponent_iid) +``` + --- ## Step 5: Plugin Header (`src/calc_ui_cpp_plugin.h`) -Replace the scaffolded plugin header. This header is the same for both Option A and Option B — only the `.cpp` implementation differs: +Replace the scaffolded plugin header. This header is the same for both Option A and Option B — only the `.cpp` implementation differs. + +> **Key difference from core modules:** C++ UI plugins must inherit from `IComponent` (from `interfaces/IComponent.h`, scaffolded by the template) and use `IComponent_iid` as the plugin metadata IID. This is how `logos-basecamp` identifies and loads widget-based UI plugins. Without `IComponent`, basecamp will fail with "Failed to cast plugin to IComponent". ```cpp #ifndef CALC_UI_CPP_PLUGIN_H @@ -183,15 +212,14 @@ Replace the scaffolded plugin header. This header is the same for both Option A #include #include #include +#include #include "calc_ui_cpp_interface.h" -class LogosAPI; - -class CalcUiCppPlugin : public QObject, public CalcUiCppInterface +class CalcUiCppPlugin : public QObject, public CalcUiCppInterface, public IComponent { Q_OBJECT - Q_PLUGIN_METADATA(IID CalcUiCppInterface_iid FILE "metadata.json") - Q_INTERFACES(CalcUiCppInterface PluginInterface) + Q_PLUGIN_METADATA(IID IComponent_iid FILE "metadata.json") + Q_INTERFACES(CalcUiCppInterface PluginInterface IComponent) public: explicit CalcUiCppPlugin(QObject* parent = nullptr); @@ -389,6 +417,8 @@ logos_module( src/calc_ui_cpp_plugin.cpp src/calc_backend.h src/calc_backend.cpp + INCLUDE_DIRS + ${CMAKE_CURRENT_SOURCE_DIR}/interfaces ) find_package(Qt6 REQUIRED COMPONENTS Widgets Quick QuickWidgets) @@ -593,7 +623,7 @@ Since `metadata.json` declares `"type": "ui"`, `mkLogosModule` automatically wir description = "Calculator C++ UI plugin for Logos - widget frontend for calc_module"; inputs = { - logos-module-builder.url = "github:logos-co/logos-module-builder/b6cf87d30e2995e023496fcfc7f06e8127c6ac5b"; + logos-module-builder.url = "github:logos-co/logos-module-builder/46a51e5fc321ac11b966c1cc2a2cff21d36fef95"; calc_module.url = "github:logos-co/logos-tutorial/tutorial-v1?dir=logos-calc-module"; }; @@ -616,6 +646,8 @@ Because `metadata.json` declares `"type": "ui"`, `mkLogosModule` automatically w ```bash git add -A +nix flake update +git add flake.lock nix build --override-input calc_module path:../logos-calc-module ``` @@ -636,46 +668,41 @@ You should see `createWidget` and `destroyWidget` in the methods list. ### 10.2 UI only (layout preview) ```bash -nix run . --override-input calc_module path:../logos-calc-module +nix run . ``` -The widget opens. No backend connected yet, so button clicks will silently return 0 (CalcBackend logs a warning when `calc_module` is not connected). - -> **When do you need `--override-input`?** `calc_module.url` in `flake.nix` points to the published GitHub URL. If your local `logos-calc-module` has unpushed changes or differs from what is on GitHub, you must use `--override-input calc_module path:../logos-calc-module` so nix uses your local copy. If your `calc_module` is already pushed and matches the GitHub URL, you can run `nix build` / `nix run` without the override. This is the same mechanism `ws build --local` / `ws build --auto-local` uses throughout the workspace. +The widget opens. No backend module is loaded, so button clicks will silently return 0 (CalcBackend logs a warning when `calc_module` is not connected) — but you can verify the layout looks correct. ### 10.3 Full functionality (with modules) -The `capability_module` is loaded automatically by the standalone app. You only need to install `calc_module`: +The standalone app automatically bundles and loads all module dependencies declared in `metadata.json`. To test with your local `calc_module` from Part 1: ```bash -nix build 'github:logos-co/logos-package-manager/e5c25989861f4487c3dc8c7b3bc0062bcbc3221f#cli' --out-link ./pm -mkdir -p modules - -# Bundle and install calc_module (from Part 1) -cd ../logos-calc-module -nix build '.#lgx' -cd ../logos-calc-ui-cpp -./pm/bin/lgpm --modules-dir ./modules install --file ../logos-calc-module/result/*.lgx - -nix run . --override-input calc_module path:../logos-calc-module -- --modules-dir ./modules +nix run . --override-input calc_module path:../logos-calc-module ``` +Clicking **Add**, **Multiply**, **Factorial**, or **Fibonacci** now calls the real module. + +> **When do you need `--override-input`?** `calc_module.url` in `flake.nix` points to the published GitHub URL. If your local `logos-calc-module` has unpushed changes or differs from what is on GitHub, you must use `--override-input calc_module path:../logos-calc-module` so nix uses your local copy. If your `calc_module` is already pushed and matches the GitHub URL, you can run `nix build` / `nix run` without the override. This is the same mechanism `ws build --local` / `ws build --auto-local` uses throughout the workspace. + --- ## Step 11: Load in `logos-basecamp` ### 11.1 Create LGX packages +Use `--out-link` to avoid overwriting the `result` symlink: + ```bash # Package calc_module (from Part 1) cd ../logos-calc-module -nix build '.#lgx' -nix build '.#lgx-portable' +nix build '.#lgx' --out-link result-lgx +nix build '.#lgx-portable' --out-link result-lgx-portable # Package the C++ UI plugin cd ../logos-calc-ui-cpp -nix build '.#lgx' -nix build '.#lgx-portable' +nix build '.#lgx' --out-link result-lgx +nix build '.#lgx-portable' --out-link result-lgx-portable ``` > For more bundling options (standalone bundler syntax, cross-platform packaging), see the [Developer Guide — Bundling with nix-bundle-lgx](logos-developer-guide.md#32-bundling-with-nix-bundle-lgx). @@ -688,7 +715,7 @@ Build logos-basecamp, launch it once to preinstall its bundled modules, then ins ```bash # Build logos-basecamp -nix build 'github:logos-co/logos-basecamp/70169584a44d954f638e34842bcfebf741e6bcfe' -o basecamp-result +nix build 'github:logos-co/logos-basecamp/4958efebce73eaa8776fdfa314d4c84fce656db1' -o basecamp-result # Launch once to preinstall bundled modules, then close it ./basecamp-result/bin/logos-basecamp @@ -706,33 +733,80 @@ ls ~/.local/share/Logos/ The dev build directory is named `LogosBasecampDev` (portable builds use `LogosBasecamp`). -Install your modules using `lgpm` (substitute `BASECAMP_DIR` with the actual path you found above): +Install your modules using `lgpm`. First, set `BASECAMP_DIR` to your platform's path: + +```bash +# macOS: +BASECAMP_DIR="$HOME/Library/Application Support/Logos/LogosBasecampDev" + +# Linux: +BASECAMP_DIR="$HOME/.local/share/Logos/LogosBasecampDev" +``` ```bash # Build lgpm CLI nix build 'github:logos-co/logos-package-manager/e5c25989861f4487c3dc8c7b3bc0062bcbc3221f#cli' --out-link ./pm # Install core module -./pm/bin/lgpm --modules-dir BASECAMP_DIR/modules \ - install --file ../logos-calc-module/result/*.lgx +./pm/bin/lgpm --modules-dir "$BASECAMP_DIR/modules" \ + install --file ../logos-calc-module/result-lgx/*.lgx # Install UI plugin -./pm/bin/lgpm --modules-dir BASECAMP_DIR/plugins \ - install --file result/*.lgx +./pm/bin/lgpm --ui-plugins-dir "$BASECAMP_DIR/plugins" \ + install --file result-lgx/*.lgx # Launch basecamp -- your modules appear alongside the built-in ones ./basecamp-result/bin/logos-basecamp ``` -### 11.3 Install via logos-basecamp UI +### 11.3 Portable basecamp build (optional) + +The dev build above depends on nix store paths at runtime. For a self-contained portable build that works without nix: + +```bash +# Build portable basecamp (bundles all Qt frameworks/libraries) +nix build 'github:logos-co/logos-basecamp/4958efebce73eaa8776fdfa314d4c84fce656db1#bin-bundle-dir' -o basecamp-portable + +# Launch once to preinstall bundled modules +./basecamp-portable/bin/logos-basecamp +``` + +The portable build uses a different data directory (`LogosBasecamp` instead of `LogosBasecampDev`). Set `BASECAMP_DIR` to your platform's path: + +```bash +# macOS: +BASECAMP_DIR="$HOME/Library/Application Support/Logos/LogosBasecamp" + +# Linux: +BASECAMP_DIR="$HOME/.local/share/Logos/LogosBasecamp" +``` + +Install your modules using the **portable** `.lgx` variants: + +```bash +# Install core module (use portable variant) +./pm/bin/lgpm --modules-dir "$BASECAMP_DIR/modules" \ + install --file ../logos-calc-module/result-lgx-portable/*.lgx + +# Install UI plugin (use portable variant) +./pm/bin/lgpm --ui-plugins-dir "$BASECAMP_DIR/plugins" \ + install --file result-lgx-portable/*.lgx + +# Launch +./basecamp-portable/bin/logos-basecamp +``` + +> **Important:** Portable basecamp requires portable `.lgx` variants (`result-lgx-portable`), and the dev build requires dev variants (`result-lgx`). Mixing them will cause loading failures. + +### 11.4 Install via logos-basecamp UI Instead of using `lgpm` on the command line, you can install modules through the basecamp UI: 1. Launch `logos-basecamp` 2. Go to **Package Manager** 3. Click **Install from file** -4. Select `../logos-calc-module/result/*.lgx` — installs `calc_module` -5. Repeat for `result/*.lgx` — installs `calc_ui_cpp` +4. Select `../logos-calc-module/result-lgx/*.lgx` — installs `calc_module` +5. Repeat for `result-lgx/*.lgx` — installs `calc_ui_cpp` The "Calculator" tab appears in the sidebar. @@ -753,11 +827,12 @@ QML_DISABLE_DISK_CACHE=1 ./basecamp-result/bin/logos-basecamp When switching between portable and dev builds of basecamp, or running multiple basecamp instances, the data directory can get into a bad state (stale modules, mixed variants, corrupted preinstall). Clear it and let basecamp re-preinstall on next launch: ```bash -# Remove basecamp's data directory (find yours under Application Support or .local/share) -# macOS (typical): +# Remove basecamp's data directory +# macOS: rm -rf ~/Library/Application\ Support/Logos/LogosBasecampDev -# Linux (typical): -# rm -rf ~/.local/share/Logos/LogosBasecampDev + +# Linux: +rm -rf ~/.local/share/Logos/LogosBasecampDev # Relaunch — basecamp will re-preinstall its bundled modules ./basecamp-result/bin/logos-basecamp diff --git a/tutorial-qml-ui-app.md b/tutorial-qml-ui-app.md index 58579bb..04fdbd9 100644 --- a/tutorial-qml-ui-app.md +++ b/tutorial-qml-ui-app.md @@ -48,10 +48,12 @@ Use the QML module template from `logos-module-builder`: ```bash mkdir logos-calc-ui && cd logos-calc-ui -nix flake init -t github:logos-co/logos-module-builder/b6cf87d30e2995e023496fcfc7f06e8127c6ac5b#ui-qml-module +nix flake init -t github:logos-co/logos-module-builder/46a51e5fc321ac11b966c1cc2a2cff21d36fef95#ui-qml-module git init && git add -A ``` +> **Note:** The generated `flake.nix` uses an unpinned `logos-module-builder` URL. Replace it with the pinned version shown in [Step 4](#step-4-update-flakenix) to ensure reproducible builds. + This gives you: ``` @@ -94,6 +96,14 @@ Replace the template contents with your plugin's details. The template may gener } ``` +Create the icon directory and add a placeholder icon. The icon is displayed in the `logos-basecamp` sidebar when the module is loaded: + +```bash +mkdir -p icons +# Copy any PNG here — or generate a 64×64 placeholder: +echo "iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAmElEQVR4nO3QMREAIBDAsFeEN3ziCWRkoEP2XmedfX82OkBrgA7QGqADtAboAK0BOkBrgA7QGqADtAboAK0BOkBrgA7QGqADtAboAK0BOkBrgA7QGqADtAboAK0BOkBrgA7QGqADtAboAK0BOkBrgA7QGqADtAboAK0BOkBrgA7QGqADtAboAK0BOkBrgA7QGqADtAboAO0BN/SiO/PatoIAAAAASUVORK5CYII=" | base64 -d > icons/calc.png +``` + The `dependencies` field tells the host to load `calc_module` before showing your UI. > **Naming convention:** Each entry in `dependencies` must match the `name` field in that module's own `metadata.json`. When adding a dependency as a flake input, the **input attribute name** must also match the dependency name — e.g., `calc_module.url = "github:logos-co/logos-tutorial/tutorial-v1?dir=logos-calc-module"`. The URL can point to any repo, but the attribute name is how the builder resolves dependencies. @@ -245,7 +255,7 @@ The template already has everything wired up. Update the description and add `ca description = "Calculator QML UI Plugin for Logos - frontend for calc_module"; inputs = { - logos-module-builder.url = "github:logos-co/logos-module-builder/b6cf87d30e2995e023496fcfc7f06e8127c6ac5b"; + logos-module-builder.url = "github:logos-co/logos-module-builder/46a51e5fc321ac11b966c1cc2a2cff21d36fef95"; calc_module.url = "github:logos-co/logos-tutorial/tutorial-v1?dir=logos-calc-module"; # must match dependency name in metadata.json }; @@ -268,6 +278,8 @@ The template already has everything wired up. Update the description and add `ca ```bash git add -A +nix flake update # regenerate flake.lock to match the pinned inputs in flake.nix +git add flake.lock nix run . ``` @@ -275,23 +287,10 @@ The app opens immediately. No modules are loaded, so clicking buttons shows "Log ### 5.2 Full functionality (with modules) -To test actual calls to `calc_module`, you need a modules directory with `calc_module` installed via `lgpm`. The `capability_module` is loaded automatically by the standalone app. Do this once: +The standalone app automatically bundles and loads all module dependencies declared in `metadata.json`. To test with your local `calc_module` from Part 1: ```bash -nix build 'github:logos-co/logos-package-manager/e5c25989861f4487c3dc8c7b3bc0062bcbc3221f#cli' --out-link ./pm -mkdir -p modules - -# Bundle and install calc_module (from Part 1) -cd ../logos-calc-module -nix build '.#lgx' -cd ../logos-calc-ui -./pm/bin/lgpm --modules-dir ./modules install --file ../logos-calc-module/result/*.lgx -``` - -Then run with the modules directory: - -```bash -nix run . -- --modules-dir ./modules +nix run . --override-input calc_module path:../logos-calc-module ``` Clicking **Add**, **Multiply**, **Factorial**, or **Fibonacci** now calls the real module. @@ -343,18 +342,18 @@ Available theme tokens via `Theme.palette`: ### 7.1 Bundle as LGX packages -Create `.lgx` packages for both dev and portable variants: +Create `.lgx` packages for both dev and portable variants. Use `--out-link` to avoid overwriting the `result` symlink: ```bash # Package calc_module (from Part 1) cd ../logos-calc-module -nix build '.#lgx' -nix build '.#lgx-portable' +nix build '.#lgx' --out-link result-lgx +nix build '.#lgx-portable' --out-link result-lgx-portable # Package the QML UI plugin cd ../logos-calc-ui -nix build '.#lgx' -nix build '.#lgx-portable' +nix build '.#lgx' --out-link result-lgx +nix build '.#lgx-portable' --out-link result-lgx-portable ``` > For more bundling options (standalone bundler syntax, cross-platform packaging), see the [Developer Guide — Bundling with nix-bundle-lgx](logos-developer-guide.md#32-bundling-with-nix-bundle-lgx). @@ -367,7 +366,7 @@ Build logos-basecamp, launch it once to preinstall its bundled modules, then ins ```bash # Build logos-basecamp -nix build 'github:logos-co/logos-basecamp/70169584a44d954f638e34842bcfebf741e6bcfe' -o basecamp-result +nix build 'github:logos-co/logos-basecamp/4958efebce73eaa8776fdfa314d4c84fce656db1' -o basecamp-result # Launch once to preinstall bundled modules, then close it ./basecamp-result/bin/logos-basecamp @@ -385,37 +384,84 @@ ls ~/.local/share/Logos/ The dev build directory is named `LogosBasecampDev` (portable builds use `LogosBasecamp`). -Install your modules using `lgpm` (substitute `BASECAMP_DIR` with the actual path you found above): +Install your modules using `lgpm`. First, set `BASECAMP_DIR` to your platform's path: + +```bash +# macOS: +BASECAMP_DIR="$HOME/Library/Application Support/Logos/LogosBasecampDev" + +# Linux: +BASECAMP_DIR="$HOME/.local/share/Logos/LogosBasecampDev" +``` ```bash # Build lgpm CLI nix build 'github:logos-co/logos-package-manager/e5c25989861f4487c3dc8c7b3bc0062bcbc3221f#cli' --out-link ./pm # Install core module -./pm/bin/lgpm --modules-dir BASECAMP_DIR/modules \ - install --file ../logos-calc-module/result/*.lgx +./pm/bin/lgpm --modules-dir "$BASECAMP_DIR/modules" \ + install --file ../logos-calc-module/result-lgx/*.lgx # Install UI plugin -./pm/bin/lgpm --modules-dir BASECAMP_DIR/plugins \ - install --file result/*.lgx +./pm/bin/lgpm --ui-plugins-dir "$BASECAMP_DIR/plugins" \ + install --file result-lgx/*.lgx # Launch basecamp -- your modules appear alongside the built-in ones ./basecamp-result/bin/logos-basecamp ``` -### 7.3 Install via logos-basecamp UI +### 7.3 Portable basecamp build (optional) + +The dev build above depends on nix store paths at runtime. For a self-contained portable build that works without nix: + +```bash +# Build portable basecamp (bundles all Qt frameworks/libraries) +nix build 'github:logos-co/logos-basecamp/4958efebce73eaa8776fdfa314d4c84fce656db1#bin-bundle-dir' -o basecamp-portable + +# Launch once to preinstall bundled modules +./basecamp-portable/bin/logos-basecamp +``` + +The portable build uses a different data directory (`LogosBasecamp` instead of `LogosBasecampDev`). Set `BASECAMP_DIR` to your platform's path: + +```bash +# macOS: +BASECAMP_DIR="$HOME/Library/Application Support/Logos/LogosBasecamp" + +# Linux: +BASECAMP_DIR="$HOME/.local/share/Logos/LogosBasecamp" +``` + +Install your modules using the **portable** `.lgx` variants: + +```bash +# Install core module (use portable variant) +./pm/bin/lgpm --modules-dir "$BASECAMP_DIR/modules" \ + install --file ../logos-calc-module/result-lgx-portable/*.lgx + +# Install UI plugin (use portable variant) +./pm/bin/lgpm --ui-plugins-dir "$BASECAMP_DIR/plugins" \ + install --file result-lgx-portable/*.lgx + +# Launch +./basecamp-portable/bin/logos-basecamp +``` + +> **Important:** Portable basecamp requires portable `.lgx` variants (`result-lgx-portable`), and the dev build requires dev variants (`result-lgx`). Mixing them will cause loading failures. + +### 7.4 Install via logos-basecamp UI Instead of using `lgpm` on the command line, you can install modules through the basecamp UI: 1. Launch `logos-basecamp` 2. Go to **Package Manager** 3. Click **Install from file** -4. Select `../logos-calc-module/result/*.lgx` -- installs `calc_module` -5. Repeat for `result/*.lgx` -- installs `calc_ui` +4. Select `../logos-calc-module/result-lgx/*.lgx` — installs `calc_module` +5. Repeat for `result-lgx/*.lgx` — installs `calc_ui` The "Calculator UI" tab appears in the sidebar. Clicking it loads your `Main.qml`. -### 7.4 Live reloading with `logos-standalone-app` +### 7.5 Live reloading with `logos-standalone-app` For rapid iteration on QML without rebuilding, set `QML_PATH` to your QML source directory: @@ -427,7 +473,7 @@ Edit `Main.qml`, close and re-run — changes appear immediately without `nix bu > This does not work with `logos-basecamp`. Basecamp loads QML plugins from its own data directory, so changes to your source files are not reflected until you rebuild and reinstall the `.lgx` package. -### 7.5 Testing without any runtime +### 7.6 Testing without any runtime You can open `Main.qml` in any QML viewer (e.g., `qml` from Qt) to test the layout. The `logos` bridge won't be available, so clicking buttons will show "Logos bridge not available" -- but you can verify the layout and styling work correctly. @@ -466,11 +512,12 @@ QML_DISABLE_DISK_CACHE=1 ./basecamp-result/bin/logos-basecamp When switching between portable and dev builds of basecamp, or running multiple basecamp instances, the data directory can get into a bad state (stale modules, mixed variants, corrupted preinstall). Clear it and let basecamp re-preinstall on next launch: ```bash -# Remove basecamp's data directory (find yours under Application Support or .local/share) -# macOS (typical): +# Remove basecamp's data directory +# macOS: rm -rf ~/Library/Application\ Support/Logos/LogosBasecampDev -# Linux (typical): -# rm -rf ~/.local/share/Logos/LogosBasecampDev + +# Linux: +rm -rf ~/.local/share/Logos/LogosBasecampDev # Relaunch — basecamp will re-preinstall its bundled modules ./basecamp-result/bin/logos-basecamp diff --git a/tutorial-wrapping-c-library.md b/tutorial-wrapping-c-library.md index 0e4d0e9..2186368 100644 --- a/tutorial-wrapping-c-library.md +++ b/tutorial-wrapping-c-library.md @@ -37,12 +37,14 @@ Before writing any C code, scaffold the Logos module project using the official ```bash # For a module that wraps an external C library: mkdir logos-calc-module && cd logos-calc-module -nix flake init -t github:logos-co/logos-module-builder/b6cf87d30e2995e023496fcfc7f06e8127c6ac5b#with-external-lib +nix flake init -t github:logos-co/logos-module-builder/46a51e5fc321ac11b966c1cc2a2cff21d36fef95#with-external-lib # Or for a plain module (no external library): -# nix flake init -t github:logos-co/logos-module-builder/b6cf87d30e2995e023496fcfc7f06e8127c6ac5b +# nix flake init -t github:logos-co/logos-module-builder/46a51e5fc321ac11b966c1cc2a2cff21d36fef95 ``` +> **Note:** The generated `flake.nix` uses an unpinned `logos-module-builder` URL. Replace it with the pinned version shown in [Step 2.3](#23-flakenix--nix-build-config) to ensure reproducible builds. + This generates the skeleton files (`flake.nix`, `metadata.json`, `CMakeLists.txt`, etc.) pre-configured for the logos-module-builder. You then customize them for your specific library. > **Alternative approach:** You can also create the C library as a separate project, build it there, then copy the resulting `.so`/`.dylib` and header files into the module's `lib/` directory. This can be cleaner for larger libraries with their own build systems. @@ -300,7 +302,7 @@ The `if/elseif/else` block above it is boilerplate — don't change it. description = "Calculator module - wraps libcalc C library for Logos"; inputs = { - logos-module-builder.url = "github:logos-co/logos-module-builder/b6cf87d30e2995e023496fcfc7f06e8127c6ac5b"; + logos-module-builder.url = "github:logos-co/logos-module-builder/46a51e5fc321ac11b966c1cc2a2cff21d36fef95"; }; outputs = inputs@{ logos-module-builder, ... }: @@ -520,6 +522,8 @@ Then initialise the repo: cd logos-calc-module git init git add -A +nix flake update +git add flake.lock ``` ### 3.2 Build with Nix @@ -759,11 +763,11 @@ nix build '.#lgx-portable' Portable LGX packages are fully self-contained with no `/nix/store` references at runtime. These are the packages used by the Logos App Package Manager UI and published to [logos-modules](https://github.com/logos-co/logos-modules) releases. -To create both dev and portable variants (the dev variant works with local `nix build` of basecamp; the portable variant works with standalone basecamp builds): +To create both dev and portable variants (the dev variant works with local `nix build` of basecamp; the portable variant works with standalone basecamp builds), use `--out-link` to avoid overwriting the `result` symlink: ```bash -nix build '.#lgx' -nix build '.#lgx-portable' +nix build '.#lgx' --out-link result-lgx +nix build '.#lgx-portable' --out-link result-lgx-portable ``` > For more bundling options (standalone bundler syntax, cross-platform packaging), see the [Developer Guide — Bundling with nix-bundle-lgx](logos-developer-guide.md#32-bundling-with-nix-bundle-lgx). @@ -772,7 +776,7 @@ To install a portable package on another machine: ```bash nix build 'github:logos-co/logos-package-manager/e5c25989861f4487c3dc8c7b3bc0062bcbc3221f#cli' --out-link ./pm -./pm/bin/lgpm --modules-dir ./modules install --file calc_module.lgx +./pm/bin/lgpm --modules-dir ./modules install --file result-lgx-portable/*.lgx ``` > **Note:** Local builds of `logoscore` / `logos-basecamp` (via `nix build`) expect **local** `.lgx` packages. Portable builds (via `nix build '.#bin-bundle-dir'`, `.#bin-appimage`, or `.#bin-macos-app`) expect **portable** `.lgx` packages. See the [logos-basecamp README](https://github.com/logos-co/logos-basecamp/blob/master/README.md) for details. @@ -886,7 +890,7 @@ Instead of pre-building the library and placing it in `lib/`, you can have Nix f description = "Module wrapping libfoo from GitHub"; inputs = { - logos-module-builder.url = "github:logos-co/logos-module-builder/b6cf87d30e2995e023496fcfc7f06e8127c6ac5b"; + logos-module-builder.url = "github:logos-co/logos-module-builder/46a51e5fc321ac11b966c1cc2a2cff21d36fef95"; # Fetch the library source (non-flake) libfoo-src = {