sage: remove openblas hack

The pc files have since been included into the openblas package.
This commit is contained in:
Timo Kaufmann 2018-11-24 18:41:53 +01:00
parent 3832ddedb9
commit 21f9123ea6
5 changed files with 9 additions and 42 deletions

View file

@ -33,7 +33,7 @@ let
# `sagelib`, i.e. all of sage except some wrappers and runtime dependencies
sagelib = self.callPackage ./sagelib.nix {
inherit flint ecl arb;
inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
inherit sage-src pynac singular;
linbox = pkgs.linbox.override { withSage = true; };
};
};
@ -54,7 +54,7 @@ let
sage-env = callPackage ./sage-env.nix {
sagelib = python.pkgs.sagelib;
inherit env-locations;
inherit python rWrapper openblas-cblas-pc ecl singular palp flint pynac pythonEnv;
inherit python rWrapper ecl singular palp flint pynac pythonEnv;
pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
};
@ -68,7 +68,7 @@ let
sage-with-env = callPackage ./sage-with-env.nix {
inherit pythonEnv;
inherit sage-env;
inherit openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
inherit pynac singular;
pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
three = nodePackages_8_x.three;
};
@ -81,11 +81,6 @@ let
inherit sage-with-env;
};
# FIXME
openblas-blas-pc = callPackage ./openblas-pc.nix { name = "blas"; };
openblas-cblas-pc = callPackage ./openblas-pc.nix { name = "cblas"; };
openblas-lapack-pc = callPackage ./openblas-pc.nix { name = "lapack"; };
sage-src = callPackage ./sage-src.nix {};
pythonRuntimeDeps = with python.pkgs; [

View file

@ -1,17 +0,0 @@
{ openblasCompat
, writeTextFile
, name
}:
writeTextFile {
name = "openblas-${name}-pc-${openblasCompat.version}";
destination = "/lib/pkgconfig/${name}.pc";
text = ''
Name: ${name}
Version: ${openblasCompat.version}
Description: ${name} for SageMath, provided by the OpenBLAS package.
Cflags: -I${openblasCompat}/include
Libs: -L${openblasCompat}/lib -lopenblas
'';
}

View file

@ -36,7 +36,7 @@
, lcalc
, rubiks
, flintqs
, openblas-cblas-pc
, openblasCompat
, flint
, gmp
, mpfr
@ -99,11 +99,12 @@ writeTextFile rec {
destination = "/${name}";
text = ''
export PKG_CONFIG_PATH='${lib.concatStringsSep ":" (map (pkg: "${pkg}/lib/pkgconfig") [
# This is only needed in the src/sage/misc/cython.py test and I'm not sure if there's really a use-case
# for it outside of the tests. However since singular and openblas are runtime dependencies anyways
# and openblas-cblas-pc is tiny, it doesn't really hurt to include.
# This is only needed in the src/sage/misc/cython.py test and I'm not
# sure if there's really a usecase for it outside of the tests. However
# since singular and openblas are runtime dependencies anyways, it doesn't
# really hurt to include.
singular
openblas-cblas-pc
openblasCompat
])
}'
export SAGE_ROOT='${sagelib.src}'

View file

@ -3,9 +3,6 @@
, makeWrapper
, sage-env
, openblasCompat
, openblas-blas-pc
, openblas-cblas-pc
, openblas-lapack-pc
, pkg-config
, three
, singular
@ -34,9 +31,6 @@ let
makeWrapper
pkg-config
openblasCompat # lots of segfaults with regular (64 bit) openblas
openblas-blas-pc
openblas-cblas-pc
openblas-lapack-pc
singular
three
pynac

View file

@ -3,9 +3,6 @@
, buildPythonPackage
, arb
, openblasCompat
, openblas-blas-pc
, openblas-cblas-pc
, openblas-lapack-pc
, brial
, cliquer
, cypari2
@ -65,9 +62,6 @@ buildPythonPackage rec {
nativeBuildInputs = [
iml
perl
openblas-blas-pc
openblas-cblas-pc
openblas-lapack-pc
jupyter_core
];