Merge remote-tracking branch 'origin/master' into hardened-stdenv

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";

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 ];
   };
 }

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 ];
   };
 }