diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-15 12:01:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-15 12:01:11 +0000 |
| commit | ef850861bca0d6061b4b7cd6a3714e2b107f3836 (patch) | |
| tree | d3e6ae002598f07db5db8a6dae748d17137e0a28 /pkgs/development/libraries | |
| parent | 080da2109e293299e56c4752b2cef28415619a12 (diff) | |
| parent | 5752bc84b0d9dd3ae4910275b0ffec9bb035d40e (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries')
4 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/development/libraries/openbabel/2.nix b/pkgs/development/libraries/openbabel/2.nix index 0cc752d993fb2..b69efd8664673 100644 --- a/pkgs/development/libraries/openbabel/2.nix +++ b/pkgs/development/libraries/openbabel/2.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libxml2 eigen python3 cairo pcre ]; + cmakeFlags = [ "-DCMAKE_CXX_STANDARD=14" ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { diff --git a/pkgs/development/libraries/parson/default.nix b/pkgs/development/libraries/parson/default.nix index 6ba47491ecb47..3ee5c73290a19 100644 --- a/pkgs/development/libraries/parson/default.nix +++ b/pkgs/development/libraries/parson/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { homepage = "https://github.com/kgabis/parson"; license = licenses.mit; platforms = platforms.all; - maintainers = [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index a87d107b3a17f..dfa157d05d655 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , cmake , gfortran , blas @@ -21,7 +22,13 @@ stdenv.mkDerivation rec { sha256 = "154mz52r5hm0jrp5fqrirzzbki14c1jkacj75flplnykbl36ibjs"; }; - patches = [ ./platform.patch ]; + patches = [ + ./platform.patch + (fetchpatch { + url = "https://github.com/clMathLibraries/clBLAS/commit/68ce5f0b824d7cf9d71b09bb235cf219defcc7b4.patch"; + hash = "sha256-XoVcHgJ0kTPysZbM83mUX4/lvXVHKbl7s2Q8WWiUnMs="; + }) + ]; postPatch = '' sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt diff --git a/pkgs/development/libraries/yyjson/default.nix b/pkgs/development/libraries/yyjson/default.nix index 82d4e1322f201..e1d42ccce7b6b 100644 --- a/pkgs/development/libraries/yyjson/default.nix +++ b/pkgs/development/libraries/yyjson/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/ibireme/yyjson"; changelog = "https://github.com/ibireme/yyjson/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; platforms = lib.platforms.all; }; }) |