From ab8a1f839c6ae8f06d8ff9b6d756b4e159471a75 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 26 Aug 2024 23:06:55 +0200 Subject: [PATCH 1/4] scotch: 7.0.4 -> 7.0.5 Diff: https://gitlab.inria.fr/scotch/scotch/-/compare/v7.0.4...v7.0.5 --- pkgs/by-name/sc/scotch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/scotch/package.nix b/pkgs/by-name/sc/scotch/package.nix index 8455b4d22648..c06276883090 100644 --- a/pkgs/by-name/sc/scotch/package.nix +++ b/pkgs/by-name/sc/scotch/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "scotch"; - version = "7.0.4"; + version = "7.0.5"; src = fetchFromGitLab { domain = "gitlab.inria.fr"; owner = "scotch"; repo = "scotch"; rev = "v${finalAttrs.version}"; - hash = "sha256-uaox4Q9pTF1r2BZjvnU2LE6XkZw3x9mGSKLdRVUobGU="; + hash = "sha256-XXkVwTr8cbYfzXWWkPERTmjfE86JHUUuU6yxjp9k6II="; }; nativeBuildInputs = [ From 84defedf7edec6803d632481cd9e0e2cd362350e Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 26 Aug 2024 23:17:21 +0200 Subject: [PATCH 2/4] scotch: split outputs --- pkgs/by-name/sc/scotch/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/sc/scotch/package.nix b/pkgs/by-name/sc/scotch/package.nix index c06276883090..62b4d917fa1f 100644 --- a/pkgs/by-name/sc/scotch/package.nix +++ b/pkgs/by-name/sc/scotch/package.nix @@ -24,6 +24,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-XXkVwTr8cbYfzXWWkPERTmjfE86JHUUuU6yxjp9k6II="; }; + outputs = [ + "bin" + "dev" + "out" + ]; + nativeBuildInputs = [ cmake gfortran From 229f3bb6d7f2688adc6295fd18fc1b522167c592 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 26 Aug 2024 23:18:48 +0200 Subject: [PATCH 3/4] scotch: shared libs --- pkgs/by-name/sc/scotch/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/sc/scotch/package.nix b/pkgs/by-name/sc/scotch/package.nix index 62b4d917fa1f..e089a0666072 100644 --- a/pkgs/by-name/sc/scotch/package.nix +++ b/pkgs/by-name/sc/scotch/package.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation (finalAttrs: { "out" ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + nativeBuildInputs = [ cmake gfortran From 981629a05b844bbfc775ac141c692e95fd6a61f7 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 27 Aug 2024 11:15:25 +0200 Subject: [PATCH 4/4] mumps: update scotch include dir --- pkgs/by-name/mu/mumps/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mu/mumps/package.nix b/pkgs/by-name/mu/mumps/package.nix index a02d7901617e..17c005946f57 100644 --- a/pkgs/by-name/mu/mumps/package.nix +++ b/pkgs/by-name/mu/mumps/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ [ "LSCOTCHDIR=${scotch}/lib" - "ISCOTCH=-I${scotch}/include" + "ISCOTCH=-I${scotch.dev}/include" "LMETISDIR=${metis}/lib" "IMETIS=-I${metis}/include" "allshared"