colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python-qt: update to v3.5.0

Browse Source
This commit is contained in:
Guilhem Saurel 2024-04-07 16:16:03 +02:00
parent 4f7cb34d63
commit 04a1d9b204
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/development/libraries/python-qt/default.nix
View File

@ -1,33 +1,33 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, python, qmake, { lib, stdenv, fetchFromGitHub, fetchpatch, python3, qmake,
qtwebengine, qtxmlpatterns, qtwebengine, qtxmlpatterns,
qttools, unzip }: qttools, unzip }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "python-qt"; pname = "python-qt";
version = "3.4.2"; version = "3.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MeVisLab"; owner = "MeVisLab";
repo = "pythonqt"; repo = "pythonqt";
rev = "v${version}"; rev = "v${finalAttrs.version}";
hash = "sha256-xJYOD07ACOKtY3psmfHNSCjm6t0fr8JU9CrL0w5P5G0="; hash = "sha256-Yz7w5Gs0W3ilrZXjkC+wXLCCXWTKkhCpWXbg+PshXKI=";
}; };
# https://github.com/CsoundQt/CsoundQt/blob/develop/BUILDING.md#pythonqt patches = [
postPatch = '' (fetchpatch {
substituteInPlace build/python.prf \ name = "fix-format-security.patch";
--replace "PYTHON_VERSION=2.7" "PYTHON_VERSION=${python.pythonVersion}" url = "https://github.com/MeVisLab/pythonqt/pull/197/commits/c35d1efd00b83e0ebd826d7ed8454f3684ddffff.patch";
''; hash = "sha256-WJBLPdMemuKlZWoqYVU9TXldoDpaBm84RxkepIaocUQ=";
})
hardeningDisable = [ "all" ]; ];
nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools unzip ]; nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools unzip ];
buildInputs = [ python ]; buildInputs = [ python3 ];
qmakeFlags = [ qmakeFlags = [
"PythonQt.pro" "PYTHON_DIR=${python3}"
"PYTHON_DIR=${python}" "PYTHON_VERSION=3.${python3.sourceVersion.minor}"
]; ];
dontWrapQtApps = true; dontWrapQtApps = true;
@ -49,4 +49,4 @@ stdenv.mkDerivation rec {
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ hlolli ]; maintainers = with maintainers; [ hlolli ];
}; };
} })

5
pkgs/top-level/all-packages.nix
View File

@ -24095,10 +24095,9 @@ with pkgs;
pylode = callPackage ../misc/pylode { }; pylode = callPackage ../misc/pylode { };
python-qt = disable-warnings-if-gcc13 (callPackage ../development/libraries/python-qt { python-qt = callPackage ../development/libraries/python-qt {
python = python3;
inherit (qt5) qmake qttools qtwebengine qtxmlpatterns; inherit (qt5) qmake qttools qtwebengine qtxmlpatterns;
}); };
pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside { }; pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside { };