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
base: 65dfc2b27281
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 6206a342e0c4
Choose a head ref
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on Dec 19, 2018

  1. mkl: include Intel's libiomp.so in the MKL RPM unpack 

    Since Intel's default openmp implementation is available in the same src
tarball, we can just include it in the package. This means that `mkl` now "just
works" without any environment variables, fragile setup-hooks, or forced
propagation.

Since the openmp implementation is only needed at runtime (and for test cases),
users can substitute a different one if they prefer by exporting it with
`LD_PRELOAD`, which is how Intel recommends handling this. If they do not do so,
`libiomp.so` lives next to `libmkl_rt.so` and thus will be in the RPATH as a
sane default.

Since this still comes from the same src tarball, we can ship it without losing
the fixed-output derivation; likewise, since Hydra is not building or caching
these, shipping these proprietary packages costs no bandwidth for the nix
community.
    @bhipple @FRidh
    bhipple authored and FRidh committed Dec 19, 2018
    Copy the full SHA
    6206a34 View commit details
    Browse the repository at this point in the history