Merge pull request #233639 from raboof/inkcut-prepare-for-python311

inkcut: prepare for python 3.11
2023-05-25 23:30:58 +03:00
parent 3e63608c7b 16d5af58ef
commit 624fe91a15
2 changed files with 5 additions and 7 deletions
@@ -1,14 +1,12 @@
 { lib
 , fetchpatch
-, python3Packages
+, python3
 , fetchFromGitHub
 , wrapQtAppsHook
 , cups
 }:

-with python3Packages;
-
-buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
  pname = "inkcut";
  version = "2.1.5";

@@ -48,7 +46,7 @@ buildPythonApplication rec {

  nativeBuildInputs = [ wrapQtAppsHook ];

-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3.pkgs; [
    enamlx
    twisted
    lxml
@@ -11,7 +11,7 @@
 , setuptools
 , setuptools-scm
 , pythonOlder
-, sip_4
+, sip
 }:

 buildPythonPackage rec {
@@ -43,7 +43,7 @@ buildPythonPackage rec {
    pegen
    ply
    qtpy
-    sip_4
+    sip
  ];

  # qt bindings cannot be found during tests