Commit 4880951a authored by Dmitry Kalinkin's avatar Dmitry Kalinkin
Browse files

yoda: move to by-name

parent 145fa633
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -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 = ''
+0 −3
Original line number Diff line number Diff line
@@ -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;
  });
+1 −1
Original line number Diff line number Diff line
@@ -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 { };