From 90b656d6db3066fd1d64096bec1df54ecffe5c1c Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Wed, 4 Oct 2023 01:55:36 +0200 Subject: Revert "Merge pull request #256497 from NickCao/python-msgpack" This reverts commit 378fbaff985bb69424db700f0ec67aad8f83ad6f, reversing changes made to 4b786de439279a1b09b2ba3256770d71b2698835. As they caused breakage for borgbackup which is quite a ubiquitious software for backupping and stopping all updates on the nixos-unstable-small channel as it is hard to remove such software from your configuration. Thankfully, 1.0.6 and 1.0.7 changelog: https://github.com/msgpack/msgpack-python/releases/tag/v1.0.6 https://github.com/msgpack/msgpack-python/releases/tag/v1.0.7 are not security updates, this should not cause issues. --- pkgs/development/python-modules/msgpack/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix index f519ebb89c4..18287c64198 100644 --- a/pkgs/development/python-modules/msgpack/default.nix +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -1,29 +1,25 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pytestCheckHook , pythonOlder , setuptools -, cython_3 }: 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 = [ -- cgit 1.4.1 From 0cefea2fb3b033e7fe6b43e04f04b29faec43794 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Wed, 4 Oct 2023 02:08:12 +0200 Subject: python3Packages.msgpack: be mindful of borgbackup via passthru.tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Unfortunately, BorgBackup, a backupping software is very sensible to MsgPack versions to the extent of pinning patch-level versions… I believe it's not totally absurd if they do it as they seems to consider it dangerous to do otherwise. As a result, I would like to ensure that python3Packages.msgpack are gated with that piece of software ; of course, in case of security updates, we can consider extracting the patches if reasonable or just breaking all dependents. --- pkgs/development/python-modules/msgpack/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix index 18287c64198..d44166b82f7 100644 --- a/pkgs/development/python-modules/msgpack/default.nix +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -4,6 +4,7 @@ , pytestCheckHook , pythonOlder , setuptools +, borgbackup }: buildPythonPackage rec { @@ -30,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"; -- cgit 1.4.1