mirror of
https://github.com/logos-co/logos-module-builder.git
synced 2026-08-27 10:11:10 +00:00
Merge master into feat/sdk-codegen-b4-qt-host-repoint
Only flake.lock conflicted; flake.nix merged clean. Resolved by regenerating
the lock from the merged flake.nix rather than hand-splicing it.
master's b960f44 bumped logos-view-module-runtime, and this branch rev-pins it
so view-interface-abi compares the B4 templates against the matching B4 host
headers. Keeping the old B4 pin would have walked that bump backward and lost
the hot-reload fix (#24), so the runtime's B4 branch absorbed master first
(logos-view-module-runtime 3ef779c, a clean merge) and this pins that instead.
KNOWN, NOT FIXED HERE: the same bump also moved logos-standalone-app, and this
branch still pins 39f4f2b against master's e582e6c. That one is not a clean
merge — flake.nix, flake.lock and nix/app.nix all conflict — so absorbing it is
its own change. Until then, merging this branch walks the standalone-app pin
back three commits (the hot-reload fix #36 and the capability-startup removal).
view-interface-abi passes against the new runtime pin with no overrides.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Generated
+7
-7
@@ -14035,11 +14035,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1786467048,
|
||||
"narHash": "sha256-wgG65H0TmVlrji78PV/qv1Vo0yDmoS9HYiZaIvKLuBM=",
|
||||
"lastModified": 1787155919,
|
||||
"narHash": "sha256-CrPS+CbbXtbHmDfi3UJjSqjpewuxJM0u/4P56VgYYXE=",
|
||||
"owner": "logos-co",
|
||||
"repo": "logos-design-system",
|
||||
"rev": "73989c83e11c4250b30d12534908e40d8baa8fc6",
|
||||
"rev": "d59e9b4e703ce10bc76312d17e02d80eea3ad9fc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -106010,17 +106010,17 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1786883241,
|
||||
"narHash": "sha256-SoWOBtTSepkZphSzgY+LWSVJ7Ev9QX+oqgMlpqCofs4=",
|
||||
"lastModified": 1787165090,
|
||||
"narHash": "sha256-9KZABw4av/dzwE7GtKw0BOy8mZNHeYtRiunk5VDDJCQ=",
|
||||
"owner": "logos-co",
|
||||
"repo": "logos-view-module-runtime",
|
||||
"rev": "5510acd9eb7fcd49e420c9e530679edfa8f315ab",
|
||||
"rev": "3ef779c11120c74bed3f7aea92551ccc3daffd73",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "logos-co",
|
||||
"repo": "logos-view-module-runtime",
|
||||
"rev": "5510acd9eb7fcd49e420c9e530679edfa8f315ab",
|
||||
"rev": "3ef779c11120c74bed3f7aea92551ccc3daffd73",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
||||
@@ -87,9 +87,10 @@
|
||||
# module-side templates from logos-view-module. Both sides moved to the
|
||||
# qt-host runtime together, so a master pin here would compare the new
|
||||
# templates against the old host and fail on a difference that does not
|
||||
# exist. 5510acd is the tip of feat/sdk-codegen-b4-qt-host and a
|
||||
# fast-forward from master (471dd56 is an ancestor of it).
|
||||
logos-view-module-runtime.url = "github:logos-co/logos-view-module-runtime/5510acd9eb7fcd49e420c9e530679edfa8f315ab";
|
||||
# exist. 3ef779c is the tip of feat/sdk-codegen-b4-qt-host with master merged
|
||||
# in, so it carries the hot-reload fix (#24) as well as the qt-host repoint —
|
||||
# pinning the older B4 tip here would walk master's bump backward.
|
||||
logos-view-module-runtime.url = "github:logos-co/logos-view-module-runtime/3ef779c11120c74bed3f7aea92551ccc3daffd73";
|
||||
# The MODULE side of that same pair, and the ui_qml authoring flavour as a
|
||||
# whole: LogosViewModule.cmake, the four LogosView*.in templates
|
||||
# logos_module(REP_FILE ...) instantiates, and the view glue generator.
|
||||
|
||||
Reference in New Issue
Block a user