diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix
index eb87829a3382..ccb531b46691 100644
--- a/pkgs/development/python-modules/volvooncall/default.nix
+++ b/pkgs/development/python-modules/volvooncall/default.nix
@@ -14,15 +14,17 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "volvooncall";
   version = "0.10.4";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "molobrakos";
     repo = "volvooncall";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-xr3g93rt3jvxVZrZY7cFh5eBP3k0arsejsgvx8p5EV4=";
   };
 
@@ -56,16 +58,16 @@ buildPythonPackage rec {
     pytest-asyncio_0
     pytestCheckHook
   ]
-  ++ optional-dependencies.mqtt;
+  ++ finalAttrs.passthru.optional-dependencies.mqtt;
 
   pythonImportsCheck = [ "volvooncall" ];
 
   meta = {
     description = "Retrieve information from the Volvo On Call web service";
     homepage = "https://github.com/molobrakos/volvooncall";
-    changelog = "https://github.com/molobrakos/volvooncall/releases/tag/v${version}";
+    changelog = "https://github.com/molobrakos/volvooncall/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.unlicense;
     mainProgram = "voc";
     maintainers = with lib.maintainers; [ dotlambda ];
   };
-}
+})