diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-24 08:10:03 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-24 08:10:03 +0200 |
| commit | afd04a49ed4d03923adf51352ce2bce1fa72455d (patch) | |
| tree | 764a50e233dd32edc1b474c4ecff6c36399ab1f8 | |
| parent | 11c140cd9e58ed805bfa3196d5d18f56a81a5e37 (diff) | |
| download | nixpkgs-afd04a49ed4d03923adf51352ce2bce1fa72455d.tar nixpkgs-afd04a49ed4d03923adf51352ce2bce1fa72455d.tar.gz nixpkgs-afd04a49ed4d03923adf51352ce2bce1fa72455d.tar.bz2 nixpkgs-afd04a49ed4d03923adf51352ce2bce1fa72455d.tar.lz nixpkgs-afd04a49ed4d03923adf51352ce2bce1fa72455d.tar.xz nixpkgs-afd04a49ed4d03923adf51352ce2bce1fa72455d.tar.zst nixpkgs-afd04a49ed4d03923adf51352ce2bce1fa72455d.zip | |
Revert "awscli: Get rid of runtime -dev dependencies"
This reverts commit c8bc18bcc21c14e3d64f4c7b8f44c36e188efc1f. Moving to staging - it's quite a large rebuild (7-8k per platform), which probably wasn't noticed; the change doesn't seem urgent.
4 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index e1465e86b0e..5c8b00fc6c1 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -19,8 +19,6 @@ buildPythonPackage rec { sha256 = "19ls7hdmcaqrrq8przqy05s8chsy8315ic2zg185k6m64pvr0qhd"; }; - outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ dateutil jmespath diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 0c227bc6377..7589d0fce73 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "f23d5cb7d862b104401d9021fc82e5fa0e0cf57b7660a1331425aab0c691d021"; }; - outputs = [ "out" "dev" ]; + foo = 1; propagatedBuildInputs = [ botocore diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index e50d90266bf..d951e436480 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -11,8 +11,6 @@ buildPythonPackage rec { sha256 = "2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4"; }; - 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/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 7e3e0c9fff0..33526ba11df 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -38,7 +38,7 @@ in py.pkgs.buildPythonApplication rec { # No tests included doCheck = false; - pythonPath = with py.pkgs; [ + propagatedBuildInputs = with py.pkgs; [ botocore bcdoc s3transfer @@ -49,10 +49,6 @@ in py.pkgs.buildPythonApplication rec { pyyaml groff less - urllib3 - dateutil - jmespath - futures ]; postInstall = '' |