BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #262053 from fabaff/aws-adfs-bump

Browse source 
python311Packages.aws-adfs: 2.2.1 -> 2.8.1
This commit is contained in:
Fabian Affolter 2023-10-19 20:46:10 +02:00 committed by GitHub
commit c22e3f408a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/development/python-modules/aws-adfs/default.nix
View file

@ -5,7 +5,6 @@
, click , click
, configparser , configparser
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, fido2 , fido2
, lxml , lxml
, poetry-core , poetry-core
@ -19,16 +18,16 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aws-adfs"; pname = "aws-adfs";
version = "2.2.1"; version = "2.8.1";
format = "pyproject"; pyproject = true;
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "venth"; owner = "venth";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/v${version}";
hash = "sha256-REJYuOGq22onMj4WcfA7i4/cG99UGZA9D99ESIKY1A8="; hash = "sha256-tpCDP924lNSaPJggj3A94U2Ur+TgxTXtV660OyQJEeY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -47,20 +46,6 @@ buildPythonPackage rec {
requests-kerberos requests-kerberos
]; ];
patches = [
# Apply new fido2 api (See: venth/aws-adfs#243)
(fetchpatch {
url = "https://github.com/venth/aws-adfs/commit/09836d89256f3537270d760d8aa30ab9284725a8.diff";
hash = "sha256-pAAJvOa43BXtyWvV8hsLe2xqd5oI+vzndckRTRol61s=";
})
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'boto3 = "^1.20.50"' 'boto3 = "*"' \
--replace 'botocore = ">=1.12.6"' 'botocore = "*"'
'';
nativeCheckInputs = [ nativeCheckInputs = [
pytestCheckHook pytestCheckHook
toml toml
@ -77,6 +62,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Command line tool to ease AWS CLI authentication against ADFS"; description = "Command line tool to ease AWS CLI authentication against ADFS";
homepage = "https://github.com/venth/aws-adfs"; homepage = "https://github.com/venth/aws-adfs";
changelog = "https://github.com/venth/aws-adfs/releases/tag/v${version}";
license = licenses.psfl; license = licenses.psfl;
maintainers = with maintainers; [ bhipple ]; maintainers = with maintainers; [ bhipple ];
}; };