Skip to content

Commit 1d182bf

Browse files
authored
yoda: 2.0.2 -> 2.0.3 (#381889)
2 parents 44f2505 + e763d4a commit 1d182bf

File tree

3 files changed

+12
-15
lines changed

3 files changed

+12
-15
lines changed

pkgs/development/libraries/physics/yoda/default.nix renamed to pkgs/by-name/yo/yoda/package.nix

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
fetchFromGitLab,
55
autoreconfHook,
66
bash,
7-
python,
7+
python3,
88
root,
99
makeWrapper,
1010
zlib,
@@ -13,16 +13,16 @@
1313

1414
stdenv.mkDerivation rec {
1515
pname = "yoda";
16-
version = "2.0.2";
16+
version = "2.0.3";
1717

1818
src = fetchFromGitLab {
1919
owner = "hepcedar";
2020
repo = pname;
2121
rev = "yoda-${version}";
22-
hash = "sha256-sHvwgLH22fvdlh4oLjr4fzZ2WtBJMAlvr4Vxi9Xdf84=";
22+
hash = "sha256-No2Lr4nmYNfFnJVpg7xYjd35g12CbQtpW9QMjM3owko=";
2323
};
2424

25-
nativeBuildInputs = with python.pkgs; [
25+
nativeBuildInputs = with python3.pkgs; [
2626
autoreconfHook
2727
bash
2828
cython
@@ -31,9 +31,9 @@ stdenv.mkDerivation rec {
3131

3232
buildInputs =
3333
[
34-
python
34+
python3
3535
]
36-
++ (with python.pkgs; [
36+
++ (with python3.pkgs; [
3737
numpy
3838
matplotlib
3939
])
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
5454
patchShebangs .
5555
5656
substituteInPlace pyext/yoda/plotting/script_generator.py \
57-
--replace '/usr/bin/env python' '${python.interpreter}'
57+
--replace '/usr/bin/env python' '${python3.interpreter}'
5858
'';
5959

6060
postInstall = ''
@@ -70,12 +70,12 @@ stdenv.mkDerivation rec {
7070

7171
installCheckTarget = "check";
7272

73-
meta = with lib; {
73+
meta = {
7474
description = "Provides small set of data analysis (specifically histogramming) classes";
75-
license = licenses.gpl3Only;
75+
license = lib.licenses.gpl3Only;
7676
homepage = "https://yoda.hepforge.org";
7777
changelog = "https://gitlab.com/hepcedar/yoda/-/blob/yoda-${version}/ChangeLog";
78-
platforms = platforms.unix;
79-
maintainers = with maintainers; [ veprbl ];
78+
platforms = lib.platforms.unix;
79+
maintainers = with lib.maintainers; [ veprbl ];
8080
};
8181
}

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17368,9 +17368,6 @@ with pkgs;
1736817368
imagemagick = graphicsmagick-imagemagick-compat;
1736917369
};
1737017370

17371-
yoda = callPackage ../development/libraries/physics/yoda {
17372-
python = python3;
17373-
};
1737417371
yoda-with-root = lowPrio (yoda.override {
1737517372
withRootSupport = true;
1737617373
});

pkgs/top-level/python-packages.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18630,7 +18630,7 @@ self: super: with self; {
1863018630

1863118631
yfinance = callPackage ../development/python-modules/yfinance { };
1863218632

18633-
yoda = toPythonModule (pkgs.yoda.override { inherit python; });
18633+
yoda = toPythonModule (pkgs.yoda.override { python3 = python; });
1863418634

1863518635
yolink-api = callPackage ../development/python-modules/yolink-api { };
1863618636

0 commit comments

Comments
 (0)