Skip to content

Commit

Permalink
Nix: revert back from upstream MUMPS
Browse files Browse the repository at this point in the history
elmer-full compiled with the nixpkgs version of MUMPS did not pass some
tests
  • Loading branch information
mk3z committed Dec 19, 2024
1 parent 36c2020 commit c72818b
Show file tree
Hide file tree
Showing 2 changed files with 86 additions and 10 deletions.
71 changes: 70 additions & 1 deletion flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 16 additions & 9 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@

nix-filter.url = "github:numtide/nix-filter";

mumps = {
url = "github:mk3z/mumps";
inputs.nixpkgs.follows = "nixpkgs";
};

mmg = {
url = "github:mk3z/mmg/develop";
inputs.nixpkgs.follows = "nixpkgs";
Expand Down Expand Up @@ -43,6 +48,8 @@
(flake-utils.lib.eachDefaultSystem (
system: let
pkgs = nixpkgs.legacyPackages.${system};

mumps = inputs.mumps.packages.${system}.default;
mmg = inputs.mmg.packages.${system}.default;
parmmg = inputs.parmmg.packages.${system}.default;

Expand Down Expand Up @@ -183,15 +190,15 @@
inherit doCheck;
name = "elmer-full";

buildInputs = with pkgs; [
libcsa
hdf5-mpi
hypre
metis
mumps
nn
scalapack
];
buildInputs = with pkgs;
[
libcsa
hdf5-mpi
hypre
nn
scalapack
]
++ [mumps];

cmakeFlags = [
"-DWITH_NETCDF:BOOL=TRUE"
Expand Down

0 comments on commit c72818b

Please sign in to comment.