From 18f477d443dd2693b7367f414dd3131cecd791ef Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 7 Feb 2026 14:29:32 +0100 Subject: [PATCH] python3Packages.maestral: fix for structuredAttrs, use finalAttrs --- .../python-modules/maestral/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 116a94520802..bb7e36e65961 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -28,7 +28,7 @@ nixosTests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "maestral"; version = "1.9.6"; pyproject = true; @@ -36,7 +36,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-mYFiQL4FumJWP2y1u5tIo1CZL027J8/EIYqJQde7G/c="; }; @@ -65,8 +65,14 @@ buildPythonPackage rec { makeWrapperArgs = [ # Add the installed directories to the python path so the daemon can find them - "--prefix PYTHONPATH : ${makePythonPath dependencies}" - "--prefix PYTHONPATH : $out/${python.sitePackages}" + "--prefix" + "PYTHONPATH" + ":" + (makePythonPath finalAttrs.finalPackage.dependencies) + "--prefix" + "PYTHONPATH" + ":" + "$out/${python.sitePackages}" ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -117,7 +123,7 @@ buildPythonPackage rec { description = "Open-source Dropbox client for macOS and Linux"; mainProgram = "maestral"; homepage = "https://maestral.app"; - changelog = "https://github.com/samschott/maestral/releases/tag/v${version}"; + changelog = "https://github.com/samschott/maestral/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium @@ -125,4 +131,4 @@ buildPythonPackage rec { sfrijters ]; }; -} +})