diff options
32 files changed, 47 insertions, 47 deletions
diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index f30954367cf..adb31d32650 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -2,7 +2,7 @@ , libyaml, libxc, fftw, blas, lapack, gsl, netcdf, arpack, autoreconfHook }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "octopus"; diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index 33871df87f3..031ca55a048 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -13,7 +13,7 @@ assert pythonSupport -> pythonPackages != null; assert opencvSupport -> opencv != null; -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); let pname = "shogun"; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 836ce004fff..617a1826537 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -9,7 +9,7 @@ , static ? false }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { name = "R-3.6.3"; diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index be3c1e6dcc8..ea9c921f19e 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -5,7 +5,7 @@ }: assert enableGUI -> libGLU != null && libGL != null && xorg != null && fltk != null; -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "giac${lib.optionalString enableGUI "-with-xcas"}"; diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 8ece2e7819c..946beff8003 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg , zlib, libGL, libGLU, xorg, opencascade-occt }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "gmsh"; diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index c0dfeef1119..626e1bf1ea9 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 77bc65c2be1..87c1e07f530 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 92b4e8efa2e..830d806a8bc 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 diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index bce0c7af2bc..45fb69eddb7 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , lapack-reference, openblasCompat, openblas -, is64bit ? false -, blasProvider ? if is64bit then openblas else openblasCompat }: +, isILP64 ? false +, blasProvider ? if isILP64 then openblas else openblasCompat }: let blasFortranSymbols = [ @@ -31,12 +31,12 @@ let else stdenv.hostPlatform.extensions.sharedLibrary; - is64bit = blasProvider.blas64 or false; + isILP64 = blasProvider.blas64 or false; blasImplementation = lib.getName blasProvider; in -assert is64bit -> (blasImplementation == "openblas" && blasProvider.blas64) || blasImplementation == "mkl"; +assert isILP64 -> (blasImplementation == "openblas" && blasProvider.blas64) || blasImplementation == "mkl"; stdenv.mkDerivation { pname = "blas"; @@ -49,7 +49,7 @@ stdenv.mkDerivation { }; passthru = { - inherit is64bit; + inherit isILP64; provider = blasProvider; implementation = blasImplementation; }; @@ -134,6 +134,6 @@ Libs: -L$out/lib -lcblas EOF '' + stdenv.lib.optionalString (blasImplementation == "mkl") '' mkdir -p $out/nix-support - echo 'export MKL_INTERFACE_LAYER=${lib.optionalString is64bit "I"}LP64,GNU' > $out/nix-support/setup-hook + echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook ''); } diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix index 75dc2ae3b34..c90eb43494d 100644 --- a/pkgs/build-support/alternatives/lapack/default.nix +++ b/pkgs/build-support/alternatives/lapack/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , lapack-reference, openblasCompat, openblas -, is64bit ? false -, lapackProvider ? if is64bit then openblas else openblasCompat }: +, isILP64 ? false +, lapackProvider ? if isILP64 then openblas else openblasCompat }: let @@ -14,7 +14,7 @@ let in -assert is64bit -> (lapackImplementation == "openblas" && lapackProvider.blas64) || lapackImplementation == "mkl"; +assert isILP64 -> (lapackImplementation == "openblas" && lapackProvider.blas64) || lapackImplementation == "mkl"; stdenv.mkDerivation { pname = "lapack"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { }; passthru = { - inherit is64bit; + inherit isILP64; provider = lapackProvider; implementation = lapackImplementation; }; @@ -108,6 +108,6 @@ Libs: -L$out/lib -llapacke EOF '' + stdenv.lib.optionalString (lapackImplementation == "mkl") '' mkdir -p $out/nix-support - echo 'export MKL_INTERFACE_LAYER=${lib.optionalString is64bit "I"}LP64,GNU' > $out/nix-support/setup-hook + echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook ''); } diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix index 49dc17a27f4..b67a78b4a5a 100644 --- a/pkgs/development/compilers/julia/1.3.nix +++ b/pkgs/development/compilers/julia/1.3.nix @@ -12,7 +12,7 @@ , CoreServices, ApplicationServices }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); with stdenv.lib; @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { "SHELL=${stdenv.shell}" "USE_SYSTEM_BLAS=1" - "USE_BLAS64=${if blas.is64bit then "1" else "0"}" + "USE_BLAS64=${if blas.isILP64 then "1" else "0"}" "USE_SYSTEM_LAPACK=1" diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix index 92e3d4a5c14..29ac4115050 100644 --- a/pkgs/development/compilers/julia/shared.nix +++ b/pkgs/development/compilers/julia/shared.nix @@ -22,7 +22,7 @@ with stdenv.lib; -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); let dsfmtVersion = "2.2.3"; @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { "SHELL=${stdenv.shell}" "USE_SYSTEM_BLAS=1" - "USE_BLAS64=${if blas.is64bit then "1" else "0"}" + "USE_BLAS64=${if blas.isILP64 then "1" else "0"}" "USE_SYSTEM_LAPACK=1" diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 4d2bf40b329..06d69ed8117 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -53,7 +53,7 @@ , darwin }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { version = "5.2.0"; @@ -125,12 +125,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # See https://savannah.gnu.org/bugs/?50339 - F77_INTEGER_8_FLAG = if blas.is64bit then "-fdefault-integer-8" else ""; + F77_INTEGER_8_FLAG = if blas.isILP64 then "-fdefault-integer-8" else ""; configureFlags = [ "--with-blas=blas" "--with-lapack=lapack" - (if blas.is64bit then "--enable-64" else "--disable-64") + (if blas.isILP64 then "--enable-64" else "--disable-64") ] ++ (if stdenv.isDarwin then [ "--enable-link-all-dependencies" ] else [ ]) ++ stdenv.lib.optionals enableReadline [ "--enable-readline" ] diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index 16a9e3e79d4..bc84039a9aa 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -2,7 +2,7 @@ , gmpxx }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "fflas-ffpack"; diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 6d25cb45987..2217996acdb 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -10,7 +10,7 @@ , withSage ? false # sage support }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "linbox"; diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index f6c16583ad7..424502dce0d 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { -e 's,^LAPACK=.*,LAPACK=-L${lapack}/lib -llapack,' \ Makeconf '' - + stdenv.lib.optionalString blas.is64bit + + stdenv.lib.optionalString blas.isILP64 '' sed -i Makeconf -e '/^FFLAGS=.*/ s/$/-fdefault-integer-8/' ''; diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index a5fbb679df5..0829557d0f3 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DINTERFACE64=${optionalString blas.is64bit "1"}" + "-DINTERFACE64=${optionalString blas.isILP64 "1"}" ]; preCheck = if stdenv.isDarwin then '' diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 647fd82ec0e..97374fb0d47 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, blas, lapack, gfortran }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ipopt"; diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index d2021986029..1cf9c2ed8d5 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -2,7 +2,7 @@ , gfortran, mpi, blas, lapack } : -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "scalapack"; diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix index 2dcb47f11ba..3820f2b9527 100644 --- a/pkgs/development/libraries/science/math/scs/default.nix +++ b/pkgs/development/libraries/science/math/scs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, blas, lapack, gfortran, fixDarwinDylibNames }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "scs"; diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix index 34a1fb7ad9e..b1c1202c578 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gfortran, blas, lapack }: let - int_t = if blas.is64bit then "int64_t" else "int32_t"; + int_t = if blas.isILP64 then "int64_t" else "int32_t"; in stdenv.mkDerivation rec { version = "4.2.1"; diff --git a/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/pkgs/development/libraries/science/math/suitesparse/4.4.nix index b2b7e666b7e..81a80c920b5 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.4.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.4.nix @@ -6,7 +6,7 @@ let version = "4.4.4"; name = "suitesparse-${version}"; - int_t = if blas.is64bit then "int64_t" else "int32_t"; + int_t = if blas.isILP64 then "int64_t" else "int32_t"; SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index 48177987a7a..f0480e1e238 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { "BLAS=-lblas" "LAPACK=-llapack" "MY_METIS_LIB=-lmetis" - ] ++ stdenv.lib.optionals blas.is64bit [ + ] ++ stdenv.lib.optionals blas.isILP64 [ "CFLAGS=-DBLAS64" ] ++ stdenv.lib.optionals enableCuda [ "CUDA_PATH=${cudatoolkit}" diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix index 05ceb21387d..ff59297bd83 100644 --- a/pkgs/development/libraries/science/math/superlu/default.nix +++ b/pkgs/development/libraries/science/math/superlu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, gfortran, blas, lapack}: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { version = "5.2.1"; diff --git a/pkgs/development/libraries/sundials/2.x.nix b/pkgs/development/libraries/sundials/2.x.nix index 08cbd52ba39..b54e537fb82 100644 --- a/pkgs/development/libraries/sundials/2.x.nix +++ b/pkgs/development/libraries/sundials/2.x.nix @@ -8,7 +8,7 @@ , gfortran , lapackSupport ? true }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "sundials"; diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 8ed8d6cfcb5..46cf437d72c 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -7,7 +7,7 @@ , gfortran , lapackSupport ? true }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "sundials"; diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix index e4da2216a83..23b38e469b4 100644 --- a/pkgs/development/ocaml-modules/lacaml/default.nix +++ b/pkgs/development/ocaml-modules/lacaml/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, darwin, ocaml, findlib, dune, base, stdio, lapack, blas }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.05.0"; -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-lacaml"; diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix index c84743a8da5..b306ee9ce6d 100644 --- a/pkgs/development/ocaml-modules/owl/default.nix +++ b/pkgs/development/ocaml-modules/owl/default.nix @@ -11,7 +11,7 @@ , npy }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); assert blas.implementation == "openblas" && lapack.implementation == "openblas"; buildDunePackage rec { diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index 9266f406b15..2b6d1b4d248 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -14,7 +14,7 @@ , withFftw ? true }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); buildPythonPackage rec { pname = "cvxopt"; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 7009d1d1cd0..f3d8dcba31d 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -12,7 +12,7 @@ , setuptoolsBuildHook }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); let cfg = writeTextFile { diff --git a/pkgs/tools/misc/hpl/default.nix b/pkgs/tools/misc/hpl/default.nix index c131de02180..d688f3adf30 100644 --- a/pkgs/tools/misc/hpl/default.nix +++ b/pkgs/tools/misc/hpl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, blas, lapack, mpi } : -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "hpl"; diff --git a/pkgs/top-level/release-alternatives.nix b/pkgs/top-level/release-alternatives.nix index eef239d4e0a..7479377bd30 100644 --- a/pkgs/top-level/release-alternatives.nix +++ b/pkgs/top-level/release-alternatives.nix @@ -59,7 +59,7 @@ in { blas = mapListToAttrs supportedSystems (system': let system = lib.systems.elaborate { system = system'; }; in mapListToAttrs (blasProviders system) (provider: let - is64bit = builtins.elem provider (["mkl64"] ++ lib.optional system.is64bit "openblas"); + isILP64 = builtins.elem provider (["mkl64"] ++ lib.optional system.is64bit "openblas"); pkgs = pkgsFun { config = { inherit allowUnfree; }; system = system'; @@ -68,13 +68,13 @@ in lapackProvider = if provider == "mkl64" then super.mkl else builtins.getAttr provider super; - inherit is64bit; + inherit isILP64; }; blas = super.blas.override { blasProvider = if provider == "mkl64" then super.mkl else builtins.getAttr provider super; - inherit is64bit; + inherit isILP64; }; })]; }; |