Merge branch 'nixpkgs-update' into master

1 files changed, 24 insertions, 7 deletions

diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix
index 4ee4b8ecb60..7f417acd360 100644
--- a/pkgs/development/python-modules/cbor2/default.nix
+++ b/pkgs/development/python-modules/cbor2/default.nix
@@ -1,21 +1,38 @@
-{ lib, buildPythonPackage, fetchPypi, pytest, pytestcov, setuptools_scm }:
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, pytest-cov
+, setuptools-scm
+}:
 
 buildPythonPackage rec {
   pname = "cbor2";
-  version = "5.1.2";
+  version = "5.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "91759bd0ee5ef0d4fa24144dfa551670730baeca8cf2fff1cc59f734ecd21de6";
+    sha256 = "a7926f7244b08c413f1a4fa71a81aa256771c75bdf1a4fd77308547a2d63dd48";
   };
 
-  nativeBuildInputs = [ setuptools_scm ];
-  checkInputs = [ pytest pytestcov ];
+  nativeBuildInputs = [ setuptools-scm ];
 
-  checkPhase = "pytest";
+  checkInputs = [
+    pytest-cov
+    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; {
-    description = "Pure Python CBOR (de)serializer with extensive tag support";
+    description = "Python CBOR (de)serializer with extensive tag support";
     homepage = "https://github.com/agronholm/cbor2";
     license = licenses.mit;
     maintainers = with maintainers; [ taneb ];