From 769f5a084cf9eaf992071a9633d6855f3f4c05bf Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 27 Dec 2025 05:05:42 +0200 Subject: [PATCH 1/4] opcua-client-gui: move to by-name --- .../default.nix => by-name/op/opcua-client-gui/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) rename pkgs/{misc/opcua-client-gui/default.nix => by-name/op/opcua-client-gui/package.nix} (97%) diff --git a/pkgs/misc/opcua-client-gui/default.nix b/pkgs/by-name/op/opcua-client-gui/package.nix similarity index 97% rename from pkgs/misc/opcua-client-gui/default.nix rename to pkgs/by-name/op/opcua-client-gui/package.nix index 3e94817640d9..3010ac64128b 100644 --- a/pkgs/misc/opcua-client-gui/default.nix +++ b/pkgs/by-name/op/opcua-client-gui/package.nix @@ -6,7 +6,7 @@ makeDesktopItem, copyDesktopItems, desktopToDarwinBundle, - wrapQtAppsHook, + qt5, }: python3Packages.buildPythonApplication rec { @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ copyDesktopItems - wrapQtAppsHook + qt5.wrapQtAppsHook ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a81eb492ecac..f4a0071e59ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11466,8 +11466,6 @@ with pkgs; ninja_1_11 = callPackage ../by-name/ni/ninja/package.nix { ninjaRelease = "1.11"; }; - opcua-client-gui = libsForQt5.callPackage ../misc/opcua-client-gui { }; - ostinato = libsForQt5.callPackage ../applications/networking/ostinato { protobuf = protobuf_21; }; From 6173cabe6dd7c4b6bd15c27c5819edf3d426ff17 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 27 Dec 2025 05:05:56 +0200 Subject: [PATCH 2/4] opcua-client-gui: modernize --- pkgs/by-name/op/opcua-client-gui/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/op/opcua-client-gui/package.nix b/pkgs/by-name/op/opcua-client-gui/package.nix index 3010ac64128b..edadf283ec2e 100644 --- a/pkgs/by-name/op/opcua-client-gui/package.nix +++ b/pkgs/by-name/op/opcua-client-gui/package.nix @@ -17,10 +17,14 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "FreeOpcUa"; repo = "opcua-client-gui"; - rev = version; + tag = version; hash = "sha256-0BH1Txr3z4a7iFcsfnovmBUreXMvIX2zpZa8QivQVx8="; }; + buildInputs = [ + qt5.qtwayland + ]; + nativeBuildInputs = [ copyDesktopItems qt5.wrapQtAppsHook @@ -39,9 +43,6 @@ python3Packages.buildPythonApplication rec { pyqtgraph ]; - #This test uses a deprecated libarby, when updating the package check if the test was updated as well - doCheck = false; - desktopItems = [ (makeDesktopItem { name = "opcua-client"; From 3d853e545aa5e551da6ef7d5a8ec89c734f6c7f7 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 27 Dec 2025 05:08:45 +0200 Subject: [PATCH 3/4] playonlinux: migrate to by-name Signed-off-by: Aliaksandr --- .../misc => by-name/pl}/playonlinux/0001-fix-locale.patch | 0 .../default.nix => by-name/pl/playonlinux/package.nix} | 3 ++- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) rename pkgs/{applications/misc => by-name/pl}/playonlinux/0001-fix-locale.patch (100%) rename pkgs/{applications/misc/playonlinux/default.nix => by-name/pl/playonlinux/package.nix} (98%) diff --git a/pkgs/applications/misc/playonlinux/0001-fix-locale.patch b/pkgs/by-name/pl/playonlinux/0001-fix-locale.patch similarity index 100% rename from pkgs/applications/misc/playonlinux/0001-fix-locale.patch rename to pkgs/by-name/pl/playonlinux/0001-fix-locale.patch diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/by-name/pl/playonlinux/package.nix similarity index 98% rename from pkgs/applications/misc/playonlinux/default.nix rename to pkgs/by-name/pl/playonlinux/package.nix index 725474759d98..034bae3febd4 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/by-name/pl/playonlinux/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + stdenv_32bit, makeWrapper, fetchurl, cabextract, @@ -34,6 +34,7 @@ let version = "4.4"; + stdenv = stdenv_32bit; binpath = lib.makeBinPath [ cabextract diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4a0071e59ee..3931978125e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11482,8 +11482,6 @@ with pkgs; pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { }; - playonlinux = callPackage ../applications/misc/playonlinux { stdenv = stdenv_32bit; }; - pleroma-bot = python3Packages.callPackage ../development/python-modules/pleroma-bot { }; pnglatex = with python3Packages; toPythonApplication pnglatex; From a66e7925035ec5b4432f1c53e4ce004b270ba3a1 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 27 Dec 2025 05:30:02 +0200 Subject: [PATCH 4/4] playonlinux: 4.4 -> 4.4-unstable-2025-11-07, fix build, modernize --- pkgs/by-name/pl/playonlinux/package.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/pl/playonlinux/package.nix b/pkgs/by-name/pl/playonlinux/package.nix index 034bae3febd4..392ad5b1d38d 100644 --- a/pkgs/by-name/pl/playonlinux/package.nix +++ b/pkgs/by-name/pl/playonlinux/package.nix @@ -2,7 +2,7 @@ lib, stdenv_32bit, makeWrapper, - fetchurl, + fetchFromGitHub, cabextract, gettext, gnupg, @@ -33,7 +33,6 @@ }: let - version = "4.4"; stdenv = stdenv_32bit; binpath = lib.makeBinPath [ @@ -81,13 +80,15 @@ let ); in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "playonlinux"; - inherit version; + version = "4.4-unstable-2025-11-07"; - src = fetchurl { - url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz"; - sha256 = "0n40927c8cnjackfns68zwl7h4d7dvhf7cyqdkazzwwx4k2xxvma"; + src = fetchFromGitHub { + owner = "PlayOnLinux"; + repo = "POL-POM-4"; + rev = "a91f598837b3d77ead6f418ec300fd4d284fdfa4"; + hash = "sha256-rFZ1+30aOgNH4G+i08lfy7dCoYmN7VFlG48zxHpXOQQ="; }; patches = [ @@ -174,4 +175,4 @@ stdenv.mkDerivation { ]; mainProgram = "playonlinux"; }; -} +})