summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-07-25 11:51:55 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2019-07-25 11:51:55 +0200
commit3d00d8e4eebbaf41b28163aa1bcf344084b084a4 (patch)
tree70c548455ed31da834ffc4380750eb87153c6e17 /pkgs/tools
parentda6101d141ac3105c9048e73233b51dfa2bbbbc5 (diff)
downloadnixpkgs-3d00d8e4eebbaf41b28163aa1bcf344084b084a4.tar
nixpkgs-3d00d8e4eebbaf41b28163aa1bcf344084b084a4.tar.gz
nixpkgs-3d00d8e4eebbaf41b28163aa1bcf344084b084a4.tar.bz2
nixpkgs-3d00d8e4eebbaf41b28163aa1bcf344084b084a4.tar.lz
nixpkgs-3d00d8e4eebbaf41b28163aa1bcf344084b084a4.tar.xz
nixpkgs-3d00d8e4eebbaf41b28163aa1bcf344084b084a4.tar.zst
nixpkgs-3d00d8e4eebbaf41b28163aa1bcf344084b084a4.zip
pythonPackages.pyyaml_3: init , instead of multiple pyyaml overrides
Temporary attribute until we can get rid of it everywhere.

This was triggered due to the libyaml 0.2.2 incompatibilty requiring
patches and still not building.
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/admin/awscli/default.nix13
1 files changed, 1 insertions, 12 deletions
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index f8a68bc6f64..b07db447262 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -22,18 +22,7 @@ let
           sha256 = "48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1";
         };
       });
-      pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec {
-        version = "3.13";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf";
-        };
-        # https://github.com/yaml/pyyaml/issues/298#issuecomment-511990948
-        patches = lib.singleton (fetchpatch {
-          url = "https://github.com/yaml/pyyaml/commit/c5b135fe39d41cffbdc006f28ccb2032df6005e0.patch";
-          sha256 = "0x1v45rkmj194c41d1nqi3ihj9z4rsy8zvpfcd8p960g1fia7fhn";
-        });
-      });
+      pyyaml = super.pyyaml_3;
     };
   };