summary refs log tree commit diff
path: root/pkgs/development/python-modules/nbxmpp
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/development/python-modules/nbxmpp
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/development/python-modules/nbxmpp')
-rw-r--r--pkgs/development/python-modules/nbxmpp/default.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix
index e45c69aa3954..696796740f8b 100644
--- a/pkgs/development/python-modules/nbxmpp/default.nix
+++ b/pkgs/development/python-modules/nbxmpp/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, buildPythonPackage, fetchzip, pyopenssl }:
+{ stdenv, buildPythonPackage, fetchzip, pyopenssl, python }:
 
-buildPythonPackage rec {
+let
   pname = "nbxmpp";
   version = "0.6.6";
   name = "${pname}-${version}";
-
+in buildPythonPackage rec {
+  inherit pname version;
   # Tests aren't included in PyPI tarball.
   src = fetchzip {
     name = "${name}.tar.bz2";
@@ -18,7 +19,7 @@ buildPythonPackage rec {
   checkPhase = ''
     # Disable tests requiring networking
     echo "" > test/unit/test_xmpp_transports_nb2.py
-    python test/runtests.py
+    ${python.executable} test/runtests.py
   '';
 
   meta = with stdenv.lib; {