diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-18 17:10:02 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-18 17:10:02 +0200 |
| commit | f8d481754cf842ca6e6ac1427ce0f571f5a44108 (patch) | |
| tree | 70e702285987429aed275e0d5e2dc15c050e1f8c /pkgs/development/libraries/science | |
| parent | 9fbc20e2f89bc045efac7ade41949a2c2d571dec (diff) | |
| parent | 3cd63ade1614d4c581735ffb0cebe181bf87dfc8 (diff) | |
| download | nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.gz nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.bz2 nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.lz nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.xz nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.zst nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.zip | |
Merge remote-tracking branch 'origin/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/libraries/science')
3 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index 9779af6addcc..db8aff49c002 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -49,7 +49,7 @@ let in stdenv.mkDerivation { - name = "atlas-${version}" + optionalString withLapack "-with-lapack"; + name = "atlas${optionalString withLapack "-with-lapack"}-${version}"; src = fetchurl { url = "mirror://sourceforge/math-atlas/atlas${version}.tar.bz2"; diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix index ef89c0bfee21..1d05e6bb2a36 100644 --- a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix +++ b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix @@ -59,8 +59,6 @@ stdenv.mkDerivation rec { description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; license = licenses.bsd3; - platforms = platforms.all; - maintainers = [ maintainers.simons ]; }; } diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index f3832ba0a205..80b66c5ab167 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -59,8 +59,6 @@ stdenv.mkDerivation rec { description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; license = licenses.bsd3; - platforms = platforms.all; - maintainers = [ maintainers.simons ]; }; } |