Merge pull request #121588 from eduardosm/sip-rename
pythonPackages.sip: rename to sip_4, pythonPackages.sip_5: rename to sip
This commit is contained in:
commit
cf45c45605
|
@ -19,7 +19,7 @@ let
|
|||
urllib3
|
||||
pygments
|
||||
pyqt5
|
||||
sip
|
||||
sip_4
|
||||
owslib
|
||||
six
|
||||
];
|
||||
|
|
|
@ -17,7 +17,7 @@ mkDerivation rec {
|
|||
sha256 = "0rwghzci2wn2jmisvnzs23yxc2z3d4dcx2qbbhcvjyi3q8ij61nl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ];
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ];
|
||||
|
||||
buildInputs = [
|
||||
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
|
||||
|
|
|
@ -45,7 +45,7 @@ mkDerivation rec {
|
|||
prePatch = ''
|
||||
sed -i "s/\[tool.sip.project\]/[tool.sip.project]\nsip-include-dirs = [\"${escaped_pyqt5_dir}\/share\/sip\/PyQt5\"]/g" \
|
||||
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
|
||||
|
||||
# Remove unneeded files and libs
|
||||
|
@ -95,7 +95,7 @@ mkDerivation rec {
|
|||
pyqtwebengine
|
||||
python
|
||||
regex
|
||||
sip_5
|
||||
sip
|
||||
zeroconf
|
||||
# the following are distributed with calibre, but we use upstream instead
|
||||
odfpy
|
||||
|
|
|
@ -10,10 +10,10 @@ let
|
|||
};
|
||||
|
||||
libarcusLulzbot = callPackage ./libarcus.nix {
|
||||
inherit (python3.pkgs) buildPythonPackage sip pythonOlder;
|
||||
inherit (python3.pkgs) buildPythonPackage sip_4 pythonOlder;
|
||||
};
|
||||
libsavitarLulzbot = callPackage ./libsavitar.nix {
|
||||
inherit (python3.pkgs) buildPythonPackage sip pythonOlder;
|
||||
inherit (python3.pkgs) buildPythonPackage sip_4 pythonOlder;
|
||||
};
|
||||
|
||||
inherit (python3.pkgs) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }:
|
||||
{ lib, buildPythonPackage, fetchgit, fetchurl, cmake, sip_4, protobuf, pythonOlder }:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "libarcus";
|
||||
|
@ -13,7 +13,7 @@ buildPythonPackage {
|
|||
|
||||
disabled = pythonOlder "3.4.0";
|
||||
|
||||
propagatedBuildInputs = [ sip ];
|
||||
propagatedBuildInputs = [ sip_4 ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ protobuf ];
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }:
|
||||
{ lib, buildPythonPackage, pythonOlder, fetchgit, cmake, sip_4 }:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "libsavitar-lulzbot";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage {
|
|||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
propagatedBuildInputs = [ sip ];
|
||||
propagatedBuildInputs = [ sip_4 ];
|
||||
|
||||
disabled = pythonOlder "3.4.0";
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
# python deps
|
||||
, python, buildPythonPackage
|
||||
, alembic, beautifulsoup4, chardet, lxml, Mako, pyenchant
|
||||
, pyqt5_with_qtwebkit, pyxdg, sip, sqlalchemy, sqlalchemy_migrate
|
||||
, pyqt5_with_qtwebkit, pyxdg, sip_4, sqlalchemy, sqlalchemy_migrate
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
|||
pyenchant
|
||||
pyqt5_with_qtwebkit
|
||||
pyxdg
|
||||
sip
|
||||
sip_4
|
||||
sqlalchemy
|
||||
sqlalchemy_migrate
|
||||
];
|
||||
|
|
|
@ -24,7 +24,7 @@ in python.pkgs.buildPythonPackage rec {
|
|||
propagatedBuildInputs = with python.pkgs; [
|
||||
sentry-sdk psutil jsonschema # tox for check
|
||||
# Runtime dependencies
|
||||
sip (pyqt5.override { withWebSockets = true; }) distro setuptools
|
||||
sip_4 (pyqt5.override { withWebSockets = true; }) distro setuptools
|
||||
];
|
||||
|
||||
doCheck = false; # Failing
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
propagatedBuildInputs = with python3Packages; [
|
||||
pyqt5
|
||||
lxml
|
||||
sip
|
||||
sip_4
|
||||
];
|
||||
preBuild = ''
|
||||
make qt5py3
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, fetchFromGitHub, python3Packages, gettext, git, qt5 }:
|
||||
|
||||
let
|
||||
inherit (python3Packages) buildPythonApplication pyqt5 sip pyinotify;
|
||||
inherit (python3Packages) buildPythonApplication pyqt5 sip_4 pyinotify;
|
||||
|
||||
in buildPythonApplication rec {
|
||||
pname = "git-cola";
|
||||
|
@ -15,7 +15,7 @@ in buildPythonApplication rec {
|
|||
};
|
||||
|
||||
buildInputs = [ git gettext ];
|
||||
propagatedBuildInputs = [ pyqt5 sip pyinotify ];
|
||||
propagatedBuildInputs = [ pyqt5 sip_4 pyinotify ];
|
||||
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
|
||||
|
||||
doCheck = false;
|
||||
|
|
|
@ -18,7 +18,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
|
|||
|
||||
buildInputs = [ gtk3 ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5_with_qtwebkit requests sip httplib2 pyzmq ];
|
||||
propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5_with_qtwebkit requests sip_4 httplib2 pyzmq ];
|
||||
|
||||
dontWrapGApps = true;
|
||||
dontWrapQtApps = true;
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
, ply
|
||||
, kiwisolver
|
||||
, qtpy
|
||||
, sip
|
||||
, sip_4
|
||||
, cppy
|
||||
, bytecode
|
||||
}:
|
||||
|
@ -44,7 +44,7 @@ buildPythonPackage rec {
|
|||
ply
|
||||
kiwisolver
|
||||
qtpy
|
||||
sip
|
||||
sip_4
|
||||
cppy
|
||||
bytecode
|
||||
];
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, buildPythonPackage, python, fetchFromGitHub
|
||||
, cmake, sip, protobuf, pythonOlder }:
|
||||
, cmake, sip_4, protobuf, pythonOlder }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libarcus";
|
||||
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
|
||||
disabled = pythonOlder "3.4.0";
|
||||
|
||||
propagatedBuildInputs = [ sip ];
|
||||
propagatedBuildInputs = [ sip_4 ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ protobuf ];
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip }:
|
||||
{ lib, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip_4 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libsavitar";
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
propagatedBuildInputs = [ sip ];
|
||||
propagatedBuildInputs = [ sip_4 ];
|
||||
|
||||
disabled = pythonOlder "3.4.0";
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
, isPy3k
|
||||
, fetchPypi
|
||||
, pythonPackages
|
||||
, sip_5
|
||||
, sip
|
||||
, qtbase
|
||||
, qmake
|
||||
, pyqt5
|
||||
|
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
buildInputs = [ qtbase.dev poppler pyqt-builder ];
|
||||
nativeBuildInputs = [ pkg-config qmake sip_5 ];
|
||||
nativeBuildInputs = [ pkg-config qmake sip ];
|
||||
propagatedBuildInputs = [ pyqt5.dev ];
|
||||
|
||||
format = "pyproject";
|
||||
|
@ -46,7 +46,7 @@ buildPythonPackage rec {
|
|||
|
||||
[tool.sip.bindings.Poppler-Qt5]
|
||||
include-dirs = ["${poppler.dev}/include/poppler"]
|
||||
tags = ["${sip_5.platform_tag}"]
|
||||
tags = ["${sip.platform_tag}"]
|
||||
EOF
|
||||
'';
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, toPythonModule, fetchpatch, cmake, orocos-kdl, python, sip }:
|
||||
{ lib, stdenv, toPythonModule, fetchpatch, cmake, orocos-kdl, python, sip_4 }:
|
||||
|
||||
toPythonModule (stdenv.mkDerivation {
|
||||
pname = "pykdl";
|
||||
|
@ -18,7 +18,7 @@ toPythonModule (stdenv.mkDerivation {
|
|||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ orocos-kdl ];
|
||||
propagatedBuildInputs = [ python sip ];
|
||||
propagatedBuildInputs = [ python sip_4 ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Kinematics and Dynamics Library (Python bindings)";
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, python3, cmake
|
||||
, pythonOlder, libnest2d, sip, clipper }:
|
||||
, pythonOlder, libnest2d, sip_4, clipper }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "4.8.0";
|
||||
|
@ -13,7 +13,7 @@ buildPythonPackage rec {
|
|||
sha256 = "18dn92vgr4gvf9scfh93yg9bwrhdjvq62di08rpi7pqjrrvq2nvp";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ libnest2d sip clipper ];
|
||||
propagatedBuildInputs = [ libnest2d sip_4 clipper ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
CLIPPER_PATH = "${clipper.out}";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchPypi, buildPythonPackage, packaging, sip_5 }:
|
||||
{ lib, fetchPypi, buildPythonPackage, packaging, sip }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyqt-builder";
|
||||
|
@ -10,7 +10,7 @@ buildPythonPackage rec {
|
|||
sha256 = "0g51yak53zzjs4gpq65i01cmpz7w8cjny9wfyxlgr2vi0wag107v";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ packaging sip_5 ];
|
||||
propagatedBuildInputs = [ packaging sip ];
|
||||
|
||||
pythonImportsCheck = [ "pyqtbuild" ];
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip, qt4, pkg-config, lndir, dbus, makeWrapper }:
|
||||
{ lib, stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip_4, qt4, pkg-config, lndir, dbus, makeWrapper }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "PyQt-x11-gpl";
|
||||
|
@ -45,7 +45,7 @@ buildPythonPackage rec {
|
|||
nativeBuildInputs = [ pkg-config lndir makeWrapper qt4 ];
|
||||
buildInputs = [ qt4 dbus ];
|
||||
|
||||
propagatedBuildInputs = [ sip ];
|
||||
propagatedBuildInputs = [ sip_4 ];
|
||||
|
||||
postInstall = ''
|
||||
for i in $out/bin/*; do
|
||||
|
|
|
@ -16,9 +16,9 @@ let
|
|||
inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python enum34;
|
||||
|
||||
sip = if isPy3k then
|
||||
pythonPackages.sip_5
|
||||
pythonPackages.sip
|
||||
else
|
||||
(pythonPackages.sip.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 want to be able to import it with Python 2.
|
||||
# Python 3 could rely on it being an implicit namespace package, however,
|
||||
|
|
|
@ -10,7 +10,7 @@ buildPythonPackage {
|
|||
src = qscintilla.src;
|
||||
format = "other";
|
||||
|
||||
nativeBuildInputs = [ sip qtbase ];
|
||||
nativeBuildInputs = [ sip_4 qtbase ];
|
||||
buildInputs = [ qscintilla ];
|
||||
propagatedBuildInputs = [ pyqt5 ];
|
||||
|
||||
|
@ -40,7 +40,7 @@ buildPythonPackage {
|
|||
--qsci-libdir=${qscintilla}/lib \
|
||||
--pyqt-sipdir=${pyqt5}/share/sip/PyQt5 \
|
||||
--qsci-sipdir=$out/share/sip/PyQt5 \
|
||||
--sip-incdir=${sip}/include
|
||||
--sip-incdir=${sip_4}/include
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
44
pkgs/development/python-modules/sip/4.x.nix
Normal file
44
pkgs/development/python-modules/sip/4.x.nix
Normal file
|
@ -0,0 +1,44 @@
|
|||
{ lib, fetchurl, buildPythonPackage, python, isPyPy, sip-module ? "sip" }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = sip-module;
|
||||
version = "4.19.25";
|
||||
format = "other";
|
||||
|
||||
disabled = isPyPy;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz";
|
||||
sha256 = "04a23cgsnx150xq86w1z44b6vr2zyazysy9mqax0fy346zlr77dk";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
${python.executable} ./configure.py \
|
||||
--sip-module ${sip-module} \
|
||||
-d $out/${python.sitePackages} \
|
||||
-b $out/bin -e $out/include
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installCheckPhase = let
|
||||
modules = [
|
||||
sip-module
|
||||
"sipconfig"
|
||||
];
|
||||
imports = lib.concatMapStrings (module: "import ${module};") modules;
|
||||
in ''
|
||||
echo "Checking whether modules can be imported..."
|
||||
PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ${python.interpreter} -c "${imports}"
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Creates C++ bindings for Python modules";
|
||||
homepage = "http://www.riverbankcomputing.co.uk/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ lovek323 sander ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
|
@ -1,40 +0,0 @@
|
|||
{ lib, stdenv, 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" ];
|
||||
|
||||
# FIXME: Why isn't this detected automatically?
|
||||
# Needs to be specified in pyproject.toml, e.g.:
|
||||
# [tool.sip.bindings.MODULE]
|
||||
# tags = [PLATFORM_TAG]
|
||||
platform_tag =
|
||||
if stdenv.targetPlatform.isLinux then
|
||||
"WS_X11"
|
||||
else if stdenv.targetPlatform.isDarwin then
|
||||
"WS_MACX"
|
||||
else if stdenv.targetPlatform.isWindows then
|
||||
"WS_WIN"
|
||||
else
|
||||
throw "unsupported platform";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Creates C++ bindings for Python modules";
|
||||
homepage = "http://www.riverbankcomputing.co.uk/";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ eduardosm ];
|
||||
};
|
||||
}
|
|
@ -1,44 +1,40 @@
|
|||
{ lib, fetchurl, buildPythonPackage, python, isPyPy, sip-module ? "sip" }:
|
||||
{ lib, stdenv, fetchPypi, buildPythonPackage, packaging, toml }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = sip-module;
|
||||
version = "4.19.24";
|
||||
format = "other";
|
||||
pname = "sip";
|
||||
version = "5.5.0";
|
||||
|
||||
disabled = isPyPy;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz";
|
||||
sha256 = "1ra15vb5i9gkg2vdvh16cq9x2mmzw1yi3xphxs8q34q1pf83gkgd";
|
||||
src = fetchPypi {
|
||||
pname = "sip";
|
||||
inherit version;
|
||||
sha256 = "1idaivamp1jvbbai9yzv471c62xbqxhaawccvskaizihkd0lq0jx";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
${python.executable} ./configure.py \
|
||||
--sip-module ${sip-module} \
|
||||
-d $out/${python.sitePackages} \
|
||||
-b $out/bin -e $out/include
|
||||
'';
|
||||
propagatedBuildInputs = [ packaging toml ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
# There aren't tests
|
||||
doCheck = false;
|
||||
|
||||
installCheckPhase = let
|
||||
modules = [
|
||||
sip-module
|
||||
"sipconfig"
|
||||
];
|
||||
imports = lib.concatMapStrings (module: "import ${module};") modules;
|
||||
in ''
|
||||
echo "Checking whether modules can be imported..."
|
||||
PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ${python.interpreter} -c "${imports}"
|
||||
'';
|
||||
pythonImportsCheck = [ "sipbuild" ];
|
||||
|
||||
doCheck = true;
|
||||
# FIXME: Why isn't this detected automatically?
|
||||
# Needs to be specified in pyproject.toml, e.g.:
|
||||
# [tool.sip.bindings.MODULE]
|
||||
# tags = [PLATFORM_TAG]
|
||||
platform_tag =
|
||||
if stdenv.targetPlatform.isLinux then
|
||||
"WS_X11"
|
||||
else if stdenv.targetPlatform.isDarwin then
|
||||
"WS_MACX"
|
||||
else if stdenv.targetPlatform.isWindows then
|
||||
"WS_WIN"
|
||||
else
|
||||
throw "unsupported platform";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Creates C++ bindings for Python modules";
|
||||
homepage = "http://www.riverbankcomputing.co.uk/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ lovek323 sander ];
|
||||
platforms = platforms.all;
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ eduardosm ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -75,7 +75,7 @@ python2Packages.buildPythonApplication {
|
|||
pygobject2
|
||||
reportlab
|
||||
usbutils
|
||||
sip
|
||||
sip_4
|
||||
] ++ lib.optionals withQt5 [
|
||||
pyqt5
|
||||
];
|
||||
|
|
|
@ -79,7 +79,7 @@ python3Packages.buildPythonApplication {
|
|||
pygobject3
|
||||
reportlab
|
||||
usbutils
|
||||
sip
|
||||
sip_4
|
||||
dbus-python
|
||||
] ++ lib.optionals withQt5 [
|
||||
pyqt5
|
||||
|
|
|
@ -12,7 +12,7 @@ buildPythonApplication rec {
|
|||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
lilypond pygame python-ly sip
|
||||
lilypond pygame python-ly sip_4
|
||||
pyqt5 poppler-qt5
|
||||
pyqtwebengine
|
||||
];
|
||||
|
|
|
@ -7556,9 +7556,9 @@ in {
|
|||
|
||||
signify = callPackage ../development/python-modules/signify { };
|
||||
|
||||
sip = callPackage ../development/python-modules/sip { };
|
||||
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 { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue