petsc/slepc: replace python3 with python3Packages.python

qbisi 8cb27164 e13ba117

+4 -9
+2 -4
pkgs/by-name/pe/petsc/package.nix
··· 10 bison, 11 mpi, # generic mpi dependency 12 mpiCheckPhaseHook, 13 - python3, 14 python3Packages, 15 16 # Build options ··· 78 petscPackages = lib.makeScope newScope (self: { 79 inherit 80 mpi 81 - python3 82 python3Packages 83 # global override options 84 mpiSupport ··· 121 strictDeps = true; 122 123 nativeBuildInputs = [ 124 - python3 125 gfortran 126 pkg-config 127 bison 128 ] 129 ++ lib.optional mpiSupport mpi 130 ++ lib.optionals pythonSupport [ ··· 154 155 patches = [ 156 (replaceVars ./fix-petsc4py-install-prefix.patch { 157 - PYTHON_SITEPACKAGES = python3.sitePackages; 158 }) 159 ]; 160
··· 10 bison, 11 mpi, # generic mpi dependency 12 mpiCheckPhaseHook, 13 python3Packages, 14 15 # Build options ··· 77 petscPackages = lib.makeScope newScope (self: { 78 inherit 79 mpi 80 python3Packages 81 # global override options 82 mpiSupport ··· 119 strictDeps = true; 120 121 nativeBuildInputs = [ 122 gfortran 123 pkg-config 124 bison 125 + python3Packages.python 126 ] 127 ++ lib.optional mpiSupport mpi 128 ++ lib.optionals pythonSupport [ ··· 152 153 patches = [ 154 (replaceVars ./fix-petsc4py-install-prefix.patch { 155 + PYTHON_SITEPACKAGES = python3Packages.python.sitePackages; 156 }) 157 ]; 158
+2 -3
pkgs/by-name/sl/slepc/package.nix
··· 2 lib, 3 stdenv, 4 fetchFromGitLab, 5 - python3, 6 python3Packages, 7 arpack-mpi, 8 petsc, ··· 29 # Fix slepc4py install prefix 30 substituteInPlace config/packages/slepc4py.py \ 31 --replace-fail "slepc.prefixdir,'lib'" \ 32 - "slepc.prefixdir,'${python3.sitePackages}'" 33 34 patchShebangs lib/slepc/bin 35 ''; ··· 43 ''; 44 45 nativeBuildInputs = [ 46 - python3 47 ] 48 ++ lib.optionals pythonSupport [ 49 python3Packages.setuptools
··· 2 lib, 3 stdenv, 4 fetchFromGitLab, 5 python3Packages, 6 arpack-mpi, 7 petsc, ··· 28 # Fix slepc4py install prefix 29 substituteInPlace config/packages/slepc4py.py \ 30 --replace-fail "slepc.prefixdir,'lib'" \ 31 + "slepc.prefixdir,'${python3Packages.python.sitePackages}'" 32 33 patchShebangs lib/slepc/bin 34 ''; ··· 42 ''; 43 44 nativeBuildInputs = [ 45 + python3Packages.python 46 ] 47 ++ lib.optionals pythonSupport [ 48 python3Packages.setuptools
-2
pkgs/top-level/python-packages.nix
··· 11561 11562 petsc4py = toPythonModule ( 11563 pkgs.petsc.override { 11564 - python3 = python; 11565 python3Packages = self; 11566 pythonSupport = true; 11567 } ··· 16798 slepc4py = toPythonModule ( 16799 pkgs.slepc.override { 16800 pythonSupport = true; 16801 - python3 = self.python; 16802 python3Packages = self; 16803 petsc = petsc4py; 16804 }
··· 11561 11562 petsc4py = toPythonModule ( 11563 pkgs.petsc.override { 11564 python3Packages = self; 11565 pythonSupport = true; 11566 } ··· 16797 slepc4py = toPythonModule ( 16798 pkgs.slepc.override { 16799 pythonSupport = true; 16800 python3Packages = self; 16801 petsc = petsc4py; 16802 }