Merge remote-tracking branch 'upstream/master' into staging

2018-09-25 14:20:27 -04:00
parent 6aa5f2db8f 6cd28a468a
commit c701d6cb21
164 changed files with 4068 additions and 2882 deletions
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -60,7 +60,7 @@ let
      TARGET = "ATHLON";
      DYNAMIC_ARCH = "1";
      CC = "gcc";
-      USE_OPENMP = if stdenv.hostPlatform.isMusl then "0" else "1";
+      USE_OPENMP = "1";
    };
  };
 in