From 6cd4937bf5bb0ba92bb5a5300b67d522d825d092 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 20 Dec 2024 15:46:06 +0100 Subject: [PATCH 1/2] python312Packages.pytorch-lightning: 2.4.0 -> 2.5.0.post0 Diff: https://github.com/Lightning-AI/pytorch-lightning/compare/refs/tags/2.4.0...2.5.0.post0 Changelog: https://github.com/Lightning-AI/pytorch-lightning/releases/tag/2.5.0 --- .../python-modules/pytorch-lightning/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index b23ea7188d10..0ba5f707f355 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.4.0"; + version = "2.5.0.post0"; pyproject = true; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; - rev = "refs/tags/${version}"; - hash = "sha256-FngD3nYTGVEjS1VrXAVps2/B8VlS7BZMDAsmIDtAyW0="; + tag = version; + hash = "sha256-TkwDncyfv1VoV/IErUgF4p0Or5PJbwKoABqo1xXGLVg="; }; preConfigure = '' @@ -68,7 +68,7 @@ buildPythonPackage rec { meta = { description = "Lightweight PyTorch wrapper for machine learning researchers"; homepage = "https://github.com/Lightning-AI/pytorch-lightning"; - changelog = "https://github.com/Lightning-AI/pytorch-lightning/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; + changelog = "https://github.com/Lightning-AI/pytorch-lightning/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ tbenst ]; }; From e8931b35265851e294cbab0a529f9930c16392b2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 20 Dec 2024 18:27:04 +0100 Subject: [PATCH 2/2] python312Packages.finetuning-scheduler: 2.4.0 -> 2.5.0 Diff: https://github.com/speediedan/finetuning-scheduler/compare/v2.4.0...v2.5.0 Changelog: https://github.com/speediedan/finetuning-scheduler/releases/tag/v2.5.0 --- .../finetuning-scheduler/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/finetuning-scheduler/default.nix b/pkgs/development/python-modules/finetuning-scheduler/default.nix index 808c8e1ab696..35a5a3cbe02c 100644 --- a/pkgs/development/python-modules/finetuning-scheduler/default.nix +++ b/pkgs/development/python-modules/finetuning-scheduler/default.nix @@ -12,20 +12,22 @@ buildPythonPackage rec { pname = "finetuning-scheduler"; - version = "2.4.0"; + version = "2.5.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "speediedan"; repo = "finetuning-scheduler"; - rev = "refs/tags/v${version}"; - hash = "sha256-uSFGZseSJv519LpaddO6yP6AsIMZutEA0Y7Yr+mEWTQ="; + tag = "v${version}"; + hash = "sha256-neeSATQwAaYN1QGBUXphqqJp9lP3HG2OH4aLdt1cOho="; }; build-system = [ setuptools ]; + pythonRelaxDeps = [ + "pytorch-lightning" + ]; + dependencies = [ pytorch-lightning torch @@ -54,10 +56,12 @@ buildPythonPackage rec { meta = { description = "PyTorch Lightning extension for foundation model experimentation with flexible fine-tuning schedules"; homepage = "https://finetuning-scheduler.readthedocs.io"; - changelog = "https://github.com/speediedan/finetuning-scheduler/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/speediedan/finetuning-scheduler/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bcdarwin ]; - # "No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package" at import time: - broken = stdenv.hostPlatform.isDarwin; + badPlatforms = [ + # "No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package" at import time: + lib.systems.inspect.patterns.isDarwin + ]; }; }