Skip to content

Commit 560d82a

Browse files
aws-encryption-sdk-cli: migrate to pkgs/by-name, format with nixfmt-rfc-style
1 parent 53c7d6f commit 560d82a

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

pkgs/tools/admin/aws-encryption-sdk-cli/default.nix renamed to pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
{ lib
2-
, python3
3-
, fetchPypi
4-
, nix-update-script
5-
, testers
6-
, aws-encryption-sdk-cli
1+
{
2+
lib,
3+
aws-encryption-sdk-cli,
4+
fetchPypi,
5+
nix-update-script,
6+
python3,
7+
testers,
78
}:
89

910
let
@@ -41,8 +42,8 @@ localPython.pkgs.buildPythonApplication rec {
4142
attrs
4243
aws-encryption-sdk
4344
base64io
44-
urllib3
4545
setuptools # for pkg_resources
46+
urllib3
4647
];
4748

4849
doCheck = true;
@@ -59,7 +60,10 @@ localPython.pkgs.buildPythonApplication rec {
5960
];
6061

6162
# Upstream did not adapt to pytest 8 yet.
62-
pytestFlagsArray = [ "-W" "ignore::pytest.PytestRemovedIn8Warning" ];
63+
pytestFlagsArray = [
64+
"-W"
65+
"ignore::pytest.PytestRemovedIn8Warning"
66+
];
6367

6468
passthru = {
6569
updateScript = nix-update-script { };

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3167,8 +3167,6 @@ with pkgs;
31673167

31683168
aliyun-cli = callPackage ../tools/admin/aliyun-cli { };
31693169

3170-
aws-encryption-sdk-cli = callPackage ../tools/admin/aws-encryption-sdk-cli { };
3171-
31723170
aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator { };
31733171

31743172
awscli = callPackage ../tools/admin/awscli { };

0 commit comments

Comments
 (0)