Unverified Commit 2c8ff18a authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 77a8486b 3c1c30ec

maintainers/maintainer-list.nix

+7 −0
Original line number Diff line number Diff line
@@ -9849,6 +9849,13 @@ 
    githubId = 725613;

    name = "Linus Arver";

  };

  linuxissuper = {

    email = "m+nix@linuxistcool.de";

    matrix = "@m:linuxistcool.de";

    github = "linuxissuper";

    githubId = 74221543;

    name = "Moritz Goltdammer";

  };

  lionello = {

    email = "lio@lunesu.com";

    github = "lionello";

pkgs/development/python-modules/aiohttp-socks/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 


buildPythonPackage rec {

  pname = "aiohttp-socks";

  version = "0.8.0";

  version = "0.8.1";



  src = fetchPypi {

    inherit version;

    pname = "aiohttp_socks";

    hash = "sha256-knsdOzR0SPhv9SRcnKGeQPOX65OQZoK+WSeQZ4yYLzc=";

    hash = "sha256-duWEJDS5Ts3EWNRZ8MJcD7buMh3FRKA+bJiO3P7QWz0=";

  };



  propagatedBuildInputs = [ aiohttp attrs python-socks ];

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

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


buildPythonPackage rec {

  pname = "casbin";

  version = "1.26.0";

  version = "1.27.0";

  format = "setuptools";



  disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec { 
    owner = pname;

    repo = "pycasbin";

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

    hash = "sha256-wM27HW5w8fDjHoGV+OGDTaO5SKJrq8fGKh1EPQt+wlo=";

    hash = "sha256-gZgaWgkvMuD7IfIy85rX3i6lZqj5WkStF0dHe+AQSJY=";

  };



  propagatedBuildInputs = [

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

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

, stdenv

, fetchFromGitHub

, buildPythonPackage

, unittestCheckHook

, cython

, setuptools

, wheel

, numpy

}:

buildPythonPackage {

  pname = "daqp";

  version = "0.5.1";

  format = "pyproject";



  src = fetchFromGitHub {

    owner = "darnstrom";

    repo = "daqp";

    rev = "5a15a3d16731d3d50f867218c1b281567db556fd";

    hash = "sha256-in7Ci/wM7i0csJ4XVfo1lboWOyfuuU+8E+TzGmMV3x0=";

  };



  sourceRoot = "source/interfaces/daqp-python";



  postPatch = ''

    sed -i 's|../../../daqp|../..|' setup.py

    sed -i 's|if src_path and os.path.exists(src_path):|if False:|' setup.py

  '';



  nativeCheckInputs = [ unittestCheckHook ];



  unittestFlagsArray = [ "-s" "test" "-p" "'*.py'" "-v" ];



  nativeBuildInputs = [

    cython

    setuptools

    wheel

  ];



  propagatedBuildInputs = [

    numpy

  ];



  pythonImportsCheck = [ "daqp" ];



  meta = with lib; {

    description = "A dual active-set algorithm for convex quadratic programming";

    homepage = "https://github.com/darnstrom/daqp";

    license = licenses.mit;

    maintainers = with maintainers; [ renesat ];

  };

}

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

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

, buildPythonPackage

, fetchFromGitHub

, pythonOlder

, pytestCheckHook

, pyfakefs

, tzlocal

, google-api-python-client

, google-auth-httplib2

, google-auth-oauthlib

, python-dateutil

, beautiful-date

}:



buildPythonPackage rec {

  pname = "gcsa";

  version = "2.1.0";

  format = "setuptools";

  disable = pythonOlder "3.6";



  src = fetchFromGitHub {

    owner = "kuzmoyev";

    repo = "google-calendar-simple-api";

    rev = "v${version}";

    hash = "sha256-Ye8mQSzgaEZx0vUpt5xiMrJTFh2AmSB7ZZlKaEj/YpM=";

  };



  propagatedBuildInputs = [

    tzlocal

    google-api-python-client

    google-auth-httplib2

    google-auth-oauthlib

    python-dateutil

    beautiful-date

  ];



  nativeCheckInputs = [ pytestCheckHook pyfakefs ];

  pythonImportsCheck = [ "gcsa" ];



  meta = with lib; {

    description = "Pythonic wrapper for the Google Calendar API";

    homepage = "https://github.com/kuzmoyev/google-calendar-simple-api";

    license = licenses.mit;

    maintainers = with maintainers; [ mbalatsko ];

  };

}