opcua-gui-client, playonlinux: migrate to by-name, modernize (#474497)
This commit is contained in:
+7
-6
@@ -6,7 +6,7 @@
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
desktopToDarwinBundle,
|
||||
wrapQtAppsHook,
|
||||
qt5,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
@@ -17,13 +17,17 @@ python3Packages.buildPythonApplication rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeOpcUa";
|
||||
repo = "opcua-client-gui";
|
||||
rev = version;
|
||||
tag = version;
|
||||
hash = "sha256-0BH1Txr3z4a7iFcsfnovmBUreXMvIX2zpZa8QivQVx8=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
qt5.qtwayland
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
wrapQtAppsHook
|
||||
qt5.wrapQtAppsHook
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
|
||||
|
||||
@@ -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";
|
||||
+11
-9
@@ -1,8 +1,8 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
stdenv_32bit,
|
||||
makeWrapper,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
cabextract,
|
||||
gettext,
|
||||
gnupg,
|
||||
@@ -33,7 +33,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "4.4";
|
||||
stdenv = stdenv_32bit;
|
||||
|
||||
binpath = lib.makeBinPath [
|
||||
cabextract
|
||||
@@ -80,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 = [
|
||||
@@ -173,4 +175,4 @@ stdenv.mkDerivation {
|
||||
];
|
||||
mainProgram = "playonlinux";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -11373,8 +11373,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;
|
||||
};
|
||||
@@ -11391,8 +11389,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;
|
||||
|
||||
Reference in New Issue
Block a user