diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index a26fd39a3337..f8505523d217 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -5,10 +5,9 @@ garth, pdm-backend, requests, - withings-sync, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "garminconnect"; version = "0.2.40"; pyproject = true; @@ -16,21 +15,17 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cyberjunky"; repo = "python-garminconnect"; - tag = version; + tag = finalAttrs.version; hash = "sha256-EAmKrOmnJFn+vTfmAprd5onqW/uyOe/shSB1u0HVrIE="; }; - pythonRelaxDeps = [ - "garth" - "withings-sync" - ]; + pythonRelaxDeps = [ "garth" ]; build-system = [ pdm-backend ]; dependencies = [ garth requests - withings-sync ]; # Tests require a token @@ -41,8 +36,8 @@ buildPythonPackage rec { meta = { description = "Garmin Connect Python API wrapper"; homepage = "https://github.com/cyberjunky/python-garminconnect"; - changelog = "https://github.com/cyberjunky/python-garminconnect/releases/tag/${src.tag}"; + changelog = "https://github.com/cyberjunky/python-garminconnect/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/withings-sync/default.nix b/pkgs/development/python-modules/withings-sync/default.nix index 9a55b19272d7..41fd81a20f20 100644 --- a/pkgs/development/python-modules/withings-sync/default.nix +++ b/pkgs/development/python-modules/withings-sync/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - garth, + garminconnect, importlib-resources, lxml, poetry-core, @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "withings-sync"; - version = "5.3.2"; + version = "6.0.2"; pyproject = true; src = fetchFromGitHub { owner = "jaroslawhartman"; repo = "withings-sync"; tag = "v${finalAttrs.version}"; - hash = "sha256-1pDM5paSXPQCOG5LRFxnp19K1iHcsfrGC9e7SEyxUDs="; + hash = "sha256-z0rVUFBbPff6xfItLQqbt+uN5Qe/BbVLAH1xMVUSfpA="; }; postPatch = '' @@ -27,10 +27,12 @@ buildPythonPackage (finalAttrs: { --replace-fail "1.0.0.dev1" "${finalAttrs.version}" ''; + pythonRelaxDeps = [ "garminconnect" ]; + build-system = [ poetry-core ]; dependencies = [ - garth + garminconnect importlib-resources lxml python-dotenv