From 3269966314c0fdf99b8a14eabd797743509409e6 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:18:34 +0200 Subject: [PATCH] setools: remove 'with lib;' --- pkgs/os-specific/linux/setools/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 5a2f180a0ad9..7442815f3a7d 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -3,10 +3,7 @@ , withGraphics ? false }: -with lib; -with python3.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "setools"; version = "4.5.1"; @@ -17,12 +14,12 @@ buildPythonApplication rec { hash = "sha256-/6dOzSz2Do4d6TSS50fuak0CysoQ532zJ0bJ532BUCE="; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ python3.pkgs.cython ]; buildInputs = [ libsepol ]; - propagatedBuildInputs = [ enum34 libselinux networkx setuptools ] - ++ optionals withGraphics [ pyqt5 ]; + propagatedBuildInputs = with python3.pkgs; [ enum34 libselinux networkx setuptools ] + ++ lib.optionals withGraphics [ pyqt5 ]; - nativeCheckInputs = [ tox checkpolicy ]; + nativeCheckInputs = [ python3.pkgs.tox checkpolicy ]; preCheck = '' export CHECKPOLICY=${checkpolicy}/bin/checkpolicy ''; @@ -33,7 +30,7 @@ buildPythonApplication rec { export SEPOL="${lib.getLib libsepol}/lib/libsepol.a" ''; - meta = { + meta = with lib; { description = "SELinux Policy Analysis Tools"; homepage = "https://github.com/SELinuxProject/setools"; license = licenses.gpl2Only;