diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 11050761661..8a566c24991 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null; stdenv.mkDerivation rec { pname = "carla"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "falkTX"; repo = pname; rev = "v${version}"; - sha256 = "0c3y4a6cgi4bv1mg57i3qn5ia6pqjqlaylvkapj6bmpsw71ig22g"; + sha256 = "B4xoRuNEW4Lz9haP8fqxOTcysGTNEXFOq9UXqUJLSFw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/friture/default.nix b/pkgs/applications/audio/friture/default.nix index b93ad14f55e..e4bd79a08e3 100644 --- a/pkgs/applications/audio/friture/default.nix +++ b/pkgs/applications/audio/friture/default.nix @@ -32,9 +32,8 @@ in py.buildPythonApplication rec { ./unlock_constraints.patch ]; - postFixup = '' - wrapQtApp $out/bin/friture - wrapQtApp $out/bin/.friture-wrapped + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; meta = with lib; { diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 47ea078c4b2..56fcdcc94cd 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -30,5 +30,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; + broken = true; # Needs Qt wrapping }; } diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 3c6a9587a65..fc7e6c0fc35 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -28,8 +28,8 @@ buildPythonApplication rec { # QT setup in tests broken. doCheck = false; - postFixup = '' - wrapQtApp $out/bin/vorta + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; meta = with lib; { diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index 7752313b2a7..c32e8315756 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -46,11 +46,13 @@ in python.pkgs.buildPythonApplication { propagatedBuildInputs = [ pythonEnv ]; postInstall = '' - wrapQtApp "$out/bin/retext" \ - --set ASPELL_CONF "dict-dir ${buildEnv { + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + makeWrapperArgs+=( + "--set" "ASPELL_CONF" "dict-dir ${buildEnv { name = "aspell-all-dicts"; paths = map (path: "${path}/lib/aspell") enchantAspellDicts; }}" + ) ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 130c0af6ee2..da66b0d9d25 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -10,7 +10,7 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in mkDerivation rec { - version = "3.10.9"; + version = "3.10.10"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -18,7 +18,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0d646hvrhhgsw789qc2g3iblmsvr64qh15jck1jkaljzrj3qbml6"; + sha256 = "yZBG+bpJA7iKkUEjVo45d+bmRp9WS7mk8z96FLf0ZQ0="; }; passthru = { diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/pkgs/applications/graphics/cq-editor/default.nix index 036edf80ab9..cf94f4fa32d 100644 --- a/pkgs/applications/graphics/cq-editor/default.nix +++ b/pkgs/applications/graphics/cq-editor/default.nix @@ -2,6 +2,7 @@ , mkDerivationWith , python3Packages , fetchFromGitHub +, wrapQtAppsHook }: mkDerivationWith python3Packages.buildPythonApplication rec { @@ -27,8 +28,9 @@ mkDerivationWith python3Packages.buildPythonApplication rec { requests ]; - postFixup = '' - wrapQtApp "$out/bin/cq-editor" + nativeBuildInputs = [ wrapQtAppsHook ]; + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; checkInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 0e7155f374d..3347567b88b 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -40,15 +40,15 @@ python3Packages.buildPythonApplication rec { # Avoid double wrapping Python programs. dontWrapQtApps = true; + # TODO: A bug in python wrapper + # see https://github.com/NixOS/nixpkgs/pull/75054#discussion_r357656916 preFixup = '' - # TODO: A bug in python wrapper - # see https://github.com/NixOS/nixpkgs/pull/75054#discussion_r357656916 makeWrapperArgs="''${qtWrapperArgs[@]}" ''; + # Executable in $out/bin is a symlink to $out/share/dupeguru/run.py + # so wrapPythonPrograms hook does not handle it automatically. postFixup = '' - # Executable in $out/bin is a symlink to $out/share/dupeguru/run.py - # so wrapPythonPrograms hook does not handle it automatically. wrapPythonProgramsIn "$out/share/dupeguru" "$out $pythonPath" ''; @@ -58,5 +58,6 @@ python3Packages.buildPythonApplication rec { license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.novoxudonoser ]; + broken = true; # mv: cannot stat '_block.cpython-38m*.so': No such file or directory }; } diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index a6ba3444dcd..12362823cc5 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "electron-cash"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "Electron-Cash"; repo = "Electron-Cash"; rev = version; - sha256 = "1ccfm6kkmbkvykfdzrisxvr0lx9kgq4l43ixk6v3xnvhnbfwz4s2"; + sha256 = "1fllz2s20lg4hrppzmnlgjy9mrq7gaq66l2apb3vz1avzvsjw3gm"; }; propagatedBuildInputs = with python3Packages; [ @@ -36,15 +36,6 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapQtAppsHook ]; - patches = [ - # Patch a failed test, this can be removed in next version - (fetchpatch { - url = - "https://github.com/Electron-Cash/Electron-Cash/commit/1a9122d59be0c351b14c174a60880c2e927e6168.patch"; - sha256 = "0zw629ypn9jxb1y124s3dkbbf2q3wj1i97j16lzdxpjy3sk0p5hk"; - }) - ]; - postPatch = '' substituteInPlace contrib/requirements/requirements.txt \ --replace "qdarkstyle==2.6.8" "qdarkstyle<3" @@ -70,9 +61,11 @@ python3Packages.buildPythonApplication rec { # Electron Cash was unable to find the secp256k1 library on this system. # Elliptic curve cryptography operations will be performed in slow # Python-only mode. - postFixup = '' - wrapQtApp $out/bin/electron-cash \ - --prefix LD_LIBRARY_PATH : ${secp256k1}/lib + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + makeWrapperArgs+=( + "--prefix" "LD_LIBRARY_PATH" ":" "${secp256k1}/lib" + ) ''; doInstallCheck = true; diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 4bcb66f48b9..2c6fb39fa43 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -36,8 +36,8 @@ python3Packages.buildPythonApplication rec { sed -i '/Created: .*/d' gui/qt/icons_rc.py ''; - postFixup = '' - wrapQtApp $out/bin/electrum-ltc + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; checkPhase = '' diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index c3d2feb2fed..31e919e3770 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -1,6 +1,7 @@ { mkDerivation , lib , fetchurl +, fetchpatch , extra-cmake-modules , kcmutils , kconfigwidgets @@ -13,25 +14,55 @@ , libfakekey , libXtst , qtx11extras +, qtmultimedia +, qtgraphicaleffects , sshfs , makeWrapper , kwayland , kio +, kpeoplevcard +, kpeople +, kirigami2 +, pulseaudio-qt }: mkDerivation rec { pname = "kdeconnect"; - version = "1.3.5"; + version = "20.08.1"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/${pname}-kde-${version}.tar.xz"; - sha256 = "02lr3xx5s2mgddac4n3lkgr7ppf1z5m6ajs90rjix0vs8a271kp5"; + url = "https://download.kde.org/stable/release-service/${version}/src/${pname}-kde-${version}.tar.xz"; + sha256 = "0s76djgpx08jfmh99c7kx18mnr3w7bv4hdra120nicq89mmy7gwf"; }; + patches = [ + # https://invent.kde.org/network/kdeconnect-kde/-/merge_requests/328 + (fetchpatch { + url = "https://invent.kde.org/network/kdeconnect-kde/-/commit/6101ef3ad07d865958d58a3d2736f5536f1c5719.diff"; + sha256 = "17mr7k13226vzcgxlmfs6q2mdc5j7vwp4iri9apmh6xlf6r591ac"; + }) + ]; + buildInputs = [ - libfakekey libXtst - ki18n kiconthemes kcmutils kconfigwidgets kdbusaddons knotifications - qca-qt5 qtx11extras makeWrapper kwayland kio + libfakekey + libXtst + qtmultimedia + qtgraphicaleffects + pulseaudio-qt + kpeoplevcard + kpeople + kirigami2 + ki18n + kiconthemes + kcmutils + kconfigwidgets + kdbusaddons + knotifications + qca-qt5 + qtx11extras + makeWrapper + kwayland + kio ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index 19f813e5c75..319630ceff3 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -25,10 +25,8 @@ buildPythonApplication rec { xvfb-run -s '-screen 0 800x600x24' ./test-runner ''; - postInstall = '' - for program in $out/bin/*; do - wrapQtApp $program --prefix PYTHONPATH : $PYTHONPATH - done + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix index ad07a3dba3c..cb0103df227 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, git-annex-adapter }: +{ stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, qt5, git-annex-adapter }: buildPythonApplication rec { pname = "git-annex-metadata-gui"; @@ -15,6 +15,12 @@ buildPythonApplication rec { substituteInPlace setup.py --replace "'PyQt5', " "" ''; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + propagatedBuildInputs = [ pyqt5 git-annex-adapter ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/kpeoplevcard/default.nix b/pkgs/development/libraries/kpeoplevcard/default.nix new file mode 100644 index 00000000000..c405532e436 --- /dev/null +++ b/pkgs/development/libraries/kpeoplevcard/default.nix @@ -0,0 +1,40 @@ +{ mkDerivation +, lib +, fetchurl +, cmake +, extra-cmake-modules +, pkg-config +, kcoreaddons +, kpeople +, kcontacts +}: + +mkDerivation rec { + pname = "kpeoplevcard"; + version = "0.1"; + + src = fetchurl { + url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; + sha256 = "1hv3fq5k0pps1wdvq9r1zjnr0nxf8qc3vwsnzh9jpvdy79ddzrcd"; + }; + + buildInputs = [ + kcoreaddons + kpeople + kcontacts + ]; + + nativeBuildInputs = [ + pkg-config + cmake + extra-cmake-modules + ]; + + meta = with lib; { + description = "Pulseaudio bindings for Qt"; + homepage = "KPeople VCard Support"; + license = with licenses; [ lgpl2 ]; + maintainers = with maintainers; [ doronbehar ]; + }; +} + diff --git a/pkgs/development/libraries/pulseaudio-qt/default.nix b/pkgs/development/libraries/pulseaudio-qt/default.nix new file mode 100644 index 00000000000..03d656f91fa --- /dev/null +++ b/pkgs/development/libraries/pulseaudio-qt/default.nix @@ -0,0 +1,35 @@ +{ mkDerivation +, lib +, fetchurl +, cmake +, extra-cmake-modules +, pkg-config +, pulseaudio +}: + +mkDerivation rec { + pname = "pulseaudio-qt"; + version = "1.2.0"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${pname}-${lib.versions.majorMinor version}.tar.xz"; + sha256 = "1i0ql68kxv9jxs24rsd3s7jhjid3f2fq56fj4wbp16zb4wd14099"; + }; + + buildInputs = [ + pulseaudio + ]; + + nativeBuildInputs = [ + pkg-config + cmake + extra-cmake-modules + ]; + + meta = with lib; { + description = "Pulseaudio bindings for Qt"; + homepage = "https://invent.kde.org/libraries/pulseaudio-qt"; + license = with licenses; [ lgpl2 ]; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index abaeba51b45..19aebd715d6 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -6,17 +6,17 @@ let pname = "qscintilla-qt${if withQt5 then "5" else "4"}"; - version = "2.11.2"; + version = "2.11.5"; in stdenv.mkDerivation rec { inherit pname version; src = fetchurl { - url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_gpl-${version}.tar.gz"; - sha256 = "18glb2v07mwfz6p8qmwhzcaaczyc36x3gn9wx8ndm7q6d93xr6q2"; + url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz"; + sha256 = "k2Hib9f7e1gZp+uSxcGIChjem9PtndLrAI5XOIaWcWs="; }; - sourceRoot = "QScintilla_gpl-${version}/Qt4Qt5"; + sourceRoot = "QScintilla-${version}/Qt4Qt5"; buildInputs = [ (if withQt5 then qtbase else qt4) ]; @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { background colours and multiple fonts. ''; homepage = "https://www.riverbankcomputing.com/software/qscintilla/intro"; - license = with licenses; [ gpl2 gpl3 ]; # and commercial + license = with licenses; [ gpl3 ]; # and commercial maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index c7122781111..ec19f4730a5 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -1,13 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi, future, networkx, pygments, lxml, colorama, matplotlib, - asn1crypto, click, pydot, ipython, pyqt5, pyperclip }: +{ lib +, fetchpatch +, buildPythonPackage +, fetchFromGitHub +, future +, networkx +, pygments +, lxml +, colorama +, matplotlib +, asn1crypto +, click +, pydot +, ipython +, pyqt5 +, pyperclip +, nose +, nose-timer +, mock +, python_magic +, codecov +, coverage +, qt5 +# This is usually used as a library, and it'd be a shame to force the gui +# libraries to the closure if gui is not desired. +, withGui ? false +# Tests take a very long time, and currently fail, but next release' tests +# shouldn't fail +, doCheck ? false +}: buildPythonPackage rec { version = "3.3.5"; pname = "androguard"; - src = fetchPypi { - inherit pname version; - sha256 = "f0655ca3a5add74c550951e79bd0bebbd1c5b239178393d30d8db0bd3202cda2"; + # No tests in pypi tarball + src = fetchFromGitHub { + repo = pname; + owner = pname; + rev = "v${version}"; + sha256 = "0zc8m1xnkmhz2v12ddn47q0c01p3sbna2v5npfxhcp88szswlr9y"; }; propagatedBuildInputs = [ @@ -21,12 +52,37 @@ buildPythonPackage rec { click pydot ipython + ] ++ lib.optionals withGui [ pyqt5 pyperclip ]; - # Tests are not shipped on PyPI. - doCheck = false; + checkInputs = [ + pyqt5 + pyperclip + nose + nose-timer + codecov + coverage + mock + python_magic + ]; + inherit doCheck; + + nativeBuildInputs = lib.optionals withGui [ qt5.wrapQtAppsHook ]; + + # If it won't be verbose, you'll see nothing going on for a long time. + checkPhase = '' + runHook preCheck + + nosetests --verbosity=3 + + runHook postCheck + ''; + + preFixup = lib.optionalString withGui '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; meta = { description = "Tool and python library to interact with Android Files"; diff --git a/pkgs/development/python-modules/nose-timer/default.nix b/pkgs/development/python-modules/nose-timer/default.nix new file mode 100644 index 00000000000..c93f5bda983 --- /dev/null +++ b/pkgs/development/python-modules/nose-timer/default.nix @@ -0,0 +1,20 @@ +{ buildPythonPackage, fetchPypi, lib, nose, }: + +buildPythonPackage rec { + pname = "nose-timer"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "09hwjwbczi06bfqgiylb2yxs5h88jdl26zi1fdqxdzvamrkksf2c"; + }; + + propagatedBuildInputs = [ nose ]; + + meta = with lib; { + homepage = "https://github.com/mahmoudimus/nose-timer"; + license = licenses.mit; + description = "A timer plugin for nosetests (how much time does every test take?)"; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index ece9ad5b4a3..5b971c48d78 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -30,12 +30,12 @@ let in buildPythonPackage rec { pname = "PyQt5"; - version = "5.14.2"; + version = "5.15.1"; format = "other"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1c4y4qi1l540gd125ikj0al00k5pg65kmqaixcfbzslrsrphq8xx"; + sha256 = "18grs2p698ihjgi8agksv6sajakciywyr29ihslqvl260a2np9yr"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index ff511103e55..51506598ca1 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -7,6 +7,10 @@ let inherit (pythonPackages) buildPythonPackage python isPy3k pyqt5 enum34; inherit (pyqt5) sip; + # source: https://www.riverbankcomputing.com/pipermail/pyqt/2020-June/042985.html + patches = lib.optional (lib.hasPrefix "5.14" pyqt5.version) + [ ./fix-build-with-qt-514.patch ] + ; in buildPythonPackage rec { pname = "PyQtWebEngine"; @@ -18,10 +22,7 @@ in buildPythonPackage rec { sha256 = "0xdzhl07x3mzfnr5cf4d640168vxi7fyl0fz1pvpbgs0irl14237"; }; - patches = [ - # source: https://www.riverbankcomputing.com/pipermail/pyqt/2020-June/042985.html - ./fix-build-with-qt-514.patch - ]; + inherit patches; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 2bc8b70e4ca..0027c1c0ba5 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = sip-module; - version = "4.19.22"; + version = "4.19.24"; format = "other"; disabled = isPyPy; src = fetchurl { url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"; - sha256 = "0idywc326l8v1m3maprg1aq2gph67mmnnsskvlwfx8n19s16idz1"; + sha256 = "1ra15vb5i9gkg2vdvh16cq9x2mmzw1yi3xphxs8q34q1pf83gkgd"; }; configurePhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b65c8ead100..fd6312fd1bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -278,7 +278,7 @@ in dispad = callPackage ../tools/X11/dispad { }; - dupeguru = callPackage ../applications/misc/dupeguru { qt5 = qt514; }; + dupeguru = callPackage ../applications/misc/dupeguru { }; dump1090 = callPackage ../applications/radio/dump1090 { }; @@ -2061,8 +2061,10 @@ in gmic = callPackage ../tools/graphics/gmic { }; - gmic-qt = libsForQt514.callPackage ../tools/graphics/gmic-qt { }; + gmic-qt = libsForQt5.callPackage ../tools/graphics/gmic-qt { }; + # NOTE: If overriding qt version, krita needs to use the same qt version as + # well. gmic-qt-krita = gmic-qt.override { variant = "krita"; }; @@ -3703,7 +3705,7 @@ in flashrom = callPackage ../tools/misc/flashrom { }; - flent = python3Packages.callPackage ../applications/networking/flent { qt5 = qt514; }; + flent = python3Packages.callPackage ../applications/networking/flent { }; flpsed = callPackage ../applications/editors/flpsed { }; @@ -6491,7 +6493,7 @@ in jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - qarte = libsForQt514.callPackage ../applications/video/qarte { }; + qarte = libsForQt5.callPackage ../applications/video/qarte { }; qlcplus = libsForQt512.callPackage ../applications/misc/qlcplus { }; @@ -6595,7 +6597,7 @@ in reredirect = callPackage ../tools/misc/reredirect { }; - retext = libsForQt514.callPackage ../applications/editors/retext { }; + retext = libsForQt5.callPackage ../applications/editors/retext { }; richgo = callPackage ../development/tools/richgo { }; @@ -9264,7 +9266,18 @@ in graalvm8-ee graalvm11-ee; - openshot-qt = libsForQt514.callPackage ../applications/video/openshot-qt { }; + openshot-qt = let + # Cannot use a newer Qt (5.15) version because it requires qtwebkit + # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b + pkgs_ = pkgs.extend(_: prev: { + pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { + pkgs = oldAttrs.pkgs.extend(_: _: { + qt5 = pkgs.qt514; + libsForQt5 = pkgs.libsForQt514; + }); + }); + }); + in pkgs_.libsForQt514.callPackage ../applications/video/openshot-qt { }; openspin = callPackage ../development/compilers/openspin { }; @@ -10217,10 +10230,9 @@ in python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python { - # Overrides that apply to all Python interpreters + # Overrides that apply to all Python interpreters and their packages + # Generally, this should be avoided. pkgs = pkgs.extend (final: _: { - qt5 = final.qt514; - libsForQt5 = final.libsForQt514; }); }; inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36; @@ -10822,7 +10834,7 @@ in }; # Does not actually depend on Qt 5 - inherit (kdeFrameworks) extra-cmake-modules kapidox kdoctools; + inherit (kdeFrameworks) extra-cmake-modules; coccinelle = callPackage ../development/tools/misc/coccinelle { ocamlPackages = ocaml-ng.ocamlPackages_4_05; @@ -11217,7 +11229,7 @@ in kati = callPackage ../development/tools/build-managers/kati { }; - kcc = libsForQt514.callPackage ../applications/graphics/kcc { }; + kcc = libsForQt5.callPackage ../applications/graphics/kcc { }; kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends { gperf = gperf_3_0; @@ -15033,7 +15045,7 @@ in kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet syntax-highlighting syndication threadweaver kirigami2 kholidays kpurpose - kcontacts kquickcharts; + kcontacts kquickcharts kdoctools kapidox; ### KDE PLASMA 5 @@ -15069,6 +15081,8 @@ in kproperty = callPackage ../development/libraries/kproperty { }; + kpeoplevcard = callPackage ../development/libraries/kpeoplevcard { }; + kreport = callPackage ../development/libraries/kreport { }; libcommuni = callPackage ../development/libraries/libcommuni { }; @@ -15113,6 +15127,8 @@ in suffix = "qt5"; }; + pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { }; + qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; qmltermwidget = callPackage ../development/libraries/qmltermwidget { @@ -16763,7 +16779,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; }; - qpaeq = libsForQt514.callPackage ../servers/pulseaudio/qpaeq.nix { }; + qpaeq = libsForQt5.callPackage ../servers/pulseaudio/qpaeq.nix { }; pulseaudioFull = pulseaudio.override { x11Support = true; @@ -17515,7 +17531,7 @@ in fatrace = callPackage ../os-specific/linux/fatrace { }; - ffado = libsForQt514.callPackage ../os-specific/linux/ffado { + ffado = libsForQt5.callPackage ../os-specific/linux/ffado { inherit (pkgs.linuxPackages) kernel; }; libffado = ffado; @@ -19738,7 +19754,17 @@ in bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; - cadence = libsForQt514.callPackage ../applications/audio/cadence { }; + cadence = let + # Use Qt 5.14 consistently + pkgs_ = pkgs.extend(_: prev: { + pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { + pkgs = oldAttrs.pkgs.extend(_: _: { + qt5 = pkgs.qt514; + libsForQt5 = pkgs.libsForQt514; + }); + }); + }); + in pkgs_.libsForQt514.callPackage ../applications/audio/cadence { }; cheesecutter = callPackage ../applications/audio/cheesecutter { }; @@ -19934,9 +19960,9 @@ in calculix = callPackage ../applications/science/math/calculix {}; - calibre-py2 = libsForQt514.callPackage ../applications/misc/calibre { pythonPackages = python2Packages; }; + calibre-py2 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python2Packages; }; - calibre-py3 = libsForQt514.callPackage ../applications/misc/calibre { pythonPackages = python3Packages; }; + calibre-py3 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python3Packages; }; calibre = calibre-py3; @@ -19954,7 +19980,7 @@ in carddav-util = callPackage ../tools/networking/carddav-util { }; - carla = libsForQt514.callPackage ../applications/audio/carla { }; + carla = libsForQt5.callPackage ../applications/audio/carla { }; castor = callPackage ../applications/networking/browsers/castor { }; @@ -20101,7 +20127,7 @@ in coyim = callPackage ../applications/networking/instant-messengers/coyim {}; - cq-editor = libsForQt514.callPackage ../applications/graphics/cq-editor { + cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { python3Packages = python37Packages; }; @@ -20311,13 +20337,13 @@ in ekho = callPackage ../applications/audio/ekho { }; - electron-cash = libsForQt514.callPackage ../applications/misc/electron-cash { }; + electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { }; electrum = libsForQt5.callPackage ../applications/misc/electrum { }; electrum-dash = callPackage ../applications/misc/electrum/dash.nix { }; - electrum-ltc = libsForQt514.callPackage ../applications/misc/electrum/ltc.nix { }; + electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { }; elementary-planner = callPackage ../applications/office/elementary-planner { }; @@ -20805,10 +20831,10 @@ in fractal = callPackage ../applications/networking/instant-messengers/fractal { }; - freecad = libsForQt514.callPackage ../applications/graphics/freecad { + freecad = libsForQt5.callPackage ../applications/graphics/freecad { mpi = openmpi; }; - freecadStable = libsForQt514.callPackage ../applications/graphics/freecad/stable.nix { + freecadStable = libsForQt5.callPackage ../applications/graphics/freecad/stable.nix { mpi = openmpi; opencascade-occt = opencascade-occt730; python3Packages = python37Packages; @@ -20839,7 +20865,7 @@ in freerdpUnstable = freerdp; - friture = libsForQt514.callPackage ../applications/audio/friture { }; + friture = libsForQt5.callPackage ../applications/audio/friture { }; fte = callPackage ../applications/editors/fte { }; @@ -20933,7 +20959,7 @@ in opencv = python37Packages.opencv3; }; - manuskript = libsForQt514.callPackage ../applications/editors/manuskript { }; + manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; manul = callPackage ../development/tools/manul { }; @@ -21396,7 +21422,7 @@ in # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; - inkcut = libsForQt514.callPackage ../applications/misc/inkcut { }; + inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; inkscape = callPackage ../applications/graphics/inkscape { lcms = lcms2; @@ -21562,7 +21588,7 @@ in k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; - kdeconnect = libsForQt514.callPackage ../applications/misc/kdeconnect { }; + kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; inherit (kdeFrameworks) kdesu; @@ -21623,7 +21649,7 @@ in kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; - kmymoney = libsForQt514.callPackage ../applications/office/kmymoney { + kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { inherit (kdeApplications) kidentitymanagement; inherit (kdeFrameworks) kdewebkit; }; @@ -21638,7 +21664,7 @@ in kpt = callPackage ../applications/networking/cluster/kpt { }; - krita = libsForQt514.callPackage ../applications/graphics/krita { + krita = libsForQt5.callPackage ../applications/graphics/krita { openjpeg = openjpeg_1; }; @@ -21720,7 +21746,7 @@ in legit = gitAndTools.legit; - leo-editor = libsForQt514.callPackage ../applications/editors/leo-editor { }; + leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { }; libowfat = callPackage ../development/libraries/libowfat { }; @@ -22875,7 +22901,18 @@ in qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {}; - qgis-unwrapped = libsForQt514.callPackage ../applications/gis/qgis/unwrapped.nix { + # Our 3.10 LTS cannot use a newer Qt (5.15) version because it requires qtwebkit + # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b + qgis-unwrapped = let + pkgs_ = pkgs.extend(_: prev: { + pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { + pkgs = oldAttrs.pkgs.extend(_: _: { + qt5 = pkgs.qt514; + libsForQt5 = pkgs.libsForQt514; + }); + }); + }); + in pkgs_.libsForQt514.callPackage ../applications/gis/qgis/unwrapped.nix { withGrass = false; }; @@ -22907,7 +22944,7 @@ in qmmp = libsForQt5.callPackage ../applications/audio/qmmp { }; - qnotero = libsForQt514.callPackage ../applications/office/qnotero { }; + qnotero = libsForQt5.callPackage ../applications/office/qnotero { }; qrcode = callPackage ../tools/graphics/qrcode {}; @@ -23001,15 +23038,7 @@ in quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; - qutebrowser = let - pkgs_ = pkgs.extend(_: prev: { - pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { - pkgs = oldAttrs.pkgs.extend(_: _: { - inherit (pkgs) qt5 libsForQt514; - }); - }); - }); - in pkgs_.libsForQt514.callPackage ../applications/networking/browsers/qutebrowser { }; + qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { }; qxw = callPackage ../applications/editors/qxw {}; @@ -23031,7 +23060,7 @@ in rapcad = libsForQt514.callPackage ../applications/graphics/rapcad { boost = boost159; }; - rapid-photo-downloader = libsForQt514.callPackage ../applications/graphics/rapid-photo-downloader { }; + rapid-photo-downloader = libsForQt5.callPackage ../applications/graphics/rapid-photo-downloader { }; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; @@ -23326,11 +23355,11 @@ in curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; }; - cura = libsForQt514.callPackage ../applications/misc/cura { }; + cura = libsForQt5.callPackage ../applications/misc/cura { }; curaPlugins = callPackage ../applications/misc/cura/plugins.nix { }; - curaLulzbot = libsForQt514.callPackage ../applications/misc/cura/lulzbot/default.nix { }; + curaLulzbot = libsForQt5.callPackage ../applications/misc/cura/lulzbot/default.nix { }; curaByDagoma = callPackage ../applications/misc/curabydagoma { }; @@ -24050,7 +24079,7 @@ in webcamoid = libsForQt514.callPackage ../applications/video/webcamoid { }; - webmacs = libsForQt514.callPackage ../applications/networking/browsers/webmacs {}; + webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {}; webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d8980eb8ad..c334f9ab1a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4050,6 +4050,8 @@ in { nose-focus = callPackage ../development/python-modules/nose-focus { }; + nose-timer = callPackage ../development/python-modules/nose-timer { }; + nosejs = callPackage ../development/python-modules/nosejs { }; nose-of-yeti = callPackage ../development/python-modules/nose-of-yeti { };