Merge pull request #121588 from eduardosm/sip-rename

pythonPackages.sip: rename to sip_4, pythonPackages.sip_5: rename to sip
2021-05-16 13:31:55 -03:00
parent 5bf5cb1b1b e951b632f6
commit cf45c45605
28 changed files with 113 additions and 113 deletions
--- a/pkgs/misc/drivers/hplip/3.18.5.nix
+++ b/pkgs/misc/drivers/hplip/3.18.5.nix
@@ -75,7 +75,7 @@ python2Packages.buildPythonApplication {
    pygobject2
    reportlab
    usbutils
-    sip
+    sip_4
  ] ++ lib.optionals withQt5 [
    pyqt5
  ];
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -79,7 +79,7 @@ python3Packages.buildPythonApplication {
    pygobject3
    reportlab
    usbutils
-    sip
+    sip_4
    dbus-python
  ] ++ lib.optionals withQt5 [
    pyqt5
--- a/pkgs/misc/frescobaldi/default.nix
+++ b/pkgs/misc/frescobaldi/default.nix
@@ -12,7 +12,7 @@ buildPythonApplication rec {
  };

  propagatedBuildInputs = with python3Packages; [
-    lilypond pygame python-ly sip
+    lilypond pygame python-ly sip_4
    pyqt5 poppler-qt5
    pyqtwebengine
  ];