From 572d23eb3518814411648e5f5180b862570b744e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Jul 2026 22:09:52 +0200 Subject: [PATCH 1/5] python3Packages.stix2-patterns: 2.0.0 -> 2.1.2 Diff: https://github.com/oasis-open/cti-pattern-validator/compare/v2.0.0...v2.1.2 Changelog: https://github.com/oasis-open/cti-pattern-validator/blob/v2.1.2/CHANGELOG.rst --- .../python-modules/stix2-patterns/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/stix2-patterns/default.nix b/pkgs/development/python-modules/stix2-patterns/default.nix index a4ce839ca0dc..b7bb98217eb9 100644 --- a/pkgs/development/python-modules/stix2-patterns/default.nix +++ b/pkgs/development/python-modules/stix2-patterns/default.nix @@ -5,26 +5,24 @@ fetchFromGitHub, pytestCheckHook, setuptools, - six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "stix2-patterns"; - version = "2.0.0"; + version = "2.1.2"; pyproject = true; src = fetchFromGitHub { owner = "oasis-open"; repo = "cti-pattern-validator"; - tag = "v${version}"; - hash = "sha256-lFgnvI5a7U7/Qj4Pqjr3mx4TNDnC2/Ru7tVG7VggR7Y="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ngRxUeT8ifFM4bpFRtS1ILtTz9lPXtyD8+0MYijWKoM="; }; build-system = [ setuptools ]; dependencies = [ antlr4-python3-runtime - six ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -32,12 +30,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "stix2patterns" ]; meta = { - broken = lib.versionAtLeast antlr4-python3-runtime.version "4.10"; description = "Validate patterns used to express cyber observable content in STIX Indicators"; - mainProgram = "validate-patterns"; homepage = "https://github.com/oasis-open/cti-pattern-validator"; - changelog = "https://github.com/oasis-open/cti-pattern-validator/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/oasis-open/cti-pattern-validator/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; + mainProgram = "validate-patterns"; }; -} +}) From 926605cf30ae9e60ac479d13955ca53081f96818 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Jul 2026 22:10:31 +0200 Subject: [PATCH 2/5] python3Packages.stix2-validator: 3.2.0 -> 3.3.1 Diff: https://github.com/oasis-open/cti-stix-validator/compare/v3.2.0...v3.3.1 Changelog: https://github.com/oasis-open/cti-stix-validator/blob/refs/tags/v3.3.1/CHANGELOG --- pkgs/development/python-modules/stix2-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stix2-validator/default.nix b/pkgs/development/python-modules/stix2-validator/default.nix index c80b02763c0b..e1201244f6b1 100644 --- a/pkgs/development/python-modules/stix2-validator/default.nix +++ b/pkgs/development/python-modules/stix2-validator/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "stix2-validator"; - version = "3.2.0"; + version = "3.3.1"; pyproject = true; src = fetchFromGitHub { owner = "oasis-open"; repo = "cti-stix-validator"; tag = "v${version}"; - hash = "sha256-OI1SXILyCRGl1ZsoyYDl+/RsBhTP24eqECtW3uazS2k="; + hash = "sha256-w9SlRspt5tRLdqqEr6UJ+cmq3KM08cN9BqMvdSYay0Y="; }; build-system = [ setuptools ]; From 0f7b0b0ab3a98928acd153ab0786d8ec616d3571 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Jul 2026 22:11:40 +0200 Subject: [PATCH 3/5] python3Packages.stix2-validator: migrate to finalAttrs --- .../python-modules/stix2-validator/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/stix2-validator/default.nix b/pkgs/development/python-modules/stix2-validator/default.nix index e1201244f6b1..b8415b2d2361 100644 --- a/pkgs/development/python-modules/stix2-validator/default.nix +++ b/pkgs/development/python-modules/stix2-validator/default.nix @@ -12,7 +12,7 @@ stix2-patterns, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "stix2-validator"; version = "3.3.1"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oasis-open"; repo = "cti-stix-validator"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-w9SlRspt5tRLdqqEr6UJ+cmq3KM08cN9BqMvdSYay0Y="; }; @@ -45,8 +45,8 @@ buildPythonPackage rec { meta = { description = "Validator for STIX 2.0 JSON normative requirements and best practices"; homepage = "https://github.com/oasis-open/cti-stix-validator/"; - changelog = "https://github.com/oasis-open/cti-stix-validator/blob/${src.rev}/CHANGELOG"; + changelog = "https://github.com/oasis-open/cti-stix-validator/blob/${finalAttrs.src.tag}/CHANGELOG"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; }; -} +}) From 1e2886dfa3cb4bb44b29a2686b700bd652edefba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Jul 2026 22:13:05 +0200 Subject: [PATCH 4/5] python3Packages.stix2: 3.0.1 -> 3.0.2 Diff: https://github.com/oasis-open/cti-python-stix2/compare/v3.0.1...v3.0.2 Changelog: https://github.com/oasis-open/cti-python-stix2/blob/v3.0.2/CHANGELOG --- pkgs/development/python-modules/stix2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stix2/default.nix b/pkgs/development/python-modules/stix2/default.nix index 566aa323c98d..ad5504cf6804 100644 --- a/pkgs/development/python-modules/stix2/default.nix +++ b/pkgs/development/python-modules/stix2/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "stix2"; - version = "3.0.1"; + version = "3.0.2"; pyproject = true; src = fetchFromGitHub { owner = "oasis-open"; repo = "cti-python-stix2"; tag = "v${version}"; - hash = "sha256-1bILZUZgPOWmFWRu4p/fmgi4QPEE1lFQH9mxoWd/saI="; + hash = "sha256-qm6VFufD9A4rSBHaDkqeYqOLRvE97SY0++o4ND0l3I0="; }; build-system = [ setuptools ]; From 49c8c5e45f4bcc23f58d080f09ab6cef8a273ed0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Jul 2026 22:13:43 +0200 Subject: [PATCH 5/5] python3Packages.stix2: migrate to finalAttrs --- pkgs/development/python-modules/stix2/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/stix2/default.nix b/pkgs/development/python-modules/stix2/default.nix index ad5504cf6804..8d8b68ab6b4a 100644 --- a/pkgs/development/python-modules/stix2/default.nix +++ b/pkgs/development/python-modules/stix2/default.nix @@ -14,7 +14,7 @@ taxii2-client, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "stix2"; version = "3.0.2"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oasis-open"; repo = "cti-python-stix2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qm6VFufD9A4rSBHaDkqeYqOLRvE97SY0++o4ND0l3I0="; }; @@ -55,8 +55,8 @@ buildPythonPackage rec { meta = { description = "Produce and consume STIX 2 JSON content"; homepage = "https://stix2.readthedocs.io/en/latest/"; - changelog = "https://github.com/oasis-open/cti-python-stix2/blob/v${version}/CHANGELOG"; + changelog = "https://github.com/oasis-open/cti-python-stix2/blob/${finalAttrs.src.tag}/CHANGELOG"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ PapayaJackal ]; }; -} +})