From 2d56b80ce3b6f25888ff904218ec2209c545e9a3 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Sun, 14 Sep 2025 08:52:56 +0100 Subject: [PATCH] python3Packages.kaitaistruct: 0.10 -> 0.11 - Release: https://github.com/kaitai-io/kaitai_struct_python_runtime/releases/tag/v0.11 - Changes: https://github.com/kaitai-io/kaitai_struct_python_runtime/compare/0.10...v0.11 - Resolves: https://github.com/NixOS/nixpkgs/issues/442639 - Notes on `mitmproxy`: - 'mitmproxy' locks this package to v0.10. - To keep the package working, added 'kaitaistruct' to 'relaxedPythonDeps'. - The 'mitmproxy' tests still pass with this change. - Notes on patches: - The `sed` command is brittle as the line number to insert the package definition for `kaitai-compress` to can change between versions. - To make it more robust, a patch file has been added. --- .../kaitaistruct/01-add-kaitai-compress.patch | 11 +++++++++++ .../python-modules/kaitaistruct/default.nix | 7 ++++--- pkgs/development/python-modules/mitmproxy/default.nix | 1 + 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/python-modules/kaitaistruct/01-add-kaitai-compress.patch diff --git a/pkgs/development/python-modules/kaitaistruct/01-add-kaitai-compress.patch b/pkgs/development/python-modules/kaitaistruct/01-add-kaitai-compress.patch new file mode 100644 index 000000000000..30f6b90c3eda --- /dev/null +++ b/pkgs/development/python-modules/kaitaistruct/01-add-kaitai-compress.patch @@ -0,0 +1,11 @@ +diff --git a/setup.cfg b/setup.cfg +--- a/setup.cfg ++++ b/setup.cfg +@@ -30,6 +30,7 @@ classifiers = + [options] + zip_safe = True + include_package_data = True ++packages = kaitai/compress + py_modules = kaitaistruct + python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.* + install_requires = diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/pkgs/development/python-modules/kaitaistruct/default.nix index 24807eacdc00..8e677ef815fc 100644 --- a/pkgs/development/python-modules/kaitaistruct/default.nix +++ b/pkgs/development/python-modules/kaitaistruct/default.nix @@ -18,17 +18,18 @@ let in buildPythonPackage rec { pname = "kaitaistruct"; - version = "0.10"; + version = "0.11"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-oETe4pFz1q+6zye8rDna+JtlTdQYz6AJq4LZF4qa5So="; + hash = "sha256-BT7nZCiOeLjlOs90jpczJorL1Xm42CpCexgFRTYl10s="; }; + patches = [ ./01-add-kaitai-compress.patch ]; + preBuild = '' ln -s ${kaitai_compress}/python/kaitai kaitai - sed '32ipackages = kaitai/compress' -i setup.cfg ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index a3bc6a665655..79ebd184290e 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -52,6 +52,7 @@ buildPythonPackage rec { "cryptography" "flask" "h2" + "kaitaistruct" "passlib" "pyopenssl" "tornado"