Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport nixos-24.05] support.opcua: 0-10-0-dev -> 0-10-0 #188

Merged
merged 2 commits into from
Oct 8, 2024
Merged

[Backport nixos-24.05] support.opcua: 0-10-0-dev -> 0-10-0 #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a905f0
support.opcua: 0-10-0-dev -> 0-10-0
vivienCEA Oct 7, 2024
876a57d
open62541_1_3: patch to export required function
vivienCEA Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkgs/epnix/support/opcua/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
}:
mkEpicsPackage {
pname = "opcua";
version = "0.10.0-dev";
version = "0.10.0";
varname = "OPCUA";

src = fetchFromGitHub {
owner = "epics-modules";
repo = "opcua";
rev = "3d10053";
hash = "sha256-EQra8PesO7Rlhj+pBlAfiqh5yjJwRkuh7gbGziY58iI=";
rev = "v0.10.0";
hash = "sha256-l2+TUqVeDh9yRSBXMV0xGrdqBETvc5lfvMRuoqYy1wg=";
};

inherit local_release;
Expand Down
2 changes: 2 additions & 0 deletions pkgs/epnix/tools/open62541_1_3/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ in
};

patches = [
# https://github.com/epics-modules/opcua/blob/b5db09477eb6404187199753df9e626d9a432210/devOpcuaSup/open62541/README.md#bugfix-for-shared-build
./shared_build.patch
(fetchpatch {
name = "Ensure-absolute-paths-in-pkg-config-file.patch";
url = "https://github.com/open62541/open62541/commit/023d4b6b8bdec987f8f3ffee6c09801bbee4fa2d.patch";
Expand Down
13 changes: 13 additions & 0 deletions pkgs/epnix/tools/open62541_1_3/shared_build.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/ua_types.c b/src/ua_types.c
index b8f6739bb..7e8f7c43d 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -1880,7 +1880,7 @@ UA_Array_delete(void *p, size_t size, const UA_DataType *type) {
}

#ifdef UA_ENABLE_TYPEDESCRIPTION
-UA_Boolean
+UA_Boolean UA_EXPORT
UA_DataType_getStructMember(const UA_DataType *type, const char *memberName,
size_t *outOffset, const UA_DataType **outMemberType,
UA_Boolean *outIsArray) {