From 391c1b4fcd1642a6c5b69ef62757c0202f3bb397 Mon Sep 17 00:00:00 2001 From: Daniel Salwasser Date: Sun, 12 Oct 2025 21:13:54 +0200 Subject: [PATCH] kaminpar: 3.5.1 -> 3.7.0 --- pkgs/by-name/ka/kaminpar/package.nix | 40 +++++----------------------- 1 file changed, 7 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/ka/kaminpar/package.nix b/pkgs/by-name/ka/kaminpar/package.nix index b93eea19c8db..2f04f74165da 100644 --- a/pkgs/by-name/ka/kaminpar/package.nix +++ b/pkgs/by-name/ka/kaminpar/package.nix @@ -2,69 +2,43 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, cmake, numactl, mpi, sparsehash, onetbb, + kagen, + kassert, gtest, mpiCheckPhaseHook, }: -let - kassert-src = fetchFromGitHub { - owner = "kamping-site"; - repo = "kassert"; - rev = "988b7d54b79ae6634f2fcc53a0314fb1cf2c6a23"; - - fetchSubmodules = true; - hash = "sha256-CBglUfVl9lgEa1t95G0mG4CCj0OWnIBwk7ep62rwIAA="; - }; - - kagen-src = fetchFromGitHub { - owner = "KarlsruheGraphGeneration"; - repo = "KaGen"; - rev = "70386f48e513051656f020360c482ce6bff9a24f"; - - fetchSubmodules = true; - hash = "sha256-5EvRPpjUZpmAIEgybXjNU/mO0+gsAyhlwbT+syDUr48="; - }; -in stdenv.mkDerivation (finalAttrs: { pname = "kaminpar"; - version = "3.5.1"; + version = "3.7.0"; src = fetchFromGitHub { owner = "KaHIP"; repo = "KaMinPar"; tag = "v${finalAttrs.version}"; - hash = "sha256-1azBj1DSEb7b8u+S51Sncn6EVMgu+SuFJcK4QVVhRk4="; + hash = "sha256-CkGVRJncQBrwDV7eoJ02jcpPDRWNukwibbWXVrx4P8g="; }; - patches = [ - # require gtest to be preinstalled by default if building tests - (fetchpatch2 { - url = "https://github.com/KaHip/KaMinPar/commit/9cb9883eea076d11cffcf4b0d14bf1f4f95a00e4.patch?full_index=1"; - hash = "sha256-aUO5E0HTZqjfu5BUzyRdSZgyQYcE4PGqZaJvLD40sn8="; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = lib.optional stdenv.hostPlatform.isLinux numactl; propagatedBuildInputs = [ + kagen + kassert mpi - sparsehash onetbb + sparsehash ]; cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "KAMINPAR_BUILD_DISTRIBUTED" true) (lib.cmakeBool "KAMINPAR_BUILD_WITH_MTUNE_NATIVE" false) - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_KASSERT" "${kassert-src}") - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_KAGEN" "${kagen-src}") ]; doCheck = true;