about summary refs log tree commit diff
path: root/pkgs/top-level/python-packages.nix
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-06-23 15:27:58 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-06-23 18:14:26 +0200
commitced21f5e1a1479e3b6ae5c218818790596f5a16f (patch)
tree41b23b3b4535b9755269e083f11969b3bfd40990 /pkgs/top-level/python-packages.nix
parent8cfa9cc66c37fbb8a95cf6dbf2a4279bf9e32e08 (diff)
downloadnixlib-ced21f5e1a1479e3b6ae5c218818790596f5a16f.tar
nixlib-ced21f5e1a1479e3b6ae5c218818790596f5a16f.tar.gz
nixlib-ced21f5e1a1479e3b6ae5c218818790596f5a16f.tar.bz2
nixlib-ced21f5e1a1479e3b6ae5c218818790596f5a16f.tar.lz
nixlib-ced21f5e1a1479e3b6ae5c218818790596f5a16f.tar.xz
nixlib-ced21f5e1a1479e3b6ae5c218818790596f5a16f.tar.zst
nixlib-ced21f5e1a1479e3b6ae5c218818790596f5a16f.zip
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`.
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
-rw-r--r--pkgs/top-level/python-packages.nix7
1 files changed, 3 insertions, 4 deletions
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 {};