python-qt: update to v3.5.0

+18 -19
+16 -16
pkgs/development/libraries/python-qt/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, fetchpatch, python, qmake, 2 qtwebengine, qtxmlpatterns, 3 qttools, unzip }: 4 5 - stdenv.mkDerivation rec { 6 pname = "python-qt"; 7 - version = "3.4.2"; 8 9 src = fetchFromGitHub { 10 owner = "MeVisLab"; 11 repo = "pythonqt"; 12 - rev = "v${version}"; 13 - hash = "sha256-xJYOD07ACOKtY3psmfHNSCjm6t0fr8JU9CrL0w5P5G0="; 14 }; 15 16 - # https://github.com/CsoundQt/CsoundQt/blob/develop/BUILDING.md#pythonqt 17 - postPatch = '' 18 - substituteInPlace build/python.prf \ 19 - --replace "PYTHON_VERSION=2.7" "PYTHON_VERSION=${python.pythonVersion}" 20 - ''; 21 - 22 - hardeningDisable = [ "all" ]; 23 24 nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools unzip ]; 25 26 - buildInputs = [ python ]; 27 28 qmakeFlags = [ 29 - "PythonQt.pro" 30 - "PYTHON_DIR=${python}" 31 ]; 32 33 dontWrapQtApps = true; ··· 49 platforms = platforms.all; 50 maintainers = with maintainers; [ hlolli ]; 51 }; 52 - }
··· 1 + { lib, stdenv, fetchFromGitHub, fetchpatch, python3, qmake, 2 qtwebengine, qtxmlpatterns, 3 qttools, unzip }: 4 5 + stdenv.mkDerivation (finalAttrs: { 6 pname = "python-qt"; 7 + version = "3.5.0"; 8 9 src = fetchFromGitHub { 10 owner = "MeVisLab"; 11 repo = "pythonqt"; 12 + rev = "v${finalAttrs.version}"; 13 + hash = "sha256-Yz7w5Gs0W3ilrZXjkC+wXLCCXWTKkhCpWXbg+PshXKI="; 14 }; 15 16 + patches = [ 17 + (fetchpatch { 18 + name = "fix-format-security.patch"; 19 + url = "https://github.com/MeVisLab/pythonqt/pull/197/commits/c35d1efd00b83e0ebd826d7ed8454f3684ddffff.patch"; 20 + hash = "sha256-WJBLPdMemuKlZWoqYVU9TXldoDpaBm84RxkepIaocUQ="; 21 + }) 22 + ]; 23 24 nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools unzip ]; 25 26 + buildInputs = [ python3 ]; 27 28 qmakeFlags = [ 29 + "PYTHON_DIR=${python3}" 30 + "PYTHON_VERSION=3.${python3.sourceVersion.minor}" 31 ]; 32 33 dontWrapQtApps = true; ··· 49 platforms = platforms.all; 50 maintainers = with maintainers; [ hlolli ]; 51 }; 52 + })
+2 -3
pkgs/top-level/all-packages.nix
··· 24095 24096 pylode = callPackage ../misc/pylode { }; 24097 24098 - python-qt = disable-warnings-if-gcc13 (callPackage ../development/libraries/python-qt { 24099 - python = python3; 24100 inherit (qt5) qmake qttools qtwebengine qtxmlpatterns; 24101 - }); 24102 24103 pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside { }; 24104
··· 24095 24096 pylode = callPackage ../misc/pylode { }; 24097 24098 + python-qt = callPackage ../development/libraries/python-qt { 24099 inherit (qt5) qmake qttools qtwebengine qtxmlpatterns; 24100 + }; 24101 24102 pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside { }; 24103