Get back to defaults for module builder config,set logos-delivery to latest master

This commit is contained in:
NagyZoltanPeter
2026-04-14 17:52:53 +02:00
parent 97f1531ec6
commit 80b0023a1d
3 changed files with 46 additions and 29 deletions
Generated
+44 -22
View File
@@ -189,14 +189,15 @@
"logos-delivery": {
"inputs": {
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay",
"zerokit": "zerokit"
},
"locked": {
"lastModified": 1774870234,
"narHash": "sha256-YXyn9vh4Y3Lj4Aw88g2YkPTACmr7BUiIIap7BEVGWsI=",
"lastModified": 1776170869,
"narHash": "sha256-bmudtYQv702S7dt7WLV+MYAgNtSE7539Kw+qU7NvCyA=",
"ref": "refs/heads/master",
"rev": "dc026bbff19050155f0ef1abb3e03a64c8bba81e",
"revCount": 2276,
"rev": "ecd3758580015a3fb80bb0461d736a8b4c539c64",
"revCount": 2299,
"submodules": true,
"type": "git",
"url": "https://github.com/logos-messaging/logos-delivery"
@@ -1458,17 +1459,17 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1757590060,
"narHash": "sha256-EWwwdKLMZALkgHFyKW7rmyhxECO74+N+ZO5xTDnY/5c=",
"lastModified": 1770464364,
"narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0ef228213045d2cdb5a169a95d63ded38670b293",
"rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0ef228213045d2cdb5a169a95d63ded38670b293",
"rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457",
"type": "github"
}
},
@@ -2034,6 +2035,27 @@
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"logos-delivery",
"nixpkgs"
]
},
"locked": {
"lastModified": 1775099554,
"narHash": "sha256-3xBsGnGDLOFtnPZ1D3j2LU19wpAlYefRKTlkv648rU0=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "8d6387ed6d8e6e6672fd3ed4b61b59d44b124d99",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_2": {
"inputs": {
"nixpkgs": [
"logos-delivery",
@@ -2042,11 +2064,11 @@
]
},
"locked": {
"lastModified": 1748399823,
"narHash": "sha256-kahD8D5hOXOsGbNdoLLnqCL887cjHkx98Izc37nDjlA=",
"lastModified": 1771211437,
"narHash": "sha256-lcNK438i4DGtyA+bPXXyVLHVmJjYpVKmpux9WASa3ro=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "d68a69dc71bc19beb3479800392112c2f6218159",
"rev": "c62195b3d6e1bb11e0c2fb2a494117d3b55d410f",
"type": "github"
},
"original": {
@@ -2061,21 +2083,21 @@
"logos-delivery",
"nixpkgs"
],
"rust-overlay": "rust-overlay"
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1762211504,
"narHash": "sha256-SbDoBElFYJ4cYebltxlO2lYnz6qOaDAVY6aNJ5bqHDE=",
"ref": "refs/heads/master",
"rev": "3160d9504d07791f2fc9b610948a6cf9a58ed488",
"revCount": 342,
"type": "git",
"url": "https://github.com/vacp2p/zerokit"
"lastModified": 1771279884,
"narHash": "sha256-tzkQPwSl4vPTUo1ixHh6NCENjsBDroMKTjifg2q8QX8=",
"owner": "vacp2p",
"repo": "zerokit",
"rev": "53b18098e6d5d046e3eb1ac338a8f4f651432477",
"type": "github"
},
"original": {
"rev": "3160d9504d07791f2fc9b610948a6cf9a58ed488",
"type": "git",
"url": "https://github.com/vacp2p/zerokit"
"owner": "vacp2p",
"repo": "zerokit",
"rev": "53b18098e6d5d046e3eb1ac338a8f4f651432477",
"type": "github"
}
}
},
+1 -6
View File
@@ -16,12 +16,7 @@
# Wrap it so mkLogosModule resolves .default → liblogosdelivery per-system,
# which feeds into mkExternalLib and then buildPlugin.externalLibCopies.
externalLibInputs = {
logosdelivery = {
packages = builtins.listToAttrs (map (system: {
name = system;
value = { default = inputs.logos-delivery.packages.${system}.liblogosdelivery; };
}) [ "aarch64-darwin" "x86_64-darwin" "aarch64-linux" "x86_64-linux" ]);
};
logosdelivery = inputs.logos-delivery;
};
# buildPlugin.externalLibCopies copies externalLibs/lib/* → lib/ but not include/*.
# The header must land in lib/ for the CMake INCLUDE_DIRS. The liblogosdelivery
+1 -1
View File
@@ -25,7 +25,7 @@
"external_libraries": [
{
"name": "logosdelivery",
"build_command": "cp bin/liblogosdelivery.* . 2>/dev/null || true; cp include/liblogosdelivery.h . 2>/dev/null || true"
"build_command": "true"
}
],
"cmake": {