From 16d5af58eff74fed13cf504ed5c7ad9c5a95bfd4 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Tue, 23 May 2023 17:46:37 +0200 Subject: [PATCH] inkcut: prepare for python 3.11 As 'python3' is scheduled to start pointing to that somewhere in June. The dependency on 'sip' was changed to 08a26e45796e456278d75201fadb2498fe08dd7d out of caution, but it seems to work fine with the new default sip. --- pkgs/applications/misc/inkcut/default.nix | 8 +++----- pkgs/development/python-modules/enaml/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/inkcut/default.nix b/pkgs/applications/misc/inkcut/default.nix index b8833a8e4b1c..ce415b85ce79 100644 --- a/pkgs/applications/misc/inkcut/default.nix +++ b/pkgs/applications/misc/inkcut/default.nix @@ -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 diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix index e46361adb1e0..542c4907a1d4 100644 --- a/pkgs/development/python-modules/enaml/default.nix +++ b/pkgs/development/python-modules/enaml/default.nix @@ -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