diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-02-22 10:43:06 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-11 16:17:56 +0000 |
| commit | ca1aada113c0ebda1ab8667199f6453f8e01c4fc (patch) | |
| tree | 55e402280096f62eb0bc8bcad5ce6050c5a0aec7 /nixpkgs/pkgs/development/libraries/elpa/default.nix | |
| parent | e4df5a52a6a6531f32626f57205356a773ac2975 (diff) | |
| parent | 93883402a445ad467320925a0a5dbe43a949f25b (diff) | |
| download | nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.gz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.bz2 nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.lz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.xz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.zst nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.zip | |
Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'
Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/elpa/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/elpa/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/elpa/default.nix b/nixpkgs/pkgs/development/libraries/elpa/default.nix index 3bb59ce9ca6a..76152996a1d0 100644 --- a/nixpkgs/pkgs/development/libraries/elpa/default.nix +++ b/nixpkgs/pkgs/development/libraries/elpa/default.nix @@ -13,13 +13,15 @@ , cudatoolkit } : -# The standard Scalapack has no iLP64 interface -assert (!blas.isILP64) && (!lapack.isILP64); +assert blas.isILP64 == lapack.isILP64; +assert blas.isILP64 == scalapack.isILP64; stdenv.mkDerivation rec { pname = "elpa"; version = "2021.11.001"; + passthru = { inherit (blas) isILP64; }; + src = fetchurl { url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz"; sha256 = "0bw0nwzwvjfmijfwznmrghypd3q237a3h5g5fcdncilrqnk1sdpv"; @@ -60,7 +62,8 @@ stdenv.mkDerivation rec { "--with-mpi" "--enable-openmp" "--without-threading-support-check-during-build" - ] ++ lib.optional (!avxSupport) "--disable-avx" + ] ++ lib.optional blas.isILP64 "--enable-64bit-integer-math-support" + ++ lib.optional (!avxSupport) "--disable-avx" ++ lib.optional (!avx2Support) "--disable-avx2" ++ lib.optional (!avx512Support) "--disable-avx512" ++ lib.optional (!stdenv.hostPlatform.isx86_64) "--disable-sse" |