Merge master into staging-next

2019-05-24 12:39:37 +02:00
parent 7c62ef8685 c6f7545209
commit 6e4e7c5dc6
193 changed files with 3306 additions and 6412 deletions
--- a/pkgs/tools/security/b2sum/default.nix
+++ b/pkgs/tools/security/b2sum/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {

  buildInputs = [ openmp ];

-  buildFlags = [ (optional (isNull openmp) "NO_OPENMP=1") ];
+  buildFlags = [ (optional (openmp == null) "NO_OPENMP=1") ];
  installFlags = [ "PREFIX=$(out)" ];

  meta = {