cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #177341 from kirillrdy/staging-next

Browse source 
awsebcli: fixup, use python.pkgs.six from nixpkgs
This commit is contained in:
Martin Weinelt 2022-06-12 00:45:12 +02:00 committed by GitHub
commit eaca6edbc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/tools/virtualization/awsebcli/default.nix
View file

@ -29,7 +29,6 @@ let
}; };
} }
); );
six = changeVersion super.six.overridePythonAttrs "1.14.0" "02lw67hprv57hyg3cfy02y3ixjk3nzwc0dx3c4ynlvkfwkfdnsr3";
wcwidth = changeVersion super.wcwidth.overridePythonAttrs "0.1.9" "1wf5ycjx8s066rdvr0fgz4xds9a8zhs91c4jzxvvymm1c8l8cwzf"; wcwidth = changeVersion super.wcwidth.overridePythonAttrs "0.1.9" "1wf5ycjx8s066rdvr0fgz4xds9a8zhs91c4jzxvvymm1c8l8cwzf";
semantic-version = changeVersion super.semantic-version.overridePythonAttrs "2.8.5" "d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54"; semantic-version = changeVersion super.semantic-version.overridePythonAttrs "2.8.5" "d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54";
pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec {
@ -57,6 +56,11 @@ with localPython.pkgs; buildPythonApplication rec {
sha256 = "sha256-W3nUXPAXoicDQNXigktR1+b/9W6qvi90fujrXAekxTU="; sha256 = "sha256-W3nUXPAXoicDQNXigktR1+b/9W6qvi90fujrXAekxTU=";
}; };
preConfigure = ''
substituteInPlace setup.py --replace "six>=1.11.0,<1.15.0" "six"
'';
buildInputs = [ buildInputs = [
glibcLocales glibcLocales
]; ];