From 63576fb5c33a3e7cb2d826799f17cc336bafab9a Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 12 Jun 2022 08:01:13 +1000 Subject: [PATCH] awsebcli: fixup, use python.pkgs.six from nixpkgs --- pkgs/tools/virtualization/awsebcli/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index bc4a920051a8..7c892339fede 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -29,7 +29,6 @@ let }; } ); - six = changeVersion super.six.overridePythonAttrs "1.14.0" "02lw67hprv57hyg3cfy02y3ixjk3nzwc0dx3c4ynlvkfwkfdnsr3"; wcwidth = changeVersion super.wcwidth.overridePythonAttrs "0.1.9" "1wf5ycjx8s066rdvr0fgz4xds9a8zhs91c4jzxvvymm1c8l8cwzf"; semantic-version = changeVersion super.semantic-version.overridePythonAttrs "2.8.5" "d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54"; pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { @@ -57,6 +56,11 @@ with localPython.pkgs; buildPythonApplication rec { sha256 = "sha256-W3nUXPAXoicDQNXigktR1+b/9W6qvi90fujrXAekxTU="; }; + + preConfigure = '' + substituteInPlace setup.py --replace "six>=1.11.0,<1.15.0" "six" + ''; + buildInputs = [ glibcLocales ];