pyrox.dev
Merge staging-next into staging
authored by
github-actions[bot]
and committed by
GitHub
fec8555f
a97320ef
+27
-6
pkgs/applications/misc/nimbo/default.nix
+27
-6
pkgs/applications/misc/nimbo/default.nix
···
1
-
{ lib, setuptools, boto3, requests, click, pyyaml, pydantic
2
-
, buildPythonApplication, pythonOlder, installShellFiles, fetchFromGitHub
3
-
, awscli }:
4
5
-
buildPythonApplication rec {
6
pname = "nimbo";
7
version = "0.2.4";
8
-
disabled = pythonOlder "3.6";
9
10
src = fetchFromGitHub {
11
owner = "nimbo-sh";
···
13
rev = "v${version}";
14
sha256 = "1fs28s9ynfxrb4rzba6cmik0kl0q0vkpb4zdappsq62jqf960k24";
15
};
16
nativeBuildInputs = [ installShellFiles ];
17
-
propagatedBuildInputs = [ setuptools boto3 awscli requests click pyyaml pydantic ];
18
19
# nimbo tests require an AWS instance
20
doCheck = false;
21
pythonImportsCheck = [ "nimbo" ];
22
23
postInstall = ''
24
installShellCompletion --cmd nimbo \
···
1
+
{ lib
2
+
, python3
3
+
, fetchFromGitHub
4
+
, installShellFiles
5
+
, awscli
6
+
}:
7
8
+
python3.pkgs.buildPythonApplication rec {
9
pname = "nimbo";
10
version = "0.2.4";
11
+
disabled = python3.pythonOlder "3.6";
12
13
src = fetchFromGitHub {
14
owner = "nimbo-sh";
···
16
rev = "v${version}";
17
sha256 = "1fs28s9ynfxrb4rzba6cmik0kl0q0vkpb4zdappsq62jqf960k24";
18
};
19
+
20
+
postPatch = ''
21
+
substituteInPlace setup.py \
22
+
--replace "awscli>=1.19<2.0" ""
23
+
'';
24
+
25
nativeBuildInputs = [ installShellFiles ];
26
+
27
+
propagatedBuildInputs = with python3.pkgs; [
28
+
setuptools
29
+
boto3
30
+
requests
31
+
click
32
+
pyyaml
33
+
pydantic
34
+
];
35
36
# nimbo tests require an AWS instance
37
doCheck = false;
38
pythonImportsCheck = [ "nimbo" ];
39
+
40
+
makeWrapperArgs = [
41
+
"--prefix" "PATH" ":" (lib.makeBinPath [ awscli ])
42
+
];
43
44
postInstall = ''
45
installShellCompletion --cmd nimbo \
+17
-2
pkgs/tools/admin/awscli/default.nix
+17
-2
pkgs/tools/admin/awscli/default.nix
···
1
{ lib
2
, python3
3
, groff
4
, less
5
}:
···
14
sha256 = "189n8hpijy14jfan4ha9f5n06mnl33cxz7ay92wjqgkr639s0vg9";
15
};
16
});
17
};
18
};
19
20
in
21
with py.pkgs; buildPythonApplication rec {
22
pname = "awscli";
23
-
version = "1.22.14"; # N.B: if you change this, change botocore and boto3 to a matching version too
24
25
src = fetchPypi {
26
inherit pname version;
27
-
sha256 = "sha256-FTGtUqdjZel8XqSrO3s3XQNqR6fyTO3mc1gyIQfk9n8=";
28
};
29
30
# https://github.com/aws/aws-cli/issues/4837
···
1
{ lib
2
, python3
3
+
, fetchFromGitHub
4
, groff
5
, less
6
}:
···
15
sha256 = "189n8hpijy14jfan4ha9f5n06mnl33cxz7ay92wjqgkr639s0vg9";
16
};
17
});
18
+
pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec {
19
+
version = "5.4.1";
20
+
src = fetchFromGitHub {
21
+
owner = "yaml";
22
+
repo = "pyyaml";
23
+
rev = version;
24
+
hash = "sha256-VUqnlOF/8zSOqh6JoEYOsfQ0P4g+eYqxyFTywgCS7gM=";
25
+
};
26
+
checkPhase = ''
27
+
runHook preCheck
28
+
PYTHONPATH="tests/lib3:$PYTHONPATH" ${self.python.interpreter} -m test_all
29
+
runHook postCheck
30
+
'';
31
+
});
32
};
33
};
34
35
in
36
with py.pkgs; buildPythonApplication rec {
37
pname = "awscli";
38
+
version = "1.22.21"; # N.B: if you change this, change botocore and boto3 to a matching version too
39
40
src = fetchPypi {
41
inherit pname version;
42
+
hash = "sha256-yzfy6MjXC6LeydLNVXQvcK4UmpVQP/jJ+W2jMgpNMgw=";
43
};
44
45
# https://github.com/aws/aws-cli/issues/4837