summary refs log tree commit diff
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2015-11-10 08:35:46 +0100
committerDomen Kožar <domen@dev.si>2015-11-10 08:35:46 +0100
commit79fbb8ea36fafcd588f9ae4160d1b478e6133ffb (patch)
treeacf57feab7bbc440a8b66fb7b7e1c410906db8b3
parentff4d8513b435cbb9858a6e714f5e50e0d9ae069a (diff)
parent21488c6e60882db7f4de5f874833e53a2b1cf7e1 (diff)
downloadnixpkgs-79fbb8ea36fafcd588f9ae4160d1b478e6133ffb.tar
nixpkgs-79fbb8ea36fafcd588f9ae4160d1b478e6133ffb.tar.gz
nixpkgs-79fbb8ea36fafcd588f9ae4160d1b478e6133ffb.tar.bz2
nixpkgs-79fbb8ea36fafcd588f9ae4160d1b478e6133ffb.tar.lz
nixpkgs-79fbb8ea36fafcd588f9ae4160d1b478e6133ffb.tar.xz
nixpkgs-79fbb8ea36fafcd588f9ae4160d1b478e6133ffb.tar.zst
nixpkgs-79fbb8ea36fafcd588f9ae4160d1b478e6133ffb.zip
Merge pull request #10929 from samuelrivas/boto-core-upgrade
botocore: 1.1.10 -> 1.2.0
-rw-r--r--pkgs/tools/admin/awscli/default.nix2
-rw-r--r--pkgs/top-level/python-packages.nix27
2 files changed, 28 insertions, 1 deletions
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index 06c9b85b8d6..c4de8090e05 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -13,7 +13,7 @@ pythonPackages.buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    pythonPackages.botocore
+    pythonPackages.botocore_1_1_10
     pythonPackages.bcdoc
     pythonPackages.six
     pythonPackages.colorama
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d267621b0d8..00868989dab 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1621,6 +1621,33 @@ let
   };
 
   botocore = buildPythonPackage rec {
+    version = "1.2.0";
+    name = "botocore-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz";
+      sha256 = "0wj98fsiwqzy0i0zh86fx15sgdjkwqi6crxig6b4kvrckl8bkwjr";
+    };
+
+    propagatedBuildInputs =
+      [ self.dateutil
+        self.requests
+        self.jmespath
+      ];
+
+    buildInputs = [ self.docutils ];
+
+    meta = {
+      homepage = https://github.com/boto/botocore;
+
+      license = "bsd";
+
+      description = "A low-level interface to a growing number of Amazon Web Services";
+
+    };
+  };
+
+  botocore_1_1_10 = buildPythonPackage rec {
     version = "1.1.10";
     name = "botocore-${version}";