From 120cb83d3bd82c0ade523344e6fe0e7edf2e156d Mon Sep 17 00:00:00 2001 From: qbisi Date: Fri, 14 Feb 2025 19:06:55 +0800 Subject: [PATCH] petsc: set optimized and withHdf5 default to true Petsc is commonly optimized built with hdf5 support to be used as a component of other software and project. See 1. https://sources.debian.org/src/petsc/3.22.2%2Bdfsg1-1/debian/rules/#L154 2. https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=petsc --- pkgs/by-name/pe/petsc/package.nix | 4 ++-- pkgs/top-level/all-packages.nix | 8 -------- pkgs/top-level/python-packages.nix | 1 - 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 22735cacece5..cec3dda54341 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -14,7 +14,7 @@ mpiCheckPhaseHook, # Build options - petsc-optimized ? false, + petsc-optimized ? true, petsc-scalar-type ? "real", petsc-precision ? "double", mpiSupport ? true, @@ -22,7 +22,7 @@ withFullDeps ? false, # full External libraries support # External libraries options - withHdf5 ? withFullDeps, + withHdf5 ? true, withMetis ? withFullDeps, withParmetis ? false, # parmetis is unfree and should be enabled manualy withPtscotch ? withFullDeps, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f18c29a4280e..77e4a06b3c69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17072,14 +17072,6 @@ with pkgs; ### SCIENCE/PROGRAMMING - ### SCIENCE/GEOLOGY - pflotran = callPackage ../by-name/pf/pflotran/package.nix { - petsc = petsc.override { - withHdf5 = true; - petsc-optimized = true; - }; - }; - ### SCIENCE/LOGIC abella = callPackage ../applications/science/logic/abella { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dbabff224391..f1e9cc7f6a70 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10347,7 +10347,6 @@ self: super: with self; { python3Packages = self; withPetsc4py = true; withFullDeps = true; - petsc-optimized = true; }); pex = callPackage ../development/python-modules/pex { };