Merge master into staging-next

2026-07-21 08:01:31 +00:00 · 2021-03-06 06:16:57 +00:00
parent 73a617ffa9 6aa26c8623
commit 860fd89a37
71 changed files with 2342 additions and 2424 deletions
--- a/pkgs/development/python-modules/beancount/default.nix
+++ b/pkgs/development/python-modules/beancount/default.nix
@@ -6,7 +6,7 @@
 , bottle
 , chardet
 , dateutil
-, google_api_python_client
+, google-api-python-client
 , lxml
 , oauth2client
 , ply
@@ -34,7 +34,7 @@ buildPythonPackage rec {
    bottle
    chardet
    dateutil
-    google_api_python_client
+    google-api-python-client
    lxml
    oauth2client
    ply
--- a/pkgs/development/python-modules/cbor2/default.nix
+++ b/pkgs/development/python-modules/cbor2/default.nix
@@ -1,4 +1,5 @@
 { lib
+, stdenv
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
@@ -22,6 +23,12 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

+  # https://github.com/agronholm/cbor2/issues/99
+  disabledTests = lib.optionals stdenv.is32bit [
+    "test_huge_truncated_bytes"
+    "test_huge_truncated_string"
+  ];
+
  pythonImportsCheck = [ "cbor2" ];

  meta = with lib; {
--- a/pkgs/development/python-modules/cvxpy/default.nix
+++ b/pkgs/development/python-modules/cvxpy/default.nix
@@ -14,13 +14,13 @@

 buildPythonPackage rec {
  pname = "cvxpy";
-  version = "1.1.10";
+  version = "1.1.11";

  disabled = pythonOlder "3.5";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-7NCouJ95nOolSSjeqHktnGnDfbC9gwtM2mKbKyvlInA=";
+    hash = "sha256-W4qly+g07Q1iYJ76/tGZNkBPa+oavhTDUYRQ3cZ+s1I=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/descartes/default.nix
+++ b/pkgs/development/python-modules/descartes/default.nix
@@ -21,5 +21,7 @@ buildPythonPackage rec {
    homepage = "https://bitbucket.org/sgillies/descartes/";
    license = licenses.bsd3;
    maintainers = with maintainers; [ knedlsepp ];
+    # all tests are failing
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/gdrivefs/default.nix
+++ b/pkgs/development/python-modules/gdrivefs/default.nix
@@ -8,7 +8,7 @@
 , six
 , dateutil
 , fusepy
-, google_api_python_client
+, google-api-python-client
 }:

 buildPythonPackage rec {
@@ -22,7 +22,7 @@ buildPythonPackage rec {
  };

  buildInputs = [ gipc greenlet httplib2 six ];
-  propagatedBuildInputs = [ dateutil fusepy google_api_python_client ];
+  propagatedBuildInputs = [ dateutil fusepy google-api-python-client ];

  patchPhase = ''
    substituteInPlace gdrivefs/resources/requirements.txt \
--- a/pkgs/development/python-modules/goobook/default.nix
+++ b/pkgs/development/python-modules/goobook/default.nix
@@ -1,6 +1,6 @@
 { lib, buildPythonPackage, fetchPypi, isPy3k
 , docutils, installShellFiles
-, google_api_python_client, simplejson, oauth2client, setuptools, xdg
+, google-api-python-client, simplejson, oauth2client, setuptools, xdg
 }:

 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {

  nativeBuildInputs = [ docutils installShellFiles ];
  propagatedBuildInputs = [
-    google_api_python_client simplejson oauth2client setuptools xdg
+    google-api-python-client simplejson oauth2client setuptools xdg
  ];

  postInstall = ''
--- a/pkgs/development/python-modules/google-api-core/default.nix
+++ b/pkgs/development/python-modules/google-api-core/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , google-auth
-, googleapis_common_protos
+, googleapis-common-protos
 , grpcio
 , protobuf
 , pytz
@@ -23,7 +23,7 @@ buildPythonPackage rec {
  };

  propagatedBuildInputs = [
-    googleapis_common_protos
+    googleapis-common-protos
    google-auth
    grpcio
    protobuf
--- a/pkgs/development/python-modules/googleapis-common-protos/default.nix
+++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix
--- a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix
+++ b/pkgs/development/python-modules/grpc_google_iam_v1/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , grpcio
-, googleapis_common_protos
+, googleapis-common-protos
 , pytest
 }:

@@ -15,7 +15,7 @@ buildPythonPackage rec {
    sha256 = "0bfb5b56f648f457021a91c0df0db4934b6e0c300bd0f2de2333383fe958aa72";
  };

-  propagatedBuildInputs = [ grpcio googleapis_common_protos ];
+  propagatedBuildInputs = [ grpcio googleapis-common-protos ];

  # non-standard test format, and python3 will load local google folder first
  # but tests cannot be ran if google folder is removed or moved
--- a/pkgs/development/python-modules/oauthenticator/default.nix
+++ b/pkgs/development/python-modules/oauthenticator/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , pythonOlder
 , fetchPypi
-, google_api_python_client
+, google-api-python-client
 , google-auth-oauthlib
 , jupyterhub
 , mwoauth
@@ -29,7 +29,7 @@ buildPythonPackage rec {
  pytestFlagsArray = [ "oauthenticator/tests" ];

  checkInputs = [
-    google_api_python_client
+    google-api-python-client
    google-auth-oauthlib
    mwoauth
    pyjwt
--- a/pkgs/development/python-modules/proto-plus/default.nix
+++ b/pkgs/development/python-modules/proto-plus/default.nix
@@ -3,7 +3,7 @@
 , fetchPypi
 , isPy3k
 , protobuf
-, googleapis_common_protos
+, googleapis-common-protos
 , pytestCheckHook
 , pytz
 }:
@@ -20,7 +20,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [ protobuf ];

-  checkInputs = [ pytestCheckHook pytz googleapis_common_protos ];
+  checkInputs = [ pytestCheckHook pytz googleapis-common-protos ];

  pythonImportsCheck = [ "proto" ];

--- a/pkgs/development/python-modules/pydrive/default.nix
+++ b/pkgs/development/python-modules/pydrive/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, google_api_python_client
+, google-api-python-client
 , oauth2client
 , pyyaml
 }:
@@ -17,7 +17,7 @@ buildPythonPackage rec {
  };

  propagatedBuildInputs = [
-    google_api_python_client
+    google-api-python-client
    oauth2client
    pyyaml
  ];
--- a/pkgs/development/python-modules/pyopenuv/default.nix
+++ b/pkgs/development/python-modules/pyopenuv/default.nix
@@ -1,7 +1,6 @@
 { lib
 , aiohttp
 , aresponses
-, async-timeout
 , asynctest
 , buildPythonPackage
 , fetchFromGitHub
--- a/pkgs/development/python-modules/pyside/shiboken.nix
+++ b/pkgs/development/python-modules/pyside/shiboken.nix
@@ -48,11 +48,11 @@ buildPythonPackage rec {
    "-DPYTHON3_LIBRARY=${lib.getLib python}/lib"
  ];

-  meta = {
+  meta = with lib; {
    description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code";
-    license = lib.licenses.gpl2;
-    homepage = "http://www.pyside.org/docs/shiboken/";
+    license = licenses.gpl2;
+    homepage = "http://www.pyside.org/";
    maintainers = [ ];
-    platforms = lib.platforms.all;
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/python-modules/pyte/default.nix
+++ b/pkgs/development/python-modules/pyte/default.nix
@@ -1,21 +1,23 @@
-{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, wcwidth }:
+{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pytest-runner, wcwidth }:

 buildPythonPackage rec {
  pname = "pyte";
  version = "0.8.0";
+
  src = fetchPypi {
    inherit pname version;
    sha256 = "7e71d03e972d6f262cbe8704ff70039855f05ee6f7ad9d7129df9c977b5a88c5";
  };

+  nativeBuildInputs = [ pytest-runner ];
+
  propagatedBuildInputs = [ wcwidth ];

-  checkInputs = [ pytest pytestrunner ];
+  checkInputs = [ pytestCheckHook ];

-  # tries to write to os.path.dirname(__file__) in test_input_output
-  checkPhase = ''
-    py.test -k "not test_input_output"
-  '';
+  disabledTests = [
+    "test_input_output"
+  ];

  meta = with lib; {
    description = "Simple VTXXX-compatible linux terminal emulator";
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -118,7 +118,7 @@ let
 in buildPythonPackage rec {
  pname = "pytorch";
  # Don't forget to update pytorch-bin to the same version.
-  version = "1.7.1";
+  version = "1.8.0";

  disabled = !isPy3k;

@@ -133,7 +133,7 @@ in buildPythonPackage rec {
    repo   = "pytorch";
    rev    = "v${version}";
    fetchSubmodules = true;
-    sha256 = "sha256-udpbSL8xnzf20A1pYYNlYjdp8ME8AVaAkMMiw53K6CU=";
+    sha256 = "sha256-qdZUtlxHZjCYoGfTdp5Bq3MtfXolWZrvib0kuzF3uIc=";
  };

  patches = lib.optionals stdenv.isDarwin [
--- a/pkgs/development/python-modules/requests/default.nix
+++ b/pkgs/development/python-modules/requests/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
  ];

  # AttributeError: 'KeywordMapping' object has no attribute 'get'
-  doCheck = ! isPy27;
+  doCheck = !isPy27;

  disabledTests = [
    # Disable tests that require network access and use httpbin
--- a/pkgs/development/python-modules/weboob/default.nix
+++ b/pkgs/development/python-modules/weboob/default.nix
@@ -6,7 +6,7 @@
 , futures
 , gdata
 , gnupg
-, google_api_python_client
+, google-api-python-client
 , html2text
 , libyaml
 , lxml
@@ -56,7 +56,7 @@ buildPythonPackage rec {
    feedparser
    gdata
    gnupg
-    google_api_python_client
+    google-api-python-client
    html2text
    libyaml
    lxml