diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/by-name/yo/yoda/package.nix
similarity index 76%
rename from pkgs/development/libraries/physics/yoda/default.nix
rename to pkgs/by-name/yo/yoda/package.nix
index 581c9b4362dd..838eb0733065 100644
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/pkgs/by-name/yo/yoda/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitLab,
   autoreconfHook,
   bash,
-  python,
+  python3,
   root,
   makeWrapper,
   zlib,
@@ -13,16 +13,16 @@
 
 stdenv.mkDerivation rec {
   pname = "yoda";
-  version = "2.0.2";
+  version = "2.0.3";
 
   src = fetchFromGitLab {
     owner = "hepcedar";
     repo = pname;
     rev = "yoda-${version}";
-    hash = "sha256-sHvwgLH22fvdlh4oLjr4fzZ2WtBJMAlvr4Vxi9Xdf84=";
+    hash = "sha256-No2Lr4nmYNfFnJVpg7xYjd35g12CbQtpW9QMjM3owko=";
   };
 
-  nativeBuildInputs = with python.pkgs; [
+  nativeBuildInputs = with python3.pkgs; [
     autoreconfHook
     bash
     cython
@@ -31,9 +31,9 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [
-      python
+      python3
     ]
-    ++ (with python.pkgs; [
+    ++ (with python3.pkgs; [
       numpy
       matplotlib
     ])
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     patchShebangs .
 
     substituteInPlace pyext/yoda/plotting/script_generator.py \
-      --replace '/usr/bin/env python' '${python.interpreter}'
+      --replace '/usr/bin/env python' '${python3.interpreter}'
   '';
 
   postInstall = ''
@@ -70,12 +70,12 @@ stdenv.mkDerivation rec {
 
   installCheckTarget = "check";
 
-  meta = with lib; {
+  meta = {
     description = "Provides small set of data analysis (specifically histogramming) classes";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     homepage = "https://yoda.hepforge.org";
     changelog = "https://gitlab.com/hepcedar/yoda/-/blob/yoda-${version}/ChangeLog";
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ veprbl ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e700a4d082f..bb69df388926 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17368,9 +17368,6 @@ with pkgs;
     imagemagick = graphicsmagick-imagemagick-compat;
   };
 
-  yoda = callPackage ../development/libraries/physics/yoda {
-    python = python3;
-  };
   yoda-with-root = lowPrio (yoda.override {
     withRootSupport = true;
   });
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 333f70755e08..2837b60cc2e9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18630,7 +18630,7 @@ self: super: with self; {
 
   yfinance = callPackage ../development/python-modules/yfinance { };
 
-  yoda = toPythonModule (pkgs.yoda.override { inherit python; });
+  yoda = toPythonModule (pkgs.yoda.override { python3 = python; });
 
   yolink-api = callPackage ../development/python-modules/yolink-api { };