diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix index 19f988d965c4..2be3baed4497 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix @@ -19,14 +19,18 @@ let # Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details: # https://github.com/matthewbauer/undmg/issues/4 year = if stdenvNoCC.isDarwin then "2019" else "2020"; - spot = if stdenvNoCC.isDarwin then "3" else "1"; - rel = if stdenvNoCC.isDarwin then "199" else "217"; + spot = if stdenvNoCC.isDarwin then "3" else "3"; + rel = if stdenvNoCC.isDarwin then "199" else "279"; + + # Replace `openmpSpot` by `spot` after 2020.3. Release 2020.03 + # adresses performance regressions and does not update OpenMP. + openmpSpot = if stdenvNoCC.isDarwin then spot else "2"; rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}"; # Intel openmp uses its own versioning, but shares the spot release patch. openmp = if stdenvNoCC.isDarwin then "19.0" else "19.1"; - openmp-ver = "${openmp}.${spot}-${rel}-${openmp}.${spot}-${rel}"; + openmp-ver = "${openmp}.${openmpSpot}-${rel}-${openmp}.${openmpSpot}-${rel}"; shlibExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary; @@ -42,8 +46,8 @@ in stdenvNoCC.mkDerivation { }) else (fetchurl { - url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16533/l_mkl_${version}.tgz"; - sha256 = "0v86hrqg15mbc78m9qk8dbkaaq3mlwashgbf9n79kxpl1gilnah8"; + url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16903/l_mkl_${version}.tgz"; + sha256 = "013shn3c823bjfssq4jyl3na5lbzj99s09ds608ljqllri7473ib"; }); nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin |