diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2020-11-29 18:09:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-29 18:09:57 +0100 |
| commit | bb9c3e74f80af20ef9e60f57f56789411bef706f (patch) | |
| tree | 58e1fd7af2ea2af8242b5a3288e7c4925cfdea7e | |
| parent | 49715830f95f817861405c44d27312d0aa881f65 (diff) | |
| parent | 5d8ae7e7b37bf111cc2718cfd8f94e229d41a0b4 (diff) | |
Merge pull request #105330 from danieldk/mkl-2020.4.304
mkl: 2020.3.279 -> 2020.4.304
| -rw-r--r-- | pkgs/development/libraries/science/math/mkl/default.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 7b91940033dd1..1887d53e30663 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -20,12 +20,11 @@ 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 "3"; - rel = if stdenvNoCC.isDarwin then "199" else "279"; + spot = if stdenvNoCC.isDarwin then "3" else "4"; + rel = if stdenvNoCC.isDarwin then "199" else "304"; - # 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"; + # Replace `openmpSpot` by `spot` after 2020. + openmpSpot = if stdenvNoCC.isDarwin then spot else "3"; rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}"; @@ -47,8 +46,8 @@ in stdenvNoCC.mkDerivation { }) else (fetchurl { - url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16903/l_mkl_${version}.tgz"; - sha256 = "013shn3c823bjfssq4jyl3na5lbzj99s09ds608ljqllri7473ib"; + url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16917/l_mkl_${version}.tgz"; + hash = "sha256-IxTUZTaXTb0I8qTk+emhVdx+eeJ5jHTn3fqtAKWRfqU="; }); nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin |