From 99e47617042d76425dc640df1677028f1681e4f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Wed, 20 Apr 2022 22:29:28 -0500 Subject: [PATCH] =?UTF-8?q?magma:=202.5.4=20=E2=86=92=202.6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/science/math/magma/default.nix | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index a1e0d908d51..05d7d4fa184 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -8,7 +8,7 @@ assert let majorIs = lib.versions.major cudatoolkit.version; in majorIs == "9" || majorIs == "10" || majorIs == "11"; let - version = "2.5.4"; + version = "2.6.2"; # We define a specific set of CUDA compute capabilities here, # because CUDA 11 does not support compute capability 3.0. Also, @@ -45,7 +45,7 @@ in stdenv.mkDerivation { inherit version; src = fetchurl { url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz"; - sha256 = "0rrvd21hczxlm8awc9z54fj7iqpjmsb518fy32s6ghz0g90znd3p"; + hash = "sha256-dbVU2rAJA+LRC5cskT5Q5/iMvGLzrkMrWghsfk7aCnE="; name = "magma-${version}.tar.gz"; }; @@ -64,23 +64,6 @@ in stdenv.mkDerivation { enableParallelBuilding=true; buildFlags = [ "magma" "magma_sparse" ]; - # MAGMA's default CMake setup does not care about installation. So we copy files directly. - installPhase = '' - mkdir -p $out - mkdir -p $out/include - mkdir -p $out/lib - mkdir -p $out/lib/pkgconfig - cp -a ../include/*.h $out/include - #cp -a sparse-iter/include/*.h $out/include - cp -a lib/*.so $out/lib - cat ../lib/pkgconfig/magma.pc.in | \ - sed -e s:@INSTALL_PREFIX@:"$out": | \ - sed -e s:@CFLAGS@:"-I$out/include": | \ - sed -e s:@LIBS@:"-L$out/lib -lmagma -lmagma_sparse": | \ - sed -e s:@MAGMA_REQUIRED@:: \ - > $out/lib/pkgconfig/magma.pc - ''; - meta = with lib; { description = "Matrix Algebra on GPU and Multicore Architectures"; license = licenses.bsd3;