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: 83dde6c52c72
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d1d536cc07f5
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 1, 2020

  1. openblas: 0.3.10 -> 0.3.12 

    https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.11
https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.12
    @TredwellGit @FRidh
    TredwellGit authored and FRidh committed Nov 1, 2020
    Copy the full SHA
    d1d536c View commit details
26 changes: 0 additions & 26 deletions ...braries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch
View file

This file was deleted.

10 changes: 2 additions & 8 deletions pkgs/development/libraries/science/math/openblas/default.nix
View file
Original file line number Diff line number Diff line change
@@ -106,15 +106,15 @@ let
in
stdenv.mkDerivation rec {
pname = "openblas";
version = "0.3.10";
version = "0.3.12";

outputs = [ "out" "dev" ];

src = fetchFromGitHub {
owner = "xianyi";
repo = "OpenBLAS";
rev = "v${version}";
sha256 = "174id98ga82bhz2v7sy9yj6pqy0h0088p3mkdikip69p9rh3d17b";
sha256 = "0mk1kjkr96bvvcq2zigzjrs0cnhwsf6gfi0855mp9yifn8lvp20y";
};

inherit blas64;
@@ -144,12 +144,6 @@ stdenv.mkDerivation rec {
buildPackages.stdenv.cc
];

# Disable an optimisation which seems to cause issues, pending an
# upstream fix: https://github.com/xianyi/OpenBLAS/issues/2496
patches = stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [
./0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch
];

makeFlags = mkMakeFlagsFromConfig (config // {
FC = "${stdenv.cc.targetPrefix}gfortran";
CC = "${stdenv.cc.targetPrefix}${if stdenv.cc.isClang then "clang" else "cc"}";