From fcf33e24996b4cd92a817057b36aeaf86fdb3c7d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 17 Apr 2020 14:00:19 -0500 Subject: [PATCH] scs: breaks on 64bit blas --- pkgs/development/libraries/science/math/scs/default.nix | 2 ++ pkgs/top-level/release-alternatives.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix index 7f7171f67e5..2dcb47f11ba 100644 --- a/pkgs/development/libraries/science/math/scs/default.nix +++ b/pkgs/development/libraries/science/math/scs/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchFromGitHub, blas, lapack, gfortran, fixDarwinDylibNames }: +assert (!blas.is64bit) && (!lapack.is64bit); + stdenv.mkDerivation rec { pname = "scs"; version = "2.1.1"; diff --git a/pkgs/top-level/release-alternatives.nix b/pkgs/top-level/release-alternatives.nix index 230e20417bc..c31a03c8093 100644 --- a/pkgs/top-level/release-alternatives.nix +++ b/pkgs/top-level/release-alternatives.nix @@ -34,7 +34,7 @@ let ] ++ lib.optionals allowUnfree [ "magma" ]; blas64Users = [ "rspamd" "suitesparse_5_3" "suitesparse_4_4" - "suitesparse_4_2" "scs" "petsc" "magma" "cholmod-extra" + "suitesparse_4_2" "petsc" "cholmod-extra" "arpack" "qrupdate" "iml" "globalarrays" "arrayfire" "xfitter" "lammps" "plink-ng" "quantum-espresso" "calculix" "csdp" "getdp" "giac" "jags"