Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2400712f96ce
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a1f6400fd52a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 6, 2020

  1. mkl: 2020.0.166 -> 2020.1.217

    @robertodr
    robertodr committed Apr 6, 2020
    Copy the full SHA
    488527e View commit details

Commits on Apr 10, 2020

  1. Merge pull request #84451 from robertodr/update-mkl 

    mkl: 2020.0.166 -> 2020.1.217 (Linux only)
    @bhipple
    bhipple authored Apr 10, 2020
    Copy the full SHA
    a1f6400 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/development/libraries/science/math/mkl/default.nix
8 changes: 4 additions & 4 deletions pkgs/development/libraries/science/math/mkl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,8 +11,8 @@ 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 "0";
rel = if stdenvNoCC.isDarwin then "199" else "166";
spot = if stdenvNoCC.isDarwin then "3" else "1";
rel = if stdenvNoCC.isDarwin then "199" else "217";

rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}";

@@ -32,8 +32,8 @@ in stdenvNoCC.mkDerivation {
})
else
(fetchurl {
url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16318/l_mkl_${version}.tgz";
sha256 = "1q4ab87qzraksn8mm4117vj7l3sgpdi2qszj7nx122zi7zmjvngn";
url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16533/l_mkl_${version}.tgz";
sha256 = "0v86hrqg15mbc78m9qk8dbkaaq3mlwashgbf9n79kxpl1gilnah8";
});

nativeBuildInputs = if stdenvNoCC.isDarwin