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:
Anderson Torres
2021-05-16 13:31:55 -03:00
committed by GitHub
28 changed files with 113 additions and 113 deletions
@@ -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;