From 2c24a6d45a816a034898c6ae21f1347ed12ede95 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Aug 2023 21:56:38 +0200 Subject: [PATCH 1/4] python311Packages.dataclasses-json: 0.5.9 -> 0.5.14 Diff: https://github.com/lidatong/dataclasses-json/compare/refs/tags/v0.5.9...v0.5.14 Changelog: https://github.com/lidatong/dataclasses-json/releases/tag/v0.5.14 --- .../dataclasses-json/default.nix | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 661e77703bc0..eb3c9311218a 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -1,23 +1,34 @@ { lib , buildPythonPackage , fetchFromGitHub -, typing-inspect -, marshmallow-enum , hypothesis +, marshmallow-enum +, poetry-core +, poetry-dynamic-versioning , pytestCheckHook +, pythonOlder +, typing-inspect }: buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.5.9"; + version = "0.5.14"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "lidatong"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-2/J+d7SQvUs7nXw1n+qwy0DQCplK28eUrbP7+yQPB7g="; + hash = "sha256-pCvVKHh2elHaukEJNTw8MgJmoTlYjO9aVWFCQXXD13c="; }; + nativeBuildInputs = [ + poetry-core + poetry-dynamic-versioning + ]; + propagatedBuildInputs = [ typing-inspect marshmallow-enum @@ -35,11 +46,14 @@ buildPythonPackage rec { "tests/test_annotations.py" ]; - pythonImportsCheck = [ "dataclasses_json" ]; + pythonImportsCheck = [ + "dataclasses_json" + ]; meta = with lib; { description = "Simple API for encoding and decoding dataclasses to and from JSON"; homepage = "https://github.com/lidatong/dataclasses-json"; + changelog = "https://github.com/lidatong/dataclasses-json/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ albakham ]; }; From 3e11564e9512b1c66e25b59ff9e40e5a14fe4305 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Aug 2023 23:07:30 +0200 Subject: [PATCH 2/4] python311Packages.json-schema-for-humans: remove postPatch section --- .../python-modules/json-schema-for-humans/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index 40a6fed91682..972455056d37 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -30,11 +30,6 @@ buildPythonPackage rec { hash = "sha256-9dX9+YwJdJpgU3cZkxk7+CgdRFgcVhrvU0amO8zHZhs="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'pytz = "^2021.1"' 'pytz = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; From 8a011970b3099b1c4805ffa60d178050c5b7054d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Aug 2023 23:04:27 +0200 Subject: [PATCH 3/4] python311Packages.dataclasses-json: fix version handling --- pkgs/development/python-modules/dataclasses-json/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index eb3c9311218a..d9b16bcc069a 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -24,6 +24,11 @@ buildPythonPackage rec { hash = "sha256-pCvVKHh2elHaukEJNTw8MgJmoTlYjO9aVWFCQXXD13c="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0"' 'version = "${version}"' + ''; + nativeBuildInputs = [ poetry-core poetry-dynamic-versioning From 8780d5eecff5645b763e9e8c5457ac7b05d75b3d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 23 Aug 2023 19:04:33 +0200 Subject: [PATCH 4/4] sublime-music: override dataclasses-json --- pkgs/applications/audio/sublime-music/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index f93f763bc652..441ff9615498 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -27,6 +27,17 @@ let hash = "sha256-IWTo/P9JRxBQlhtcH3JMJZZrwAA8EALF4dtHajWUc4w="; }; }); + + dataclasses-json = super.dataclasses-json.overridePythonAttrs (oldAttrs: rec { + version = "0.5.7"; + src = fetchFromGitHub { + owner = "lidatong"; + repo = "dataclasses-json"; + rev = "refs/tags/v${version}"; + hash = "sha256-0tw5Lz+c4ymO+AGpG6THbiALWGBrehC84+yWWk1eafc="; + }; + nativeBuildInputs = [ python3.pkgs.setuptools ]; + }); }; }; in