From 4880951aea16680accaf7253577243b045542864 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 13 Feb 2025 17:55:13 -0500
Subject: [PATCH 1/2] yoda: move to by-name

---
 .../yoda/default.nix => by-name/yo/yoda/package.nix}   | 10 +++++-----
 pkgs/top-level/all-packages.nix                        |  3 ---
 pkgs/top-level/python-packages.nix                     |  2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)
 rename pkgs/{development/libraries/physics/yoda/default.nix => by-name/yo/yoda/package.nix} (89%)

diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/by-name/yo/yoda/package.nix
similarity index 89%
rename from pkgs/development/libraries/physics/yoda/default.nix
rename to pkgs/by-name/yo/yoda/package.nix
index 581c9b4362dd..d6eb417897c7 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,
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-sHvwgLH22fvdlh4oLjr4fzZ2WtBJMAlvr4Vxi9Xdf84=";
   };
 
-  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 = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1fad5c7dcd1..d9e0ac03ab52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17422,9 +17422,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 856f229a15d8..bf8346e038fe 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18597,7 +18597,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 { };
 

From e763d4a526c6df45f4f25ebd7282f94367e6866b Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 13 Feb 2025 18:03:10 -0500
Subject: [PATCH 2/2] yoda: 2.0.2 -> 2.0.3

---
 pkgs/by-name/yo/yoda/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/yo/yoda/package.nix b/pkgs/by-name/yo/yoda/package.nix
index d6eb417897c7..838eb0733065 100644
--- a/pkgs/by-name/yo/yoda/package.nix
+++ b/pkgs/by-name/yo/yoda/package.nix
@@ -13,13 +13,13 @@
 
 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 python3.pkgs; [
@@ -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 ];
   };
 }