about summary refs log tree commit diff
path: root/pkgs/applications/science/math/sage
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2020-04-20 15:50:55 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2020-04-20 16:02:43 -0500
commitff2f2644f8ea1b364dde5dfee2bc76027afccaf9 (patch)
tree8d8fac67684fe7c66ec55e784af6c624bd308f98 /pkgs/applications/science/math/sage
parentf86d582ea7cdf9c969f2294d9dc953f36f2a63e9 (diff)
downloadnixlib-ff2f2644f8ea1b364dde5dfee2bc76027afccaf9.tar
nixlib-ff2f2644f8ea1b364dde5dfee2bc76027afccaf9.tar.gz
nixlib-ff2f2644f8ea1b364dde5dfee2bc76027afccaf9.tar.bz2
nixlib-ff2f2644f8ea1b364dde5dfee2bc76027afccaf9.tar.lz
nixlib-ff2f2644f8ea1b364dde5dfee2bc76027afccaf9.tar.xz
nixlib-ff2f2644f8ea1b364dde5dfee2bc76027afccaf9.tar.zst
nixlib-ff2f2644f8ea1b364dde5dfee2bc76027afccaf9.zip
blas,lapack: use isILP64 instead of is64bit
This is a better name since we have multiple 64-bit things that could
be referred to.

LP64  : integer=32, long=64, pointer=64
ILP64 : integer=64, long=64, pointer=64
Diffstat (limited to 'pkgs/applications/science/math/sage')
-rw-r--r--pkgs/applications/science/math/sage/sage-env.nix2
-rw-r--r--pkgs/applications/science/math/sage/sage-with-env.nix2
-rw-r--r--pkgs/applications/science/math/sage/sagelib.nix2
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix
index c0dfeef1119b..626e1bf1ea92 100644
--- a/pkgs/applications/science/math/sage/sage-env.nix
+++ b/pkgs/applications/science/math/sage/sage-env.nix
@@ -54,7 +54,7 @@
 , less
 }:
 
-assert (!blas.is64bit) && (!lapack.is64bit);
+assert (!blas.isILP64) && (!lapack.isILP64);
 
 # This generates a `sage-env` shell file that will be sourced by sage on startup.
 # It sets up various environment variables, telling sage where to find its
diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix
index 77bc65c2be12..87c1e07f5307 100644
--- a/pkgs/applications/science/math/sage/sage-with-env.nix
+++ b/pkgs/applications/science/math/sage/sage-with-env.nix
@@ -23,7 +23,7 @@
 }:
 
 # lots of segfaults with (64 bit) blas
-assert (!blas.is64bit) && (!lapack.is64bit);
+assert (!blas.isILP64) && (!lapack.isILP64);
 
 # Wrapper that combined `sagelib` with `sage-env` to produce an actually
 # executable sage. No tests are run yet and no documentation is built.
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix
index 92b4e8efa2ec..830d806a8bcd 100644
--- a/pkgs/applications/science/math/sage/sagelib.nix
+++ b/pkgs/applications/science/math/sage/sagelib.nix
@@ -53,7 +53,7 @@
 , pplpy
 }:
 
-assert (!blas.is64bit) && (!lapack.is64bit);
+assert (!blas.isILP64) && (!lapack.isILP64);
 
 # This is the core sage python package. Everything else is just wrappers gluing
 # stuff together. It is not very useful on its own though, since it will not