Merge pull request #35380 from eqyiel/awsebcli-cleanup

awsebcli: clean up derivation

7 files changed, 16 insertions, 40 deletions

diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix
index 3fbdb500af80..36cc20e027bb 100644
--- 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
index 99a59ae8fd43..bce14db7704f 100644
--- 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
index 4ce013ac7976..bb39ccd7cf6e 100644
--- 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
index f3ff4a84f1e8..aeca2abf17cf 100644
--- 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
index f9e04691c1cb..e3c92a0e40fc 100644
--- 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
index db7f43c1ea46..b238d58f68d3 100644
--- 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 ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix
index f380b62e6a49..3b3bda0f22dc 100644
--- a/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/pkgs/tools/virtualization/awsebcli/default.nix
@@ -2,12 +2,10 @@
 let
 
   localPython = python.override {
-    packageOverrides = self: super: rec {
+    packageOverrides = self: super: {
       cement = super.cement.overridePythonAttrs (oldAttrs: rec {
         version = "2.8.2";
-
-        src = super.fetchPypi {
-          inherit (oldAttrs) pname;
+        src = oldAttrs.src.override {
           inherit version;
           sha256 = "1li2whjzfhbpg6fjb6r1r92fb3967p1xv6hqs3j787865h2ysrc7";
         };
@@ -15,30 +13,15 @@ let
 
       colorama = super.colorama.overridePythonAttrs (oldAttrs: rec {
         version = "0.3.7";
-
-        src = super.fetchPypi {
-          inherit (oldAttrs) pname;
+        src = oldAttrs.src.override {
           inherit version;
           sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0";
         };
       });
 
-      docker = super.docker.overridePythonAttrs (oldAttrs: rec {
-          pname = "docker-py";
-          version = "1.7.2";
-          name = "${pname}-${version}";
-
-          src = super.fetchPypi {
-            inherit pname version;
-            sha256 = "0k6hm3vmqh1d3wr9rryyif5n4rzvcffdlb1k4jvzp7g4996d3ccm";
-          };
-        });
-
       requests = super.requests.overridePythonAttrs (oldAttrs: rec {
         version = "2.9.1";
-
-        src = super.fetchPypi {
-          inherit (oldAttrs) pname;
+        src = oldAttrs.src.override {
           inherit version;
           sha256 = "0zsqrzlybf25xscgi7ja4s48y2abf9wvjkn47wh984qgs1fq2xy5";
         };
@@ -46,18 +29,15 @@ let
 
       semantic-version = super.semantic-version.overridePythonAttrs (oldAttrs: rec {
         version = "2.5.0";
-
-        src = super.fetchPypi {
-          inherit (oldAttrs) pname; inherit version;
+        src = oldAttrs.src.override {
+          inherit version;
           sha256 = "0p5n3d6blgkncxdz00yxqav0cis87fisdkirjm0ljjh7rdfx7aiv";
         };
       });
 
       tabulate = super.tabulate.overridePythonAttrs (oldAttrs: rec {
         version = "0.7.5";
-
-        src = super.fetchPypi {
-          inherit (oldAttrs) pname;
+        src = oldAttrs.src.override {
           inherit version;
           sha256 = "03l1r7ddd1a0j2snv1yd0hlnghjad3fg1an1jr8936ksv75slwch";
         };
@@ -65,7 +45,6 @@ let
     };
   };
 in with localPython.pkgs; buildPythonApplication rec {
-  name = "${pname}-${version}";
   pname = "awsebcli";
   version = "3.12.3";
 
@@ -81,7 +60,10 @@ in with localPython.pkgs; buildPythonApplication rec {
   doCheck = false;
 
   propagatedBuildInputs = [
-    blessed botocore cement colorama docker dockerpty docopt pathspec pyyaml
+    # FIXME: Add optional docker dependency, which requires requests >= 2.14.2.
+    # Otherwise, awsebcli will try to install it using pip when using some
+    # commands (like "eb local run").
+    blessed botocore cement colorama dockerpty docopt pathspec pyyaml
     requests semantic-version setuptools tabulate termcolor websocket_client
   ];
 
@@ -92,7 +74,7 @@ in with localPython.pkgs; buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     homepage = https://aws.amazon.com/elasticbeanstalk/;
-    description = "A command line interface for Elastic Beanstalk.";
+    description = "A command line interface for Elastic Beanstalk";
     maintainers = with maintainers; [ eqyiel ];
     license = licenses.asl20;
   };