From 5c0ea71a8115081f9b3afbdeb0f4ee3626880dea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Nov 2022 12:38:50 +0100 Subject: [PATCH 1/2] python310Packages.can: add changelog to meta --- pkgs/development/python-modules/can/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index f0b221e5adff..28dffc369720 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -15,16 +15,16 @@ }: buildPythonPackage rec { - pname = "python-can"; + pname = "can"; version = "4.0.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "hardbyte"; - repo = pname; - rev = version; + repo = "python-can"; + rev = "refs/tags/${version}"; hash = "sha256-/z7zBfVbO7x4UtzWOXolH2YrtYWgsvRLObWwz8sqOEc="; }; @@ -74,6 +74,7 @@ buildPythonPackage rec { meta = with lib; { description = "CAN support for Python"; homepage = "https://python-can.readthedocs.io"; + changelog = "https://github.com/hardbyte/python-can/releases/tag/v${version}"; license = licenses.lgpl3Only; maintainers = with maintainers; [ fab sorki ]; }; From f321f8f2b2aebd82dd52af6c0a2cb6e7678a3231 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Nov 2022 13:12:29 +0100 Subject: [PATCH 2/2] python310Packages.can: 4.0.0 -> 4.1.0 Changelog: https://github.com/hardbyte/python-can/releases/tag/v4.1.0 --- .../python-modules/can/default.nix | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index 28dffc369720..c3d36290168f 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -12,11 +12,12 @@ , pythonOlder , typing-extensions , wrapt +, uptime }: buildPythonPackage rec { pname = "can"; - version = "4.0.0"; + version = "4.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,30 +25,41 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hardbyte"; repo = "python-can"; - rev = "refs/tags/${version}"; - hash = "sha256-/z7zBfVbO7x4UtzWOXolH2YrtYWgsvRLObWwz8sqOEc="; + rev = "refs/tags/v${version}"; + hash = "sha256-jNy47SapujTF3ReJtIbwUY53IftIH4cXZjkzHrnZMFQ="; }; + postPatch = '' + substituteInPlace tox.ini \ + --replace " --cov=can --cov-config=tox.ini --cov-report=lcov --cov-report=term" "" + ''; + propagatedBuildInputs = [ msgpack packaging - pyserial typing-extensions wrapt ]; + passthru.optional-dependencies = { + serial = [ + pyserial + ]; + seeedstudio = [ + pyserial + ]; + pcan = [ + uptime + ]; + }; + checkInputs = [ future hypothesis parameterized pytest-timeout pytestCheckHook - ]; - - postPatch = '' - substituteInPlace tox.ini \ - --replace " --cov=can --cov-config=tox.ini --cov-report=xml --cov-report=term" "" - ''; + ] ++ passthru.optional-dependencies.serial; disabledTestPaths = [ # We don't support all interfaces