python: remove name from some expressions

NixOS · Feb 27, 2018 · 12c71b3 · 12c71b3
1 parent d31fb80
commit 12c71b3
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 10 deletions.
diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix
@@ -2,7 +2,6 @@
 
 buildPythonPackage rec {
   pname = "cement";
-  name = "${pname}-${version}";
   version = "2.10.2";
 
   src = fetchPypi {

diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "colorama";
   version = "0.3.9";
 

diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix
@@ -1,14 +1,13 @@
-{ stdenv, buildPythonPackage, fetchurl
+{ stdenv, buildPythonPackage, fetchPypi
 , six, requests, websocket_client
 , ipaddress, backports_ssl_match_hostname, docker_pycreds
 }:
 buildPythonPackage rec {
   version = "2.7.0";
   pname = "docker";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/d/docker/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "144248308e8ea31c4863c6d74e1b55daf97cc190b61d0fe7b7313ab920d6a76c";
   };
 

diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix
@@ -3,7 +3,6 @@
 , pytest }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "requests";
   version = "2.18.4";
 

diff --git a/pkgs/development/python-modules/semantic-version/default.nix b/pkgs/development/python-modules/semantic-version/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "semantic_version";
   version = "2.6.0";
-  name = "${pname}${version}";
 
   src = fetchPypi {
     inherit pname version;

diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix
@@ -7,7 +7,6 @@
 buildPythonPackage rec {
   version = "0.8.2";
   pname = "tabulate";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
@@ -25,4 +24,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fridh ];
   };
-}
+}