about summary refs log tree commit diff
path: root/nixpkgs
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-01-14 15:20:10 +0000
committerAlyssa Ross <hi@alyssa.is>2020-01-14 15:20:10 +0000
commitba5ad9d0ef6412d79564b455a89b187e68d97a1d (patch)
treeb24366881f2f9dffee752fa565e1eff87d39f603 /nixpkgs
parent37194d9b97b2caf6f1924063a60afbcb2620d57f (diff)
downloadnixlib-ba5ad9d0ef6412d79564b455a89b187e68d97a1d.tar
nixlib-ba5ad9d0ef6412d79564b455a89b187e68d97a1d.tar.gz
nixlib-ba5ad9d0ef6412d79564b455a89b187e68d97a1d.tar.bz2
nixlib-ba5ad9d0ef6412d79564b455a89b187e68d97a1d.tar.lz
nixlib-ba5ad9d0ef6412d79564b455a89b187e68d97a1d.tar.xz
nixlib-ba5ad9d0ef6412d79564b455a89b187e68d97a1d.tar.zst
nixlib-ba5ad9d0ef6412d79564b455a89b187e68d97a1d.zip
Revert "Re-revert "awscli: Get rid of runtime -dev dependencies""
This reverts commit a1eacb900e1b705678b2c199cb97baafc9b77f86.

Adding dev outputs to python packages means they can't be included in
a Python environment created with python3.withPackages, because
makePythonPath will include the dev output, which is empty apart from
nix-support, rather than the out output, which contains all the Python
code.
Diffstat (limited to 'nixpkgs')
-rw-r--r--nixpkgs/pkgs/development/python-modules/botocore/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/s3transfer/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/urllib3/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/admin/awscli/default.nix3
4 files changed, 1 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/nixpkgs/pkgs/development/python-modules/botocore/default.nix
index 50504257c64e..a03e3d9f5f41 100644
--- a/nixpkgs/pkgs/development/python-modules/botocore/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/botocore/default.nix
@@ -19,8 +19,6 @@ buildPythonPackage rec {
     sha256 = "8223485841ef4731a5d4943a733295ba69d0005c4ae64c468308cc07f6960d39";
   };
 
-  outputs = [ "out" "dev" ];
-
   propagatedBuildInputs = [
     dateutil
     jmespath
diff --git a/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix b/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix
index 3020ab68ec76..2c99b4d291df 100644
--- a/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     sha256 = "6efc926738a3cd576c2a79725fed9afde92378aa5c6a957e3af010cb019fac9d";
   };
 
-  outputs = [ "out" "dev" ];
+  foo = 1;
 
   propagatedBuildInputs =
     [ botocore
diff --git a/nixpkgs/pkgs/development/python-modules/urllib3/default.nix b/nixpkgs/pkgs/development/python-modules/urllib3/default.nix
index 0c8c97925a7b..9e28647fd016 100644
--- a/nixpkgs/pkgs/development/python-modules/urllib3/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/urllib3/default.nix
@@ -11,8 +11,6 @@ buildPythonPackage rec {
     sha256 = "f3c5fd51747d450d4dcf6f923c81f78f811aab8205fda64b0aba34a4e48b0745";
   };
 
-  outputs = [ "out" "dev" ];
-
   NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [
     "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout"
     "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event"
diff --git a/nixpkgs/pkgs/tools/admin/awscli/default.nix b/nixpkgs/pkgs/tools/admin/awscli/default.nix
index f38d4cd1a1d6..06ddd0e85896 100644
--- a/nixpkgs/pkgs/tools/admin/awscli/default.nix
+++ b/nixpkgs/pkgs/tools/admin/awscli/default.nix
@@ -57,9 +57,6 @@ in py.pkgs.buildPythonApplication rec {
     pyyaml
     groff
     less
-    urllib3
-    dateutil
-    jmespath
   ];
 
   postInstall = ''