pyrox.dev / nixpkgs
lol
fork atom

petsc/slepc: replace python3 with python3Packages.python

qbisi 8cb27164 e13ba117

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