Merge pull request #245113 from sikmir/opcua-client-gui

opcua-client-gui: enable on darwin

authored by

Nikolay Korotkiy and committed by
GitHub
8f23952d e7a19aa2

+28 -6
+12
pkgs/development/python-modules/asyncua/default.nix
··· 1 1 { lib 2 + , stdenv 2 3 , aiofiles 3 4 , aiosqlite 4 5 , buildPythonPackage ··· 58 59 59 60 pythonImportsCheck = [ 60 61 "asyncua" 62 + ]; 63 + 64 + disabledTests = lib.optionals stdenv.isDarwin [ 65 + # Failed: DID NOT RAISE <class 'asyncio.exceptions.TimeoutError'> 66 + "test_publish" 67 + # OSError: [Errno 48] error while attempting to bind on address ('127.0.0.1',... 68 + "test_anonymous_rejection" 69 + "test_certificate_handling_success" 70 + "test_encrypted_private_key_handling_success" 71 + "test_encrypted_private_key_handling_success_with_cert_props" 72 + "test_encrypted_private_key_handling_failure" 61 73 ]; 62 74 63 75 meta = with lib; {
+15 -5
pkgs/misc/opcua-client-gui/default.nix
··· 1 1 { lib 2 - , python3 2 + , stdenv 3 + , python3Packages 3 4 , fetchFromGitHub 4 5 , makeDesktopItem 5 6 , copyDesktopItems 7 + , desktopToDarwinBundle 8 + , wrapQtAppsHook 6 9 }: 7 10 8 - python3.pkgs.buildPythonApplication rec { 11 + python3Packages.buildPythonApplication rec { 9 12 pname = "opcua-client-gui"; 10 13 version = "0.8.4"; 11 14 12 15 src = fetchFromGitHub { 13 16 owner = "FreeOpcUa"; 14 - repo = pname; 17 + repo = "opcua-client-gui"; 15 18 rev = version; 16 19 hash = "sha256-0BH1Txr3z4a7iFcsfnovmBUreXMvIX2zpZa8QivQVx8="; 17 20 }; 18 21 19 - propagatedBuildInputs = with python3.pkgs; [ 22 + nativeBuildInputs = [ copyDesktopItems wrapQtAppsHook ] 23 + ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; 24 + 25 + makeWrapperArgs = [ 26 + "\${qtWrapperArgs[@]}" 27 + ]; 28 + 29 + propagatedBuildInputs = with python3Packages; [ 20 30 pyqt5 21 31 asyncua 22 32 opcua-widgets ··· 43 53 meta = with lib; { 44 54 description = "OPC UA GUI Client"; 45 55 homepage = "https://github.com/FreeOpcUa/opcua-client-gui"; 46 - platforms = platforms.linux; 56 + platforms = platforms.unix; 47 57 license = licenses.gpl3Only; 48 58 maintainers = with maintainers; [ janik ]; 49 59 };
+1 -1
pkgs/top-level/all-packages.nix
··· 33669 33669 33670 33670 opcr-policy = callPackage ../development/tools/opcr-policy { }; 33671 33671 33672 - opcua-client-gui = callPackage ../misc/opcua-client-gui { }; 33672 + opcua-client-gui = libsForQt5.callPackage ../misc/opcua-client-gui { }; 33673 33673 33674 33674 open-policy-agent = callPackage ../development/tools/open-policy-agent { }; 33675 33675