From c86b19cb20f68e6b65af6ac884940ea125e4a8f8 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 10 Dec 2017 20:10:35 +0000 Subject: [PATCH] Python: simplify hasPythonModule --- pkgs/top-level/python-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d164b80279b..bcc1bcd7d6b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -87,12 +87,11 @@ let in fetcher (builtins.removeAttrs attrs ["format"]) ); # Check whether a derivation provides a Python module. - hasPythonModule = drv: (hasAttr "pythonModule" drv) && ( (getAttr "pythonModule" drv) == python); + hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; # Get list of required Python modules given a list of derivations. requiredPythonModules = drvs: let - removeNull = list: filter (x: !isNull x) list; - modules = filter hasPythonModule (removeNull drvs); + modules = filter hasPythonModule drvs; in unique ([python] ++ modules ++ concatLists (catAttrs "requiredPythonModules" modules)); # Create a PYTHONPATH from a list of derivations. This function recurses into the items to find derivations