Unverified Commit cb208ad2 authored by Martin Weinelt's avatar Martin Weinelt
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents 86fc0532 643b9afc

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

+19 −20
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchPypi

, fetchpatch

, mock

, pyopenssl

, pytestCheckHook

, pythonOlder

, service-identity

, six

, twisted

, txi2p-tahoe

, txtorcon

}:



buildPythonPackage rec {

  pname = "foolscap";

  version = "21.7.0";

  version = "23.3.0";



  disabled = pythonOlder "3.7";



  format = "setuptools";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-6dGFU4YNk1joXXZi2c2L84JtUbTs1ICgXfv0/EU2P4Q=";

    hash = "sha256-Vu7oXC1brsgBwr2q59TAgx8j1AFRbi5mjRNIWZTbkUU=";

  };



  patches = [

    (fetchpatch {

      name = "fix-tests-with-twisted-22.10.0.patch";

      url = "https://github.com/warner/foolscap/commit/c04202eb5d4cf052e650ec2985ea6037605fd79e.patch";

      hash = "sha256-RldDc18n3WYHdYg0ZmM8PBffIuiGa1NIfdoHs3mEEfc=";

    })

  ];



  propagatedBuildInputs = [

    mock

    six

    twisted

    pyopenssl

    service-identity

  ];

  ] ++ twisted.optional-dependencies.tls;



  passthru.optional-dependencies = {

    i2p = [ txi2p-tahoe ];

    tor = [ txtorcon ];

  };



  nativeCheckInputs = [

    mock

    pytestCheckHook

  ];



  disabledTestPaths = [

    # Not all dependencies are present

    "src/foolscap/test/test_connection.py"

  ];

  ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies);



  pythonImportsCheck = [ "foolscap" ];

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

+7 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


buildPythonPackage rec {

  pname = "fritzconnection";

  version = "1.11.0";

  version = "1.12.0";

  format = "setuptools";



  disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec { 
    owner = "kbr";

    repo = pname;

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

    hash = "sha256-BHlOX5STnKaIOM5tiBZ9JHNQIYVZfIPDMuSw6DAJliA=";

    hash = "sha256-1giXmmyuy+qrY6xV3yZn4kcDd6w6l8uCL4ozcZE4N00=";

  };



  propagatedBuildInputs = [
@@ -28,6 +28,10 @@ buildPythonPackage rec { 
    pytestCheckHook

  ];



  preCheck = ''

    export HOME=$TEMP

  '';



  pythonImportsCheck = [

    "fritzconnection"

  ];
@@ -35,7 +39,7 @@ buildPythonPackage rec { 
  meta = with lib; {

    description = "Python module to communicate with the AVM Fritz!Box";

    homepage = "https://github.com/kbr/fritzconnection";

    changelog = "https://fritzconnection.readthedocs.io/en/${version}/sources/changes.html";

    changelog = "https://fritzconnection.readthedocs.io/en/${version}/sources/version_history.html";

    license = licenses.mit;

    maintainers = with maintainers; [ dotlambda valodim ];

  };

pkgs/development/python-modules/google-cloud-bigtable/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -15,14 +15,14 @@ 


buildPythonPackage rec {

  pname = "google-cloud-bigtable";

  version = "2.15.0";

  version = "2.17.0";

  format = "setuptools";



  disabled = pythonOlder "3.7";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-idnWz7o7RuOAZbY+H5STVAVa1rexThDY3Zb5eaI10Ao=";

    hash = "sha256-wysLs0seCRDadYj9aRowebq6+kMi7RZp/DITC4lqsVY=";

  };



  propagatedBuildInputs = [

pkgs/development/python-modules/google-cloud-redis/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -11,14 +11,14 @@ 


buildPythonPackage rec {

  pname = "google-cloud-redis";

  version = "2.11.1";

  version = "2.12.0";

  format = "setuptools";



  disabled = pythonOlder "3.7";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-dRavwtaU+dpRZkO49Q0Btmh2Mi/zUWbvZbImrfUkrAM=";

    hash = "sha256-0uhWndF50vKVUk71DwoInQORAiR5vQyNMMA+T2p69W4=";

  };



  propagatedBuildInputs = [

pkgs/development/python-modules/txi2p-tahoe/default.nix

0 → 100644
+50 −0
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchFromGitHub

, setuptools

, setuptools-scm

, parsley

, twisted

, python

}:



buildPythonPackage rec {

  pname = "txi2p-tahoe";

  version = "0.3.7";



  format = "pyproject";



  src = fetchFromGitHub {

    owner = "tahoe-lafs";

    repo = "txi2p";

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

    hash = "sha256-u/IOhxK9jWC/tTKKLsc4PexbCuki+yEtMNw7LuQKmuk=";

  };



  nativeBuildInputs = [

    setuptools

    setuptools-scm

  ];



  SETUPTOOLS_SCM_PRETEND_VERSION = version;



  propagatedBuildInputs = [

    parsley

    twisted

  ];



  pythonImportsCheck = [ "txi2p" ];



  checkPhase = ''

    runHook preCheck

    ${python.interpreter} -m twisted.trial txi2p

    runHook postCheck

  '';



  meta = {

    description = "I2P bindings for Twisted";

    homepage = "https://github.com/tahoe-lafs/txi2p";

    license = lib.licenses.isc;

    maintainers = with lib.maintainers; [ dotlambda ];

  };

}