From ced21f5e1a1479e3b6ae5c218818790596f5a16f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 23 Jun 2018 15:27:58 +0200 Subject: pythonPackages: remove `name` attribute` The `buildPython*` function computes name from `pname` and `version`. This change removes `name` attribute from all expressions in `pkgs/development/python-modules`. While at it, some other minor changes were made as well, such as replacing `fetchurl` calls with `fetchPypi`. --- pkgs/top-level/python-packages.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 673b22c401cd..232f51f7dcb2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -149,7 +149,6 @@ in { setuptools = toPythonModule (callPackage ../development/python-modules/setuptools { }); vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { - pythonPackages = self; boost = pkgs.boost160; }; @@ -363,7 +362,7 @@ in { pydocstyle = callPackage ../development/python-modules/pydocstyle { }; - pyexiv2 = disabledIf isPy3k (callPackage ../development/python-modules/pyexiv2 {}); + pyexiv2 = disabledIf isPy3k (toPythonModule (callPackage ../development/python-modules/pyexiv2 {})); py3exiv2 = callPackage ../development/python-modules/py3exiv2 { }; @@ -6909,7 +6908,7 @@ in { keyring = callPackage ../development/python-modules/keyring { }; - keyutils = callPackage ../development/python-modules/keyutils { }; + keyutils = callPackage ../development/python-modules/keyutils { inherit (pkgs) keyutils; }; kiwisolver = callPackage ../development/python-modules/kiwisolver { }; @@ -11255,7 +11254,7 @@ in { pyls-isort = callPackage ../development/python-modules/pyls-isort {}; pyudev = callPackage ../development/python-modules/pyudev { - inherit (pkgs) fetchurl systemd; + inherit (pkgs) systemd; }; pynmea2 = callPackage ../development/python-modules/pynmea2 {}; -- cgit 1.4.1