Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

python312Packages.pycfmodel: 0.22.0 -> 1.0.0, cfripper: 1.15.6 -> 1.15.7 #319487

Merged
merged 2 commits into from
Jun 13, 2024
Merged

python312Packages.pycfmodel: 0.22.0 -> 1.0.0, cfripper: 1.15.6 -> 1.15.7 #319487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f015140
python312Packages.pycfmodel: 0.22.0 -> 1.0.0
fabaff Jun 13, 2024
a2bfc20
cfripper: 1.15.6 -> 1.15.7
fabaff Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions pkgs/development/python-modules/pycfmodel/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,31 @@
pydantic,
pytestCheckHook,
pythonOlder,
pythonRelaxDepsHook,
setuptools,
}:

buildPythonPackage rec {
pname = "pycfmodel";
version = "0.22.0";
version = "1.0.0";
pyproject = true;

disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";

src = fetchFromGitHub {
owner = "Skyscanner";
repo = "pycfmodel";
rev = "refs/tags/v${version}";
hash = "sha256-NLi94W99LhrBXNFItMfJczV9EZlgvmvkavrfDQJs0YU=";
rev = "refs/tags/${version}";
hash = "sha256-iCjOSwW6rdG3H4e/B/um+QioP45nOr9OcPAwXxZs3mU=";
};

nativeBuildInputs = [ setuptools ];
pythonRelaxDeps = [ "pydantic" ];

propagatedBuildInputs = [ pydantic ];
build-system = [ setuptools ];

nativeBuildInputs = [ pythonRelaxDepsHook ];

dependencies = [ pydantic ];

nativeCheckInputs = [
httpx
Expand All @@ -39,6 +44,10 @@ buildPythonPackage rec {
"test_valid_es_domain_from_aws_documentation_examples_resource_can_be_built"
"test_valid_opensearch_domain_from_aws_documentation_examples_resource_can_be_built"
"test_resolve_booleans_different_properties_for_generic_resource"
"test_loose_ip"
"test_extra_fields_not_allowed_s3_bucket"
"test_raise_error_if_invalid_fields_in_resource"
""
];

pythonImportsCheck = [ "pycfmodel" ];
Expand All @@ -49,6 +58,5 @@ buildPythonPackage rec {
changelog = "https://github.com/Skyscanner/pycfmodel/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
broken = versionAtLeast pydantic.version "2";
};
}
26 changes: 11 additions & 15 deletions pkgs/tools/security/cfripper/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,32 @@
, python3
}:


let
python = python3.override {
packageOverrides = self: super: {
pydantic = self.pydantic_1;
};
};
in python.pkgs.buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "cfripper";
version = "1.15.6";
version = "1.15.7";
pyproject = true;

src = fetchFromGitHub {
owner = "Skyscanner";
repo = "cfripper";
rev = "refs/tags/v${version}";
hash = "sha256-h/NNTE5u1coyD4owiGjsK6SIuvDq1SQOPW4RM4yJtno=";
hash = "sha256-ymuxZwW3Pwx/CyG2iPoY7LP9e+1K6EUBi/TApg0YvkE=";
};

pythonRelaxDeps = [
"pluggy"
];

nativeBuildInputs = with python.pkgs; [
pythonRelaxDepsHook
build-system = with python3.pkgs; [
setuptools
setuptools-scm
];

propagatedBuildInputs = with python.pkgs; [
nativeBuildInputs = with python3.pkgs; [
pythonRelaxDepsHook
];

dependencies = with python3.pkgs; [
boto3
cfn-flip
click
Expand All @@ -43,7 +39,7 @@ in python.pkgs.buildPythonApplication rec {
setuptools
];

nativeCheckInputs = with python.pkgs; [
nativeCheckInputs = with python3.pkgs; [
moto
pytestCheckHook
];
Expand All @@ -65,10 +61,10 @@ in python.pkgs.buildPythonApplication rec {

meta = with lib; {
description = "Tool for analysing CloudFormation templates";
mainProgram = "cfripper";
homepage = "https://github.com/Skyscanner/cfripper";
changelog = "https://github.com/Skyscanner/cfripper/releases/tag/v${version}";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
mainProgram = "cfripper";
};
}