From b6bedd66624ea8df44a59c5fb10244bddd3aff11 Mon Sep 17 00:00:00 2001 From: Vivien Loriot Date: Mon, 7 Oct 2024 10:39:12 +0200 Subject: [PATCH 1/2] support.opcua: 0-10-0-dev -> 0-10-0 --- pkgs/epnix/support/opcua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/epnix/support/opcua/default.nix b/pkgs/epnix/support/opcua/default.nix index 73eaa9f3..2d10ac83 100644 --- a/pkgs/epnix/support/opcua/default.nix +++ b/pkgs/epnix/support/opcua/default.nix @@ -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; From 5e958398eb047c4d9888138983c65163c2018d60 Mon Sep 17 00:00:00 2001 From: Vivien Loriot Date: Mon, 7 Oct 2024 15:03:05 +0200 Subject: [PATCH 2/2] open62541_1_3: patch to export required function --- pkgs/epnix/tools/open62541_1_3/default.nix | 2 ++ pkgs/epnix/tools/open62541_1_3/shared_build.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/epnix/tools/open62541_1_3/shared_build.patch diff --git a/pkgs/epnix/tools/open62541_1_3/default.nix b/pkgs/epnix/tools/open62541_1_3/default.nix index 6be7f217..da3a39cb 100644 --- a/pkgs/epnix/tools/open62541_1_3/default.nix +++ b/pkgs/epnix/tools/open62541_1_3/default.nix @@ -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"; diff --git a/pkgs/epnix/tools/open62541_1_3/shared_build.patch b/pkgs/epnix/tools/open62541_1_3/shared_build.patch new file mode 100644 index 00000000..b8faa802 --- /dev/null +++ b/pkgs/epnix/tools/open62541_1_3/shared_build.patch @@ -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) {