Skip to content

Commit 3b0f516

Browse files
author
emaryn
committed
veusz: 3.6.2 -> 4.1
1 parent 4e08736 commit 3b0f516

File tree

1 file changed

+19
-12
lines changed

1 file changed

+19
-12
lines changed

pkgs/applications/graphics/veusz/default.nix

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,28 @@
22
lib,
33
python3Packages,
44
fetchPypi,
5-
libsForQt5,
5+
qt6,
66
}:
77

88
python3Packages.buildPythonApplication rec {
99
pname = "veusz";
10-
version = "3.6.2";
10+
version = "4.1";
1111

1212
src = fetchPypi {
1313
inherit pname version;
14-
sha256 = "whcaxF5LMEJNj8NSYeLpnb5uJboRl+vCQ1WxBrJjldE=";
14+
hash = "sha256-s7TaDnt+nEIAmAqiZf9aYPFWVtSX22Ruz8eMpxMRr0U=";
1515
};
1616

1717
nativeBuildInputs = [
18-
libsForQt5.wrapQtAppsHook
1918
python3Packages.sip
2019
python3Packages.tomli
20+
qt6.qmake
21+
qt6.wrapQtAppsHook
2122
];
2223

23-
buildInputs = [ libsForQt5.qtbase ];
24+
dontUseQmakeConfigure = true;
25+
26+
buildInputs = [ qt6.qtbase ];
2427

2528
# veusz is a script and not an ELF-executable, so wrapQtAppsHook will not wrap
2629
# it automatically -> we have to do it explicitly
@@ -33,7 +36,7 @@ python3Packages.buildPythonApplication rec {
3336
# really have a corresponding path, so patching the location of PyQt5 inplace
3437
postPatch = ''
3538
substituteInPlace pyqt_setuptools.py \
36-
--replace "get_path('platlib')" "'${python3Packages.pyqt5}/${python3Packages.python.sitePackages}'"
39+
--replace-fail "get_path('platlib')" "'${python3Packages.pyqt5}/${python3Packages.python.sitePackages}'"
3740
patchShebangs tests/runselftest.py
3841
'';
3942

@@ -45,9 +48,9 @@ python3Packages.buildPythonApplication rec {
4548
"--qt-libinfix="
4649
];
4750

48-
propagatedBuildInputs = with python3Packages; [
51+
dependencies = with python3Packages; [
4952
numpy
50-
pyqt5
53+
pyqt6
5154
# optional requirements:
5255
dbus-python
5356
h5py
@@ -56,16 +59,20 @@ python3Packages.buildPythonApplication rec {
5659
];
5760

5861
installCheckPhase = ''
62+
runHook preInstallCheck
63+
5964
wrapQtApp "tests/runselftest.py"
6065
QT_QPA_PLATFORM=minimal tests/runselftest.py
66+
67+
runHook postInstallCheck
6168
'';
6269

63-
meta = with lib; {
70+
meta = {
6471
description = "Scientific plotting and graphing program with a GUI";
6572
mainProgram = "veusz";
6673
homepage = "https://veusz.github.io/";
67-
license = licenses.gpl2Plus;
68-
platforms = platforms.linux;
69-
maintainers = with maintainers; [ laikq ];
74+
license = lib.licenses.gpl2Plus;
75+
platforms = lib.platforms.linux;
76+
maintainers = with lib.maintainers; [ laikq ];
7077
};
7178
}

0 commit comments

Comments
 (0)