Unverified Commit 2aa950b1 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #234492 from fabaff/dissect-bump 

python311Packages.dissect: 3.5 -> 3.6
parents 3efe2c1a eba43ed0

pkgs/development/python-modules/dissect-cim/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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;

pkgs/development/python-modules/dissect-clfs/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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;

pkgs/development/python-modules/dissect-cobaltstrike/default.nix

0 → 100644
+83 −0
Original line number Diff line number Diff line 
{ 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 ];

  };

}

pkgs/development/python-modules/dissect-cstruct/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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;

pkgs/development/python-modules/dissect-esedb/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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;