Merge pull request #108041 from eduardosm/sip5

This commit is contained in:
Sandro 2021-01-24 23:46:57 +01:00 committed by GitHub
commit 930d919eef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 76 additions and 31 deletions

View file

@ -2589,6 +2589,12 @@
githubId = 119483;
name = "Matthew Brown";
};
eduardosm = {
email = "esm@eduardosm.net";
github = "eduardosm";
githubId = 761151;
name = "Eduardo Sánchez Muñoz";
};
eduarrrd = {
email = "e.bachmakov@gmail.com";
github = "eduarrrd";

View file

@ -15,18 +15,35 @@ let
inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python enum34;
sip = (pythonPackages.sip.override { sip-module = "PyQt5.sip"; }).overridePythonAttrs(oldAttrs: {
# If we install sip in another folder, then we need to create a __init__.py as well
# if we want to be able to import it with Python 2.
# Python 3 could rely on it being an implicit namespace package, however,
# PyQt5 we made an explicit namespace package so sip should be as well.
postInstall = ''
cat << EOF > $out/${python.sitePackages}/PyQt5/__init__.py
from pkgutil import extend_path
__path__ = extend_path(__path__, __name__)
EOF
'';
});
sip = if isPy3k then
pythonPackages.sip_5
else
(pythonPackages.sip.override { sip-module = "PyQt5.sip"; }).overridePythonAttrs(oldAttrs: {
# If we install sip in another folder, then we need to create a __init__.py as well
# if we want to be able to import it with Python 2.
# Python 3 could rely on it being an implicit namespace package, however,
# PyQt5 we made an explicit namespace package so sip should be as well.
postInstall = ''
cat << EOF > $out/${python.sitePackages}/PyQt5/__init__.py
from pkgutil import extend_path
__path__ = extend_path(__path__, __name__)
EOF
'';
});
pyqt5_sip = buildPythonPackage rec {
pname = "PyQt5_sip";
version = "12.8.1";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "30e944db9abee9cc757aea16906d4198129558533eb7fadbe48c5da2bd18e0bd";
};
# There is no test code and the check phase fails with:
# > error: could not create 'PyQt5/sip.cpython-38-x86_64-linux-gnu.so': No such file or directory
doCheck = false;
};
in buildPythonPackage rec {
pname = "PyQt5";
@ -69,8 +86,7 @@ in buildPythonPackage rec {
propagatedBuildInputs = [
dbus-python
sip
] ++ lib.optional (!isPy3k) enum34;
] ++ (if isPy3k then [ pyqt5_sip ] else [ sip enum34 ]);
patches = [
# Fix some wrong assumptions by ./configure.py
@ -103,7 +119,7 @@ in buildPythonPackage rec {
runHook postConfigure
'';
postInstall = ''
postInstall = lib.optionalString (!isPy3k) ''
ln -s ${sip}/${python.sitePackages}/PyQt5/sip.* $out/${python.sitePackages}/PyQt5/
for i in $out/bin/*; do
wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
@ -116,26 +132,21 @@ in buildPythonPackage rec {
EOF
'';
installCheckPhase = let
modules = [
"PyQt5"
"PyQt5.QtCore"
"PyQt5.QtQml"
"PyQt5.QtWidgets"
"PyQt5.QtGui"
]
# Checked using pythonImportsCheck
doCheck = false;
pythonImportsCheck = [
"PyQt5"
"PyQt5.QtCore"
"PyQt5.QtQml"
"PyQt5.QtWidgets"
"PyQt5.QtGui"
]
++ lib.optional withWebSockets "PyQt5.QtWebSockets"
++ lib.optional withWebKit "PyQt5.QtWebKit"
++ lib.optional withMultimedia "PyQt5.QtMultimedia"
++ lib.optional withConnectivity "PyQt5.QtConnectivity"
;
imports = lib.concatMapStrings (module: "import ${module};") modules;
in ''
echo "Checking whether modules can be imported..."
${python.interpreter} -c "${imports}"
'';
doCheck = true;
;
enableParallelBuilding = true;

View file

@ -0,0 +1,26 @@
{ lib, fetchPypi, buildPythonPackage, packaging, toml }:
buildPythonPackage rec {
pname = "sip";
version = "5.5.0";
src = fetchPypi {
pname = "sip";
inherit version;
sha256 = "1idaivamp1jvbbai9yzv471c62xbqxhaawccvskaizihkd0lq0jx";
};
propagatedBuildInputs = [ packaging toml ];
# There aren't tests
doCheck = false;
pythonImportsCheck = [ "sipbuild" ];
meta = with lib; {
description = "Creates C++ bindings for Python modules";
homepage = "http://www.riverbankcomputing.co.uk/";
license = licenses.gpl3Only;
maintainers = with maintainers; [ eduardosm ];
};
}

View file

@ -7109,6 +7109,8 @@ in {
sip = callPackage ../development/python-modules/sip { };
sip_5 = callPackage ../development/python-modules/sip/5.x.nix { };
sipsimple = callPackage ../development/python-modules/sipsimple { };
six = callPackage ../development/python-modules/six { };