pythonPackages.sip: rename to sip_4
sip 4 is the old and unmaintained version
This commit is contained in:
@@ -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";
|
||||
|
||||
|
||||
@@ -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, 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
|
||||
|
||||
@@ -18,7 +18,7 @@ let
|
||||
sip = if isPy3k then
|
||||
pythonPackages.sip_5
|
||||
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; {
|
||||
|
||||
Reference in New Issue
Block a user