pythonPackages.sip_5: rename to sip
This commit is contained in:
parent
08a26e4579
commit
e02445f4d8
@ -45,7 +45,7 @@ mkDerivation rec {
|
|||||||
prePatch = ''
|
prePatch = ''
|
||||||
sed -i "s/\[tool.sip.project\]/[tool.sip.project]\nsip-include-dirs = [\"${escaped_pyqt5_dir}\/share\/sip\/PyQt5\"]/g" \
|
sed -i "s/\[tool.sip.project\]/[tool.sip.project]\nsip-include-dirs = [\"${escaped_pyqt5_dir}\/share\/sip\/PyQt5\"]/g" \
|
||||||
setup/build.py
|
setup/build.py
|
||||||
sed -i "s/\[tool.sip.bindings.pictureflow\]/[tool.sip.bindings.pictureflow]\ntags = [\"${python3Packages.sip_5.platform_tag}\"]/g" \
|
sed -i "s/\[tool.sip.bindings.pictureflow\]/[tool.sip.bindings.pictureflow]\ntags = [\"${python3Packages.sip.platform_tag}\"]/g" \
|
||||||
setup/build.py
|
setup/build.py
|
||||||
|
|
||||||
# Remove unneeded files and libs
|
# Remove unneeded files and libs
|
||||||
@ -95,7 +95,7 @@ mkDerivation rec {
|
|||||||
pyqtwebengine
|
pyqtwebengine
|
||||||
python
|
python
|
||||||
regex
|
regex
|
||||||
sip_5
|
sip
|
||||||
zeroconf
|
zeroconf
|
||||||
# the following are distributed with calibre, but we use upstream instead
|
# the following are distributed with calibre, but we use upstream instead
|
||||||
odfpy
|
odfpy
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
, isPy3k
|
, isPy3k
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
, pythonPackages
|
, pythonPackages
|
||||||
, sip_5
|
, sip
|
||||||
, qtbase
|
, qtbase
|
||||||
, qmake
|
, qmake
|
||||||
, pyqt5
|
, pyqt5
|
||||||
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
|||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [ qtbase.dev poppler pyqt-builder ];
|
buildInputs = [ qtbase.dev poppler pyqt-builder ];
|
||||||
nativeBuildInputs = [ pkg-config qmake sip_5 ];
|
nativeBuildInputs = [ pkg-config qmake sip ];
|
||||||
propagatedBuildInputs = [ pyqt5.dev ];
|
propagatedBuildInputs = [ pyqt5.dev ];
|
||||||
|
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
@ -46,7 +46,7 @@ buildPythonPackage rec {
|
|||||||
|
|
||||||
[tool.sip.bindings.Poppler-Qt5]
|
[tool.sip.bindings.Poppler-Qt5]
|
||||||
include-dirs = ["${poppler.dev}/include/poppler"]
|
include-dirs = ["${poppler.dev}/include/poppler"]
|
||||||
tags = ["${sip_5.platform_tag}"]
|
tags = ["${sip.platform_tag}"]
|
||||||
EOF
|
EOF
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, fetchPypi, buildPythonPackage, packaging, sip_5 }:
|
{ lib, fetchPypi, buildPythonPackage, packaging, sip }:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyqt-builder";
|
pname = "pyqt-builder";
|
||||||
@ -10,7 +10,7 @@ buildPythonPackage rec {
|
|||||||
sha256 = "0g51yak53zzjs4gpq65i01cmpz7w8cjny9wfyxlgr2vi0wag107v";
|
sha256 = "0g51yak53zzjs4gpq65i01cmpz7w8cjny9wfyxlgr2vi0wag107v";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ packaging sip_5 ];
|
propagatedBuildInputs = [ packaging sip ];
|
||||||
|
|
||||||
pythonImportsCheck = [ "pyqtbuild" ];
|
pythonImportsCheck = [ "pyqtbuild" ];
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ let
|
|||||||
inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python enum34;
|
inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python enum34;
|
||||||
|
|
||||||
sip = if isPy3k then
|
sip = if isPy3k then
|
||||||
pythonPackages.sip_5
|
pythonPackages.sip
|
||||||
else
|
else
|
||||||
(pythonPackages.sip_4.override { sip-module = "PyQt5.sip"; }).overridePythonAttrs(oldAttrs: {
|
(pythonPackages.sip_4.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 install sip in another folder, then we need to create a __init__.py as well
|
||||||
|
@ -7524,9 +7524,9 @@ in {
|
|||||||
|
|
||||||
signify = callPackage ../development/python-modules/signify { };
|
signify = callPackage ../development/python-modules/signify { };
|
||||||
|
|
||||||
sip_4 = callPackage ../development/python-modules/sip/4.x.nix { };
|
sip = callPackage ../development/python-modules/sip/default.nix { };
|
||||||
|
|
||||||
sip_5 = callPackage ../development/python-modules/sip/5.x.nix { };
|
sip_4 = callPackage ../development/python-modules/sip/4.x.nix { };
|
||||||
|
|
||||||
six = callPackage ../development/python-modules/six { };
|
six = callPackage ../development/python-modules/six { };
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user