Unverified Commit 5e68274f authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

suitesparse: remove ? null, remove empty list; suitesparse_5_3: drop alias (#507472)

parents 88c1e826 c6601ac2

pkgs/development/libraries/science/math/suitesparse/default.nix

+9 −10
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
  config,

  enableCuda ? config.cudaSupport,

  cudaPackages,

  openmp ? null,

  llvmPackages,

}@inputs:



let
@@ -36,9 +36,8 @@ effectiveStdenv.mkDerivation rec { 
    sha256 = "sha256-Anen1YtXsSPhk8DpA4JtADIz9m8oXFl9umlkb4iImf8=";

  };



  nativeBuildInputs = [

  ]

  ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [

  nativeBuildInputs =

    lib.optionals effectiveStdenv.hostPlatform.isDarwin [

      fixDarwinDylibNames

    ]

    ++ lib.optionals enableCuda [
@@ -57,7 +56,7 @@ effectiveStdenv.mkDerivation rec { 
      mpfr

    ]

    ++ lib.optionals effectiveStdenv.cc.isClang [

      openmp

      llvmPackages.openmp

    ]

    ++ lib.optionals enableCuda [

      cudaPackages.cuda_cudart

pkgs/top-level/all-packages.nix

+1 −4
Original line number Diff line number Diff line
@@ -11485,10 +11485,7 @@ with pkgs; 
    lapack = lapack-ilp64;

  };



  suitesparse_5_3 = callPackage ../development/libraries/science/math/suitesparse {

    inherit (llvmPackages) openmp;

  };

  suitesparse = suitesparse_5_3;

  suitesparse = callPackage ../development/libraries/science/math/suitesparse { };



  trilinos-mpi = trilinos.override { withMPI = true; };

pkgs/top-level/release-alternatives.nix

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ let 
    "rspamd"

    "octopus"

    "superlu"

    "suitesparse_5_3"

    "suitesparse"

    "scs"

    "scalapack"

    "petsc"
@@ -94,7 +94,7 @@ let 
  blas64Users = [

    "rspamd"

    "sundials"

    "suitesparse_5_3"

    "suitesparse"

    "petsc"

    "cholmod-extra"

    "arpack"