public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Python: fix botocore/boto3/awscli mess

Browse Source 
Revert "pythonPackages.boto3: 1.7.84 -> 1.8.4"

This reverts commit 06b37899300e0800e7a0ea632fcb5bf0f291e003.

Revert "python: botocore: 1.11.1 -> 1.11.4"

This reverts commit 3b0242d4c014a440b8c1c58cae812dc84496cc95.

Revert "python: botocore: 1.10.75 -> 1.11.1"

This reverts commit 996fd79967.

Revert "awscli: 1.16.1 -> 1.16.4"

This reverts commit 4880df9078bf024fd5a98afa8c6f28833e13f3d3.

Revert "awscli: 1.15.66 -> 1.16.1"

This reverts commit 6923bc8d23.

awscli: fix build

pythonPackages.botocore: 1.10.75 -> 1.10.84
This commit is contained in:
Frederik Rietdijk 2018-08-30 19:00:02 +02:00 committed by Frederik Rietdijk
parent f823ca5752
commit 32492d9189
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/boto3/default.nix
View File

@ -13,13 +13,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "boto3"; pname = "boto3";
version = "1.8.4"; version = "1.7.84";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "boto"; owner = "boto";
repo = "boto3"; repo = "boto3";
rev = version; rev = version;
sha256 = "1ja71r7xsijfy0qqqqxanhhg5fk4ad0mgvxyjg7ag0z3z04s1169"; sha256 = "0d9kqjqmnn53p1xpmdbbjxcxv2482yx3vjhxw8izp0mpq58i5c14";
}; };
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

6
pkgs/development/python-modules/botocore/default.nix
View File

@ -7,16 +7,15 @@
, simplejson , simplejson
, mock , mock
, nose , nose
, urllib3
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "botocore"; pname = "botocore";
version = "1.11.4"; version = "1.10.84";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "284f25a67fa3470314ce78a53e57df8591549652ae31dce1097acefec195b694"; sha256 = "d3e4b5a2c903ea30d19d41ea2f65d0e51dce54f4f4c4dfd6ecd7b04f240844a8";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -25,7 +24,6 @@ buildPythonPackage rec {
docutils docutils
ordereddict ordereddict
simplejson simplejson
urllib3
]; ];
checkInputs = [ mock nose ]; checkInputs = [ mock nose ];

14
pkgs/tools/admin/awscli/default.nix
View File

@ -19,11 +19,11 @@ let
in py.pkgs.buildPythonApplication rec { in py.pkgs.buildPythonApplication rec {
pname = "awscli"; pname = "awscli";
version = "1.16.4"; version = "1.15.66";
src = py.pkgs.fetchPypi { src = py.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "036cad15f7a551f3d1281b305deb04c6cf05aa3c23fa6d2bba7a0dc4eb5256de"; sha256 = "004fbd3bb8932465205675a7de94460b5c2d45ddd6916138a2c867e4d0f2a4c4";
}; };
# No tests included # No tests included
@ -42,11 +42,11 @@ in py.pkgs.buildPythonApplication rec {
less less
]; ];
# postPatch = '' postPatch = ''
# for i in {py,cfg}; do for i in {py,cfg}; do
# substituteInPlace setup.$i --replace "botocore==1.10.10" "botocore>=1.10.9,<=1.11" substituteInPlace setup.$i --replace "botocore==1.10.65" "botocore>=1.10.9,<=1.11"
# done done
# ''; '';
postInstall = '' postInstall = ''
mkdir -p $out/etc/bash_completion.d mkdir -p $out/etc/bash_completion.d