From 4da287272a222833b560e72d45a9dcfb1e8ba99d Mon Sep 17 00:00:00 2001
From: Karl Hallsby <karl@hallsby.com>
Date: Wed, 6 Jan 2021 21:54:52 -0600
Subject: [PATCH] octave-packages: inherit the same python octave is using

Partly in response to:
https://github.com/NixOS/nixpkgs/pull/108562#discussion_r552658038
---
 pkgs/development/interpreters/octave/default.nix | 4 +---
 pkgs/top-level/octave-packages.nix               | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 4c23ebdb97187..0cf332403f46d 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -102,9 +102,7 @@ let
     inherit pkgs;
     inherit (pkgs) lib stdenv fetchurl newScope;
     octave = self;
-    inherit blas lapack gfortran texinfo gnuplot;
-    python3 = pkgs.python3;
-    python3Packages = pkgs.python3Packages;
+    inherit blas lapack gfortran python texinfo gnuplot;
     inherit enableJava jdk;
     nettle = pkgs.nettle;
   };
diff --git a/pkgs/top-level/octave-packages.nix b/pkgs/top-level/octave-packages.nix
index d22c2ab4649fe..1de228f61c075 100644
--- a/pkgs/top-level/octave-packages.nix
+++ b/pkgs/top-level/octave-packages.nix
@@ -10,8 +10,8 @@
 , octave
 , lapack, blas
 , gfortran
-, python3
-, python3Packages
+# Use the same python that octave is using
+, python
 # Use the same Java that octave is using
 , enableJava
 , jdk
@@ -81,7 +81,7 @@ in rec {
             src = pkgs.python2Packages.sympy.src;
           });
         };
-      in python3.override {inherit packageOverrides; self = overridenPython; };
+      in python.override {inherit packageOverrides; self = overridenPython; };
     in overridenPython.withPackages (ps: [
       ps.sympy
       ps.mpmath