summary refs log tree commit diff
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2023-10-03 20:15:24 -0400
committerGitHub <noreply@github.com>2023-10-03 20:15:24 -0400
commita280ee5731306413016b44591919a10ed5241378 (patch)
tree73b9a9f57907524ca5d0febcfa831389849364cb
parentc96a78b5a3e6736180374159cb7c8f5ad32e2c40 (diff)
parent0cefea2fb3b033e7fe6b43e04f04b29faec43794 (diff)
downloadnixpkgs-a280ee5731306413016b44591919a10ed5241378.tar
nixpkgs-a280ee5731306413016b44591919a10ed5241378.tar.gz
nixpkgs-a280ee5731306413016b44591919a10ed5241378.tar.bz2
nixpkgs-a280ee5731306413016b44591919a10ed5241378.tar.lz
nixpkgs-a280ee5731306413016b44591919a10ed5241378.tar.xz
nixpkgs-a280ee5731306413016b44591919a10ed5241378.tar.zst
nixpkgs-a280ee5731306413016b44591919a10ed5241378.zip
Merge pull request #258881 from RaitoBezarius/fix-borgbackup
borgbackup: fix build by reverting msgpack bump
-rw-r--r--pkgs/development/python-modules/msgpack/default.nix25
1 files changed, 14 insertions, 11 deletions
diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix
index f519ebb89c4..d44166b82f7 100644
--- a/pkgs/development/python-modules/msgpack/default.nix
+++ b/pkgs/development/python-modules/msgpack/default.nix
@@ -1,29 +1,26 @@
 { lib
 , buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
 , pytestCheckHook
 , pythonOlder
 , setuptools
-, cython_3
+, borgbackup
 }:
 
 buildPythonPackage rec {
   pname = "msgpack";
-  version = "1.0.7";
-  pyproject = true;
+  version = "1.0.5";
+  format = "setuptools";
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.6";
 
-  src = fetchFromGitHub {
-    owner = "msgpack";
-    repo = "msgpack-python";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-ayEyvKiTYPdhy4puUjtyGIR+jsTXd2HRINaAYxQGTZM=";
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-wHVUQoTq3Fzdxw9HVzMdmdy8FrK71ISdFfiq5M820xw=";
   };
 
   nativeBuildInputs = [
     setuptools
-    cython_3
   ];
 
   nativeCheckInputs = [
@@ -34,6 +31,12 @@ buildPythonPackage rec {
     "msgpack"
   ];
 
+  passthru.tests = {
+    # borgbackup is sensible to msgpack versions: https://github.com/borgbackup/borg/issues/3753
+    # please be mindful before bumping versions.
+    inherit borgbackup;
+  };
+
   meta = with lib;  {
     description = "MessagePack serializer implementation";
     homepage = "https://github.com/msgpack/msgpack-python";