Merge pull request #234492 from fabaff/dissect-bump

python311Packages.dissect: 3.5 -> 3.6
This commit is contained in:
Fabian Affolter 2023-06-02 01:26:21 +02:00 committed by GitHub
commit 2aa950b1df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 177 additions and 62 deletions

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-cim";
version = "3.5";
version = "3.6";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.cim";
rev = "refs/tags/${version}";
hash = "sha256-VRHnDLyHZEzeEFK+2MNQibekIlb+tsBEjUbT5tI/tIs=";
hash = "sha256-/Ze/fuWHa1Jfh63JnyJ4RvAq7HZv9CJyUGlt87YzpEs=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "dissect-clfs";
version = "1.4";
version = "1.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.clfs";
rev = "refs/tags/${version}";
hash = "sha256-/QZuet54ws0IsjHKlv2a3hqoXhY5VaQQ0jU81J46Cyg=";
hash = "sha256-utXgMVsNp78bwTBaSv5kglFfHrav5cV/YYzGCogJmtI=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -0,0 +1,83 @@
{ lib
, buildPythonPackage
, dissect-cstruct
, dissect-util
, fetchFromGitHub
, flow-record
, httpx
, lark
, pycryptodome
, pyshark
, pytest-httpserver
, pytestCheckHook
, pythonOlder
, rich
, setuptools
, setuptools-scm
}:
buildPythonPackage rec {
pname = "dissect-cobaltstrike";
version = "1.0.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.cobaltstrike";
rev = "refs/tags/v${version}";
hash = "sha256-CS50c3r7sdxp3CRS6XJ4QUmUFtmhFg6rSdKfYzJSOV4=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cstruct
dissect-util
lark
];
passthru.optional-dependencies = {
c2 = [
flow-record
httpx
pycryptodome
];
pcap = [
flow-record
httpx
pycryptodome
pyshark
];
full = [
flow-record
httpx
pycryptodome
pyshark
rich
];
};
nativeCheckInputs = [
pytest-httpserver
pytestCheckHook
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
pythonImportsCheck = [
"dissect.cobaltstrike"
];
meta = with lib; {
description = "Dissect module implementing a parser for Cobalt Strike related data";
homepage = "https://github.com/fox-it/dissect.cobaltstrike";
changelog = "https://github.com/fox-it/dissect.cobaltstrike/releases/tag/${version}";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "dissect-cstruct";
version = "3.6";
version = "3.7";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.cstruct";
rev = "refs/tags/${version}";
hash = "sha256-f6cE1x7TsjJsdACLZjsbyfnTDPXcpXqs0qBo4l+fKS4=";
hash = "sha256-K+crraBIMCtT5WsGgyxoAZ49ff7ZUHga2qYtih6w0Ug=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-esedb";
version = "3.6";
version = "3.7";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.esedb";
rev = "refs/tags/${version}";
hash = "sha256-RBU+aQbqPfF7kjt5Nc3+FnrmkTZgGyUv1HFTFP4ZgZ4=";
hash = "sha256-FQow4zuN1B6irX3ovz5K4xe6Z3PojtC9N+VLtb+UWzA=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-etl";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.etl";
rev = "refs/tags/${version}";
hash = "sha256-RNm6je3WW6ig+JCU4AlVYpAJZXq/l8U7Pbf/AGeAmXA=";
hash = "sha256-zVUe4obNhfUnI/wbxrKago/zgJcv9lzXbj1ogtIq5i4=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-eventlog";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.eventlog";
rev = "refs/tags/${version}";
hash = "sha256-dU34eEUwRGHm/S0w6rnXJmootv1trkhKlXjWcfCFB3Q=";
hash = "sha256-YSJnNT+zzsS7aKT44NFwU3AmvhbTtW6kIgNd/CbSLYY=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-evidence";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.evidence";
rev = "refs/tags/${version}";
hash = "sha256-XGS0PevalwaQX5OF/KcDhNSJMPzUOiLO5nwp/K3HHJ8=";
hash = "sha256-yJDrI4BgCXgKt4DdMyUE7Y7EzYk5utBVir6Ejm7NCDQ=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "dissect-executable";
version = "1.2";
version = "1.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.executable";
rev = "refs/tags/${version}";
hash = "sha256-I/LwIGce1bebAvjVuFE0rJAuJ/65xMTIim6M0BJR6TI=";
hash = "sha256-YGpClgRVW8l5Ln6e3RrH1RhOSuZ/A6Kfjf1plomWE9U=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-extfs";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.extfs";
rev = "refs/tags/${version}";
hash = "sha256-NSDhkkxqQSrfV1uttxUjLmdXlrgfAMrs5vSWgKyjuB4=";
hash = "sha256-JLMOW1DkLI/8+1Zx3DL0fwWKaMi8OcQMxUNE9k8zhXA=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -43,6 +43,9 @@ buildPythonPackage rec {
"dissect.extfs"
];
# Archive files seems to be corrupt
doCheck = false;
meta = with lib; {
description = "Dissect module implementing a parser for the ExtFS file system";
homepage = "https://github.com/fox-it/dissect.extfs";

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "dissect-fat";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.fat";
rev = "refs/tags/${version}";
hash = "sha256-fnppFbdI+SfGPPcSspIQnI5wH3MerGtlEbm8pe3oSBs=";
hash = "sha256-eZtAUgy8WuJXZOMwdJ9fmGA85kBN/zCjRAU+jGP06LE=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-ffs";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.ffs";
rev = "refs/tags/${version}";
hash = "sha256-A2KyXkL5SKy/iX2G6jQ2Fyx08UKVnekPICdcLhUbm3Q=";
hash = "sha256-53XYrS8JbkdjOlzb1gF3tMuWEsdVhAwy4ciCdLae8kk=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "dissect-hypervisor";
version = "3.6";
version = "3.7";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.hypervisor";
rev = "refs/tags/${version}";
hash = "sha256-6oPLl18U0TtVCkLsNN8Q4hBLArfXWWRkZI4VrFKJd9Q=";
hash = "sha256-glBmRzL5u+r668XHOZb6Lv0tSVvfQASPRUMAAJN4YHU=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-ntfs";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.ntfs";
rev = "refs/tags/${version}";
hash = "sha256-n6FPdsObzHLhhkfyxTiCDR4PpIQqRJU+QpAYtxk1Snc=";
hash = "sha256-LehPdKCM7F7SpWDz3/svhUhiM4ii0AxENX0AyIGa2aY=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "dissect-ole";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.ole";
rev = "refs/tags/${version}";
hash = "sha256-bzm9NynNUxXefWBxPIqPcRD5E52IF4on6JMtJOrvvyk=";
hash = "sha256-K+YHxxQAPmvJtsDAB/1oKdUOeUmY9LAT4/TT5bfMDQo=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-regf";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.regf";
rev = "refs/tags/${version}";
hash = "sha256-nF9vJACNPA5QQy+nWjkkAoVAVdrlzAgKq//ldWpVtlE=";
hash = "sha256-/C2MuCziHCk/O38atcYOfnpjafom5jMKSx3z2mmJKVc=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-shellitem";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.shellitem";
rev = "refs/tags/${version}";
hash = "sha256-BL1eTxL82hjsGBRK5mBNxygEzQvjN8P6/tu6KOkHf9s=";
hash = "sha256-m/RBOF7BbYZuqfljgc/lE+HpRs+6wNNiwNa1/6SXp8U=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-sql";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.sql";
rev = "refs/tags/${version}";
hash = "sha256-JrdYCqyds6opgRz2Jxu70MewN7uR+GoN6GF0HZgB1BI=";
hash = "sha256-eKhW3Z7fzIKzGiemfjluuyBjsYXIZdgvnx39BIWYObM=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "dissect-squashfs";
version = "1.1";
version = "1.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.squashfs";
rev = "refs/tags/${version}";
hash = "sha256-fcL0kPuJaole9EkrqU8Gouh3yquT2QaO8//R0ixMuP8=";
hash = "sha256-TgrtONUis0yD3s0JxJ0mNGLjEKlDgGZ+eO6NvSBTK14=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -16,6 +16,7 @@
, dissect-ntfs
, dissect-regf
, dissect-sql
, dissect-shellitem
, dissect-thumbcache
, dissect-util
, dissect-volume
@ -37,16 +38,16 @@
buildPythonPackage rec {
pname = "dissect-target";
version = "3.8";
version = "3.9";
format = "pyproject";
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.target";
rev = "refs/tags/${version}";
hash = "sha256-CPN8g6LDeS77fveFOK6gExIJq9g+5qXhwDhjw3tWuJc=";
hash = "sha256-oqBBcoqk8HFuxnJK7/01Neb7Lwb1sIM/TMgXKVCBUoc=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -80,6 +81,7 @@ buildPythonPackage rec {
dissect-extfs
dissect-fat
dissect-ffs
dissect-shellitem
dissect-sql
dissect-thumbcache
dissect-xfs

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-thumbcache";
version = "1.3";
version = "1.4";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.thumbcache";
rev = "refs/tags/${version}";
hash = "sha256-HO2s9AxDRmL4TNRYCdkYpWry3i4GNR0K9i5D2Pz3mVQ=";
hash = "sha256-9+vXnXeIvC+kfH1Mv1Vnj7mm4f+Vtso5pdblQVUgFjg=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -9,16 +9,16 @@
buildPythonPackage rec {
pname = "dissect-util";
version = "3.7";
version = "3.8";
format = "pyproject";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.util";
rev = "refs/tags/${version}";
hash = "sha256-uITIEiy4U2B0AQobvQIG/bYjelPmM8fyQduDhtC29QI=";
hash = "sha256-w2RT3tInp30IWk3CY02coJtSHdgWMravWwTK69GgSHc=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-vmfs";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.vmfs";
rev = "refs/tags/${version}";
hash = "sha256-zLQzUSJnm5DOhKKCEWX1kVEmJK0oBGKHaWucVn1HOjg=";
hash = "sha256-diCJfaR5Q3s44ZJpxZv5R0rx8aThpZzyyLn/4dqJERQ=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-volume";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.volume";
rev = "refs/tags/${version}";
hash = "sha256-7ud767/UoOAbFaH1Jx4CAaQnVDzInsKIULg/LDhb/gY=";
hash = "sha256-qEVTutZzE5pjFsQ7XZSXyWa47RRsPj0eKFukuHPYUpU=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-xfs";
version = "3.4";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.xfs";
rev = "refs/tags/${version}";
hash = "sha256-6EJyRqTOoYCqAihosAefBqRFniSkcw7pBLq16pyPntk=";
hash = "sha256-Dy7Tgp1eWROo3SGXKAl7hoaQgYOQomQjE9lnhsC7HyE=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -43,6 +43,9 @@ buildPythonPackage rec {
"dissect.xfs"
];
# Archive files seems to be corrupt
doCheck = false;
meta = with lib; {
description = "Dissect module implementing a parser for the XFS file system";
homepage = "https://github.com/fox-it/dissect.xfs";

View file

@ -2,6 +2,7 @@
, buildPythonPackage
, dissect-cim
, dissect-clfs
, dissect-cobaltstrike
, dissect-cstruct
, dissect-esedb
, dissect-etl
@ -31,7 +32,7 @@
buildPythonPackage rec {
pname = "dissect";
version = "3.5";
version = "3.6";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -40,7 +41,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect";
rev = "refs/tags/${version}";
hash = "sha256-fprB+TPwtGpRcG6pkAWHsttjxTbFmmm96DguMh7f+18=";
hash = "sha256-B/yXxkWE3hxPhOKnvuB/DAgNOvLITJJre2I8QPo4eZs=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -53,6 +54,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
dissect-cim
dissect-clfs
dissect-cobaltstrike
dissect-cstruct
dissect-esedb
dissect-etl

View file

@ -16,13 +16,15 @@
buildPythonPackage rec {
pname = "fastavro";
version = "1.7.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-IKs3uYGxiSy++tjF2XhWFrIfOo+SSl2JATUHBhCE3ZQ=";
hash = "sha256-oAOqViIBtIVYO0AN/Ug7I97QExhFaeFoNJ/7tpN/49w=";
};
preBuild = ''
@ -31,15 +33,29 @@ buildPythonPackage rec {
nativeBuildInputs = [ cython ];
passthru.optional-dependencies = {
codecs = [
lz4
python-snappy
zstandard
];
snappy = [
python-snappy
];
zstandard = [
zstandard
];
lz4 = [
lz4
];
};
nativeCheckInputs = [
lz4
numpy
pandas
pytestCheckHook
python-dateutil
python-snappy
zstandard
];
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
# Fails with "AttributeError: module 'fastavro._read_py' has no attribute
# 'CYTHON_MODULE'." Doesn't appear to be serious. See https://github.com/fastavro/fastavro/issues/112#issuecomment-387638676.
@ -53,6 +69,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Fast read/write of AVRO files";
homepage = "https://github.com/fastavro/fastavro";
changelog = "https://github.com/fastavro/fastavro/blob/${version}/ChangeLog";
license = licenses.mit;
maintainers = with maintainers; [ samuela ];
};

View file

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, elasticsearch
, fastavro
, fetchFromGitHub
, lz4
, msgpack
@ -14,16 +15,16 @@
buildPythonPackage rec {
pname = "flow-record";
version = "3.9";
version = "3.10";
format = "pyproject";
disabled = pythonOlder "3.9";
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "fox-it";
repo = "flow.record";
rev = "refs/tags/${version}";
hash = "sha256-hvd5I1n3lOuP9sUtVO69yGCVOVEWYKKfFf7OjAJCXIg=";
hash = "sha256-pOEK53+rIwzTxDEla1xoWo/xgy+eN0nxR0MeW7VQFds=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -46,11 +47,14 @@ buildPythonPackage rec {
elastic = [
elasticsearch
];
avro = [
fastavro
] ++ fastavro.optional-dependencies.snappy;
};
nativeCheckInputs = [
pytestCheckHook
];
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
pythonImportsCheck = [
"flow.record"
@ -61,7 +65,6 @@ buildPythonPackage rec {
"tests/test_rdump.py"
];
disabledTests = [
"test_rdump_fieldtype_path_json"
];

View file

@ -2557,6 +2557,8 @@ self: super: with self; {
dissect-clfs = callPackage ../development/python-modules/dissect-clfs { };
dissect-cobaltstrike = callPackage ../development/python-modules/dissect-cobaltstrike { };
dissect-cstruct = callPackage ../development/python-modules/dissect-cstruct { };
dissect-fat = callPackage ../development/python-modules/dissect-fat { };