Author: eelco Date: Fri Oct 21 15:01:40 2011 New Revision: 29956 URL: https://nixos.org/websvn/nix/?rev=29956&sc=1
Log: * Applied a patch to get Euca2ools / Boto to work on Python 2.7. Added: nixpkgs/trunk/pkgs/development/python-modules/boto-1.9-python-2.7.patch Modified: nixpkgs/trunk/pkgs/top-level/python-packages.nix Added: nixpkgs/trunk/pkgs/development/python-modules/boto-1.9-python-2.7.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/development/python-modules/boto-1.9-python-2.7.patch Fri Oct 21 15:01:40 2011 (r29956) @@ -0,0 +1,19 @@ +Fix Boto 1.9 on Python 2.7. + +https://github.com/boto/boto/commit/6760075073c34d6dddb7e13b80dfa8d09f0f4f79 + +diff --git a/boto/connection.py b/boto/connection.py +index c5779e2..71942f1 100644 +--- a/boto/connection.py ++++ b/boto/connection.py +@@ -252,8 +252,9 @@ class AWSAuthConnection(object): + # versions, it would append ":443" to the hostname sent + # in the Host header and so we needed to make sure we + # did the same when calculating the V2 signature. In 2.6 ++ # (and higher!) + # it no longer does that. Hence, this kludge. +- if sys.version[:3] == "2.6" and port == 443: ++ if sys.version[:3] in ('2.6', '2.7') and port == 443: + signature_host = self.host + else: + signature_host = '%s:%d' % (self.host, port) Modified: nixpkgs/trunk/pkgs/top-level/python-packages.nix ============================================================================== --- nixpkgs/trunk/pkgs/top-level/python-packages.nix Fri Oct 21 14:43:18 2011 (r29955) +++ nixpkgs/trunk/pkgs/top-level/python-packages.nix Fri Oct 21 15:01:40 2011 (r29956) @@ -156,6 +156,8 @@ sha1 = "00a033b0a593c3ca82927867950f73d88b831155"; }; + patches = [ ../development/python-modules/boto-1.9-python-2.7.patch ]; + meta = { homepage = http://code.google.com/p/boto/; _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
