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

pythonPackages.sip: rename to sip_4

Browse Source 
sip 4 is the old and unmaintained version
This commit is contained in:
Eduardo Sánchez Muñoz 2021-05-03 13:43:20 +02:00
parent 4f675ad255
commit 08a26e4579
23 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/gis/qgis/unwrapped.nix
View File

@ -19,7 +19,7 @@ let
urllib3 urllib3
pygments pygments
pyqt5 pyqt5
sip sip_4
owslib owslib
six six
]; ];

2
pkgs/applications/graphics/krita/default.nix
View File

@ -17,7 +17,7 @@ mkDerivation rec {
sha256 = "0rwghzci2wn2jmisvnzs23yxc2z3d4dcx2qbbhcvjyi3q8ij61nl"; sha256 = "0rwghzci2wn2jmisvnzs23yxc2z3d4dcx2qbbhcvjyi3q8ij61nl";
}; };
nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ];
buildInputs = [ buildInputs = [
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons

4
pkgs/applications/misc/cura/lulzbot/default.nix
View File

@ -10,10 +10,10 @@ let
}; };
libarcusLulzbot = callPackage ./libarcus.nix { libarcusLulzbot = callPackage ./libarcus.nix {
inherit (python3.pkgs) buildPythonPackage sip pythonOlder; inherit (python3.pkgs) buildPythonPackage sip_4 pythonOlder;
}; };
libsavitarLulzbot = callPackage ./libsavitar.nix { 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; inherit (python3.pkgs) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder;

4
pkgs/applications/misc/cura/lulzbot/libarcus.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }: { lib, buildPythonPackage, fetchgit, fetchurl, cmake, sip_4, protobuf, pythonOlder }:
buildPythonPackage { buildPythonPackage {
pname = "libarcus"; pname = "libarcus";
@ -13,7 +13,7 @@ buildPythonPackage {
disabled = pythonOlder "3.4.0"; disabled = pythonOlder "3.4.0";
propagatedBuildInputs = [ sip ]; propagatedBuildInputs = [ sip_4 ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ protobuf ]; buildInputs = [ protobuf ];

4
pkgs/applications/misc/cura/lulzbot/libsavitar.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }: { lib, buildPythonPackage, pythonOlder, fetchgit, cmake, sip_4 }:
buildPythonPackage { buildPythonPackage {
pname = "libsavitar-lulzbot"; pname = "libsavitar-lulzbot";
@ -19,7 +19,7 @@ buildPythonPackage {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ sip ]; propagatedBuildInputs = [ sip_4 ];
disabled = pythonOlder "3.4.0"; disabled = pythonOlder "3.4.0";

4
pkgs/applications/misc/openlp/lib.nix
View File

@ -5,7 +5,7 @@
# python deps # python deps
, python, buildPythonPackage , python, buildPythonPackage
, alembic, beautifulsoup4, chardet, lxml, Mako, pyenchant , 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 { buildPythonPackage rec {
@ -41,7 +41,7 @@ buildPythonPackage rec {
pyenchant pyenchant
pyqt5_with_qtwebkit pyqt5_with_qtwebkit
pyxdg pyxdg
sip sip_4
sqlalchemy sqlalchemy
sqlalchemy_migrate sqlalchemy_migrate
]; ];

2
pkgs/applications/networking/gns3/gui.nix
View File

@ -24,7 +24,7 @@ in python.pkgs.buildPythonPackage rec {
propagatedBuildInputs = with python.pkgs; [ propagatedBuildInputs = with python.pkgs; [
sentry-sdk psutil jsonschema # tox for check sentry-sdk psutil jsonschema # tox for check
# Runtime dependencies # Runtime dependencies
sip (pyqt5.override { withWebSockets = true; }) distro setuptools sip_4 (pyqt5.override { withWebSockets = true; }) distro setuptools
]; ];
doCheck = false; # Failing doCheck = false; # Failing

2
pkgs/applications/science/machine-learning/labelimg/default.nix
View File

@ -15,7 +15,7 @@
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
pyqt5 pyqt5
lxml lxml
sip sip_4
]; ];
preBuild = '' preBuild = ''
make qt5py3 make qt5py3

4
pkgs/applications/version-management/git-and-tools/git-cola/default.nix
View File

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, python3Packages, gettext, git, qt5 }: { lib, fetchFromGitHub, python3Packages, gettext, git, qt5 }:
let let
inherit (python3Packages) buildPythonApplication pyqt5 sip pyinotify; inherit (python3Packages) buildPythonApplication pyqt5 sip_4 pyinotify;
in buildPythonApplication rec { in buildPythonApplication rec {
pname = "git-cola"; pname = "git-cola";
@ -15,7 +15,7 @@ in buildPythonApplication rec {
}; };
buildInputs = [ git gettext ]; buildInputs = [ git gettext ];
propagatedBuildInputs = [ pyqt5 sip pyinotify ]; propagatedBuildInputs = [ pyqt5 sip_4 pyinotify ];
nativeBuildInputs = [ qt5.wrapQtAppsHook ]; nativeBuildInputs = [ qt5.wrapQtAppsHook ];
doCheck = false; doCheck = false;

2
pkgs/applications/video/openshot-qt/default.nix
View File

@ -18,7 +18,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
buildInputs = [ gtk3 ]; 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; dontWrapGApps = true;
dontWrapQtApps = true; dontWrapQtApps = true;

4
pkgs/development/python-modules/enaml/default.nix
View File

@ -5,7 +5,7 @@
, ply , ply
, kiwisolver , kiwisolver
, qtpy , qtpy
, sip , sip_4
, cppy , cppy
, bytecode , bytecode
}: }:
@ -44,7 +44,7 @@ buildPythonPackage rec {
ply ply
kiwisolver kiwisolver
qtpy qtpy
sip sip_4
cppy cppy
bytecode bytecode
]; ];

4
pkgs/development/python-modules/libarcus/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, python, fetchFromGitHub { lib, buildPythonPackage, python, fetchFromGitHub
, cmake, sip, protobuf, pythonOlder }: , cmake, sip_4, protobuf, pythonOlder }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "libarcus"; pname = "libarcus";
@ -15,7 +15,7 @@ buildPythonPackage rec {
disabled = pythonOlder "3.4.0"; disabled = pythonOlder "3.4.0";
propagatedBuildInputs = [ sip ]; propagatedBuildInputs = [ sip_4 ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ protobuf ]; buildInputs = [ protobuf ];

4
pkgs/development/python-modules/libsavitar/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip }: { lib, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip_4 }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "libsavitar"; pname = "libsavitar";
@ -18,7 +18,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ sip ]; propagatedBuildInputs = [ sip_4 ];
disabled = pythonOlder "3.4.0"; disabled = pythonOlder "3.4.0";

4
pkgs/development/python-modules/pykdl/default.nix
View File

@ -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 { toPythonModule (stdenv.mkDerivation {
pname = "pykdl"; pname = "pykdl";
@ -18,7 +18,7 @@ toPythonModule (stdenv.mkDerivation {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ orocos-kdl ]; buildInputs = [ orocos-kdl ];
propagatedBuildInputs = [ python sip ]; propagatedBuildInputs = [ python sip_4 ];
meta = with lib; { meta = with lib; {
description = "Kinematics and Dynamics Library (Python bindings)"; description = "Kinematics and Dynamics Library (Python bindings)";

4
pkgs/development/python-modules/pynest2d/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchFromGitHub, python3, cmake { lib, buildPythonPackage, fetchFromGitHub, python3, cmake
, pythonOlder, libnest2d, sip, clipper }: , pythonOlder, libnest2d, sip_4, clipper }:
buildPythonPackage rec { buildPythonPackage rec {
version = "4.8.0"; version = "4.8.0";
@ -13,7 +13,7 @@ buildPythonPackage rec {
sha256 = "18dn92vgr4gvf9scfh93yg9bwrhdjvq62di08rpi7pqjrrvq2nvp"; sha256 = "18dn92vgr4gvf9scfh93yg9bwrhdjvq62di08rpi7pqjrrvq2nvp";
}; };
propagatedBuildInputs = [ libnest2d sip clipper ]; propagatedBuildInputs = [ libnest2d sip_4 clipper ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
CLIPPER_PATH = "${clipper.out}"; CLIPPER_PATH = "${clipper.out}";

4
pkgs/development/python-modules/pyqt/4.x.nix
View File

@ -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 { buildPythonPackage rec {
pname = "PyQt-x11-gpl"; pname = "PyQt-x11-gpl";
@ -45,7 +45,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ pkg-config lndir makeWrapper qt4 ]; nativeBuildInputs = [ pkg-config lndir makeWrapper qt4 ];
buildInputs = [ qt4 dbus ]; buildInputs = [ qt4 dbus ];
propagatedBuildInputs = [ sip ]; propagatedBuildInputs = [ sip_4 ];
postInstall = '' postInstall = ''
for i in $out/bin/*; do for i in $out/bin/*; do

2
pkgs/development/python-modules/pyqt/5.x.nix
View File

@ -18,7 +18,7 @@ let
sip = if isPy3k then sip = if isPy3k then
pythonPackages.sip_5 pythonPackages.sip_5
else 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 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. # if we want to be able to import it with Python 2.
# Python 3 could rely on it being an implicit namespace package, however, # Python 3 could rely on it being an implicit namespace package, however,

4
pkgs/development/python-modules/qscintilla-qt5/default.nix
View File

@ -10,7 +10,7 @@ buildPythonPackage {
src = qscintilla.src; src = qscintilla.src;
format = "other"; format = "other";
nativeBuildInputs = [ sip qtbase ]; nativeBuildInputs = [ sip_4 qtbase ];
buildInputs = [ qscintilla ]; buildInputs = [ qscintilla ];
propagatedBuildInputs = [ pyqt5 ]; propagatedBuildInputs = [ pyqt5 ];
@ -40,7 +40,7 @@ buildPythonPackage {
--qsci-libdir=${qscintilla}/lib \ --qsci-libdir=${qscintilla}/lib \
--pyqt-sipdir=${pyqt5}/share/sip/PyQt5 \ --pyqt-sipdir=${pyqt5}/share/sip/PyQt5 \
--qsci-sipdir=$out/share/sip/PyQt5 \ --qsci-sipdir=$out/share/sip/PyQt5 \
--sip-incdir=${sip}/include --sip-incdir=${sip_4}/include
''; '';
meta = with lib; { meta = with lib; {

0
pkgs/development/python-modules/sip/default.nix → pkgs/development/python-modules/sip/4.x.nix
View File

2
pkgs/misc/drivers/hplip/3.18.5.nix
View File

@ -75,7 +75,7 @@ python2Packages.buildPythonApplication {
pygobject2 pygobject2
reportlab reportlab
usbutils usbutils
sip sip_4
] ++ lib.optionals withQt5 [ ] ++ lib.optionals withQt5 [
pyqt5 pyqt5
]; ];

2
pkgs/misc/drivers/hplip/default.nix
View File

@ -79,7 +79,7 @@ python3Packages.buildPythonApplication {
pygobject3 pygobject3
reportlab reportlab
usbutils usbutils
sip sip_4
dbus-python dbus-python
] ++ lib.optionals withQt5 [ ] ++ lib.optionals withQt5 [
pyqt5 pyqt5

2
pkgs/misc/frescobaldi/default.nix
View File

@ -12,7 +12,7 @@ buildPythonApplication rec {
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
lilypond pygame python-ly sip lilypond pygame python-ly sip_4
pyqt5 poppler-qt5 pyqt5 poppler-qt5
pyqtwebengine pyqtwebengine
]; ];

2
pkgs/top-level/python-packages.nix
View File

@ -7524,7 +7524,7 @@ in {
signify = callPackage ../development/python-modules/signify { }; signify = callPackage ../development/python-modules/signify { };
sip = callPackage ../development/python-modules/sip { }; sip_4 = callPackage ../development/python-modules/sip/4.x.nix { };
sip_5 = callPackage ../development/python-modules/sip/5.x.nix { }; sip_5 = callPackage ../development/python-modules/sip/5.x.nix { };