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

Merge pull request #213110 from fabaff/pyswitchbee-bump 

python310Packages.pyswitchbee: 1.7.18 -> 1.7.21, python310Packages.pywerview: 0.4.1 -> 0.4.1
parents c7f45a43 c608d27e

pkgs/development/python-modules/pyswitchbee/default.nix

+4 −2
Original line number Diff line number Diff line 
{ lib

, awesomeversion

, buildPythonPackage

, aiohttp

, fetchFromGitHub
@@ -9,7 +10,7 @@ 


buildPythonPackage rec {

  pname = "pyswitchbee";

  version = "1.7.18";

  version = "1.7.21";

  format = "pyproject";



  disabled = pythonOlder "3.9";
@@ -18,7 +19,7 @@ buildPythonPackage rec { 
    owner = "jafar-atili";

    repo = "pySwitchbee";

    rev = "refs/tags/${version}";

    hash = "sha256-LQjtePFSMvZdAGH6f8CveaE7ASm/x9GuFj9s3TipYHQ=";

    hash = "sha256-3Ujs9GgdJm69vb8F00ZWaRgWXxkaPguX5DJ71bqOFec=";

  };



  nativeBuildInputs = [
@@ -27,6 +28,7 @@ buildPythonPackage rec { 


  propagatedBuildInputs = [

    aiohttp

    awesomeversion

    packaging

  ];

pkgs/development/python-modules/pywerview/default.nix

+6 −9
Original line number Diff line number Diff line
@@ -7,12 +7,13 @@ 
, ldap3

, lxml

, pyasn1

, pycryptodome

, pythonOlder

}:



buildPythonPackage rec {

  pname = "pywerview";

  version = "0.4.0";

  version = "0.4.1";

  format = "setuptools";



  disabled = pythonOlder "3.7";
@@ -20,8 +21,8 @@ buildPythonPackage rec { 
  src = fetchFromGitHub {

    owner = "the-useless-one";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-nrPhyBHW13dkXFC5YJfrkiztAxMw4KuEif0zCdjQEq0=";

    rev = "refs/tags/v${version}";

    hash = "sha256-5/Cn70qQaUp38qko1Wq+gZMCcQtcAPtZwt7Zrx8MFc4=";

  };



  propagatedBuildInputs = [
@@ -30,18 +31,13 @@ buildPythonPackage rec { 
    impacket

    ldap3

    lxml

    pycryptodome

    pyasn1

  ];



  # Module has no tests

  doCheck = false;



  postPatch = ''

    # https://github.com/the-useless-one/pywerview/pull/51

    substituteInPlace setup.py \

      --replace "bs4" "beautifulsoup4"

  '';



  pythonImportsCheck = [

    "pywerview"

  ];
@@ -49,6 +45,7 @@ buildPythonPackage rec { 
  meta = with lib; {

    description = "Module for PowerSploit's PowerView support";

    homepage = "https://github.com/the-useless-one/pywerview";

    changelog = "https://github.com/the-useless-one/pywerview/releases/tag/v${version}";

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ fab ];

  };