diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-02-16 18:32:21 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-02-16 18:32:21 +0000 |
commit | 9becdcc5df71b47a5da84ad670e9a7eae9e0c65a (patch) | |
tree | 2ddf0335eb393f89501e3753b50c3f7ab0552d12 /nixpkgs/pkgs/development/libraries/science | |
parent | 49f2a77ac9abc88c253f68952eda26557fc3b555 (diff) | |
parent | ff96a0fa5635770390b184ae74debea75c3fd534 (diff) | |
download | nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.gz nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.bz2 nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.lz nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.xz nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.zst nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.zip |
nixpkgs: merge nixos-unstable
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/science')
3 files changed, 9 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix index b631def3bb2e..34fea3162a9c 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , callPackage , stdenvNoCC , fetchurl @@ -135,7 +136,7 @@ in stdenvNoCC.mkDerivation { ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt} ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt} ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt} - '' + stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux '' + '' + lib.optionalString stdenvNoCC.hostPlatform.isLinux '' ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}".3" ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}".3" ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}".3" @@ -145,7 +146,7 @@ in stdenvNoCC.mkDerivation { # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the # larger updated load commands do not fit. Use install_name_tool # explicitly and ignore the error. - postFixup = stdenvNoCC.lib.optionalString stdenvNoCC.isDarwin '' + postFixup = lib.optionalString stdenvNoCC.isDarwin '' for f in $out/lib/*.dylib; do install_name_tool -id $out/lib/$(basename $f) $f || true done @@ -160,7 +161,7 @@ in stdenvNoCC.mkDerivation { passthru.tests.pkg-config = callPackage ./test { }; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "Intel Math Kernel Library"; longDescription = '' Intel Math Kernel Library (Intel MKL) optimizes code with minimal effort diff --git a/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix index 2c4198d9679a..5bfef9e8ba3b 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "openlibm"; - version = "0.7.3"; + version = "0.7.4"; src = fetchurl { url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz"; - sha256 = "0m3khv7qidhfly634bf5w0ci5qnvndmihc4a836a0cy047pw9g6k"; + sha256 = "sha256-61hSBNbJlWkeVUXqT/y4h8FZvwXMXuG7+Spvzd4vzK4="; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 7696b18e7ca4..151a0eef8916 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "3.3.3"; + version = "4.0.3"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "1nmygb2yny0mdqp0mc6760gbxklq1jjm0c6s39qkdwzf3n9f8j7p"; + sha256 = "sha256-Bf3+w/kQtFpeUGp2zWVqja535EbaUw7DbhCw54B6A8k="; }; nativeBuildInputs = [ |