diff options
Diffstat (limited to 'pkgs/development/libraries')
78 files changed, 487 insertions, 285 deletions
diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix index 25b9ba0fb5746..0a2954f4a7dd4 100644 --- a/pkgs/development/libraries/CoinMP/default.nix +++ b/pkgs/development/libraries/CoinMP/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + env = lib.optionalAttrs stdenv.cc.isClang { + CXXFLAGS = "-std=c++14"; + }; + hardeningDisable = [ "format" ]; meta = with lib; { diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index a472083c2569b..03b3f146ca939 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -1,20 +1,15 @@ { lib, stdenv, fetchurl , pkg-config , SDL2, libpng, libjpeg, libtiff, giflib, libwebp, libXpm, zlib, Foundation -, version ? "2.8.2" -, hash ? "sha256-j0hrv7z4Rk3VjJ5dkzlKsCVc5otRxalmqRgkSCCnbdw=" }: -let +stdenv.mkDerivation (finalAttrs: { pname = "SDL2_image"; -in - -stdenv.mkDerivation { - inherit pname version; + version = "2.8.2"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_image/release/${pname}-${version}.tar.gz"; - inherit hash; + url = "https://www.libsdl.org/projects/SDL_image/release/SDL2_image-${finalAttrs.version}.tar.gz"; + hash = "sha256-j0hrv7z4Rk3VjJ5dkzlKsCVc5otRxalmqRgkSCCnbdw="; }; nativeBuildInputs = [ pkg-config ]; @@ -44,4 +39,4 @@ stdenv.mkDerivation { license = licenses.zlib; maintainers = with maintainers; [ cpages ]; }; -} +}) diff --git a/pkgs/development/libraries/StormLib/default.nix b/pkgs/development/libraries/StormLib/default.nix deleted file mode 100644 index bc247e956235c..0000000000000 --- a/pkgs/development/libraries/StormLib/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, bzip2, libtomcrypt, zlib, darwin }: - -stdenv.mkDerivation rec { - pname = "StormLib"; - version = "9.22"; - - src = fetchFromGitHub { - owner = "ladislav-zezula"; - repo = "StormLib"; - rev = "v${version}"; - sha256 = "1rcdl6ryrr8fss5z5qlpl4prrw8xpbcdgajg2hpp0i7fpk21ymcc"; - }; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "FRAMEWORK DESTINATION /Library/Frameworks" "FRAMEWORK DESTINATION Library/Frameworks" - ''; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DWITH_LIBTOMCRYPT=ON" - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ bzip2 libtomcrypt zlib ] ++ - lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Carbon ]; - - meta = with lib; { - homepage = "https://github.com/ladislav-zezula/StormLib"; - license = licenses.mit; - description = "An open-source project that can work with Blizzard MPQ archives"; - platforms = platforms.all; - maintainers = with maintainers; [ aanderse karolchmist ]; - }; -} diff --git a/pkgs/development/libraries/ada/spark2014/default.nix b/pkgs/development/libraries/ada/spark2014/default.nix index b89a56a397b99..a52a5ac63f710 100644 --- a/pkgs/development/libraries/ada/spark2014/default.nix +++ b/pkgs/development/libraries/ada/spark2014/default.nix @@ -5,7 +5,6 @@ , gnatcoll-core , gprbuild , python3 -, ocaml , ocamlPackages , makeWrapper }: @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { gnat12 gprbuild python3 - ocaml + ocamlPackages.ocaml makeWrapper ]; diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index afd0ad458bf75..6f73c47f49d1a 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openexr, hdf5-threadsafe, ilmbase }: +{ lib, stdenv, fetchFromGitHub, cmake, openexr, hdf5-threadsafe }: stdenv.mkDerivation rec { @@ -20,13 +20,7 @@ stdenv.mkDerivation rec nativeBuildInputs = [ cmake ]; - # NOTE: Alembic also support imath instead of ilmbase, but some users of Alembic (e.g. Blender) - # are incompatible with the imath version of Alembic - buildInputs = [ openexr hdf5-threadsafe ilmbase ]; - - # Downstream packages trying to use Alembic via CMake need ilmbase as well - # For some reason this won't be picked up correctly otherwise - propagatedBuildInputs = [ ilmbase ]; + buildInputs = [ openexr hdf5-threadsafe ]; # These flags along with the postPatch step ensure that all artifacts end up # in the correct output without needing to move anything diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 3b9bbfeb244aa..eaf227fa60d14 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "allegro"; - version = "5.2.9.0"; + version = "5.2.9.1"; src = fetchFromGitHub { owner = "liballeg"; repo = "allegro5"; rev = version; - sha256 = "sha256-lGaHhFlc9zcalRFx0Xcyd0pZdC9lln0ez5hdfRz6Kt8="; + sha256 = "sha256-n2OCmZmAqeXjtnCTqJgQ5q4j8/lnPfH+5tpWKIFKle0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix index 8def8041ced98..57070c8f442e9 100644 --- a/pkgs/development/libraries/avro-c++/default.nix +++ b/pkgs/development/libraries/avro-c++/default.nix @@ -1,13 +1,30 @@ -{ lib, stdenv, fetchurl, cmake, boost, python3 }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, cmake +, boost +, python3 +}: stdenv.mkDerivation rec { pname = "avro-c++"; - version = "1.11.0"; + version = "1.11.3"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz"; - sha256 = "sha256-73DKihz+7XAX3LLA7VkTdN6rFhuGvmyksxK8JMranFY="; + hash = "sha256-+6JCrvd+yBnQdWH8upN1FyGVbejQyujh8vMAtUszG64="; }; + patches = [ + # This patch fixes boost compatibility and can be removed when + # upgrading beyond 1.11.3 https://github.com/apache/avro/pull/1920 + (fetchpatch { + name = "fix-boost-compatibility.patch"; + url = "https://github.com/apache/avro/commit/016323828f147f185d03f50d2223a2f50bfafce1.patch"; + hash = "sha256-hP/5J2JzSplMvg8EjEk98Vim8DfTyZ4hZ/WGiVwvM1A="; + }) + ]; + patchFlags = [ "-p3" ]; nativeBuildInputs = [ cmake python3 ]; buildInputs = [ boost ]; diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 753dda572d4cd..96593487bbeba 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "actor-framework"; - version = "0.19.4"; + version = "0.19.5"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - hash = "sha256-Qi3nyUSwrYBy8lCP+R6/u/WtnZJcgSwb07pZVScAzcU="; + hash = "sha256-G69qZ8aoaRP9Ug+BIhXrYs6xteUG3Zhxbo2O09LEh3s="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 32356fd9ccab7..50709cae8c0b7 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -3,28 +3,27 @@ , fetchFromGitHub , cmake , pkg-config -, fftw , libpng , libjpeg , libwebp -, openblas +, blas +, lapack +, config , guiSupport ? false , libX11 - - # see http://dlib.net/compile.html , sse4Support ? stdenv.hostPlatform.sse4_1Support , avxSupport ? stdenv.hostPlatform.avxSupport -, cudaSupport ? true -}: - -stdenv.mkDerivation rec { +, cudaSupport ? config.cudaSupport +, cudaPackages +}@inputs: +(if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv).mkDerivation rec { pname = "dlib"; version = "19.24.2"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; - rev ="v${version}"; + rev = "v${version}"; sha256 = "sha256-Z1fScuaIHjj2L1uqLIvsZ7ARKNjM+iaA8SAtWUTPFZk="; }; @@ -33,20 +32,53 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - (lib.cmakeBool "USE_DLIB_USE_CUDA" cudaSupport) (lib.cmakeBool "USE_SSE4_INSTRUCTIONS" sse4Support) (lib.cmakeBool "USE_AVX_INSTRUCTIONS" avxSupport) + (lib.cmakeBool "DLIB_USE_CUDA" cudaSupport) + ] ++ lib.optionals cudaSupport [ + (lib.cmakeFeature "DLIB_USE_CUDA_COMPUTE_CAPABILITIES" (builtins.concatStringsSep "," (with cudaPackages.flags; map dropDot cudaCapabilities))) ]; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optionals cudaSupport (with cudaPackages; [ + cuda_nvcc + ]); buildInputs = [ - fftw libpng libjpeg libwebp - openblas - ] ++ lib.optional guiSupport libX11; + blas + lapack + ] + ++ lib.optionals guiSupport [ libX11 ] + ++ lib.optionals config.cudaSupport (with cudaPackages; [ + cuda_cudart.dev + cuda_cudart.lib + cuda_cudart.static + cuda_nvcc.dev + libcublas.dev + libcublas.lib + libcublas.static + libcurand.dev + libcurand.lib + libcurand.static + libcusolver.dev + libcusolver.lib + libcusolver.static + cudnn.dev + cudnn.lib + cudnn.static + cuda_cccl.dev + ]); + + passthru = { + inherit + cudaSupport cudaPackages + sse4Support avxSupport; + }; meta = with lib; { description = "A general purpose cross-platform C++ machine learning library"; diff --git a/pkgs/development/libraries/draco/default.nix b/pkgs/development/libraries/draco/default.nix index ee2c5b8e5b726..c4ed0730cdacf 100644 --- a/pkgs/development/libraries/draco/default.nix +++ b/pkgs/development/libraries/draco/default.nix @@ -16,14 +16,14 @@ let cmakeBool = b: if b then "ON" else "OFF"; in stdenv.mkDerivation (finalAttrs: { - version = "1.5.6"; + version = "1.5.7"; pname = "draco"; src = fetchFromGitHub { owner = "google"; repo = "draco"; rev = finalAttrs.version; - hash = "sha256-2YQMav0JJMbJ2bvnN/Xv90tjE/OWLbrZDO4WlaOvcfI="; + hash = "sha256-p0Mn4kGeBBKL7Hoz4IBgb6Go6MdkgE7WZgxAnt1tE/0="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index a393d9577fc11..546824ec8e242 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "23.12"; + version = "24.01"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-bftS5gcIzvJlv9K2hKIIXl5lzP4RVwSK5/kxpQrJe/A="; + sha256 = "sha256-9/hgGrMtEz2CXZUPVMT1aSwDMlb+eQ9soTp1X1uME7I="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 512ec3a4bf168..9d4369003e47d 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -86,7 +86,7 @@ , withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # Vaapi hardware acceleration , withVdpau ? withSmallDeps # Vdpau hardware acceleration , withVidStab ? withFullDeps # Video stabilization -, withVmaf ? withFullDeps && withGPLv3 && !stdenv.isAarch64 # Netflix's VMAF (Video Multi-Method Assessment Fusion) +, withVmaf ? withFullDeps && withGPLv3 && !stdenv.isAarch64 && lib.versionAtLeast version "5" # Netflix's VMAF (Video Multi-Method Assessment Fusion) , withVoAmrwbenc ? withFullDeps # AMR-WB encoder , withVorbis ? withHeadlessDeps # Vorbis de/encoding, native encoder exists , withVpx ? withHeadlessDeps && stdenv.buildPlatform == stdenv.hostPlatform # VP8 & VP9 de/encoding diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix index 0215b82a828cc..fcdec34ac4259 100644 --- a/pkgs/development/libraries/frei0r/default.nix +++ b/pkgs/development/libraries/frei0r/default.nix @@ -1,7 +1,7 @@ { lib , config , stdenv -, fetchurl +, fetchFromGitHub , cairo , cmake , opencv @@ -13,11 +13,13 @@ stdenv.mkDerivation rec { pname = "frei0r-plugins"; - version = "1.8.0"; + version = "2.3.1"; - src = fetchurl { - url = "https://files.dyne.org/frei0r/releases/${pname}-${version}.tar.gz"; - hash = "sha256-RaKGVcrwVyJ7RCuADKOJnpNJBRXIHiEtIZ/fSnYT9cQ="; + src = fetchFromGitHub { + owner = "dyne"; + repo = "frei0r"; + rev = "v${version}"; + hash = "sha256-5itlZfnloQXV/aCiNgOOZzEeO1d+NLY4qSk8uMVAOmA="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/functionalplus/default.nix b/pkgs/development/libraries/functionalplus/default.nix index b456dd8873448..af25030ab560f 100644 --- a/pkgs/development/libraries/functionalplus/default.nix +++ b/pkgs/development/libraries/functionalplus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "functionalplus"; - version = "0.2.20-p0"; + version = "0.2.22"; src = fetchFromGitHub { owner = "Dobiasd"; repo = "FunctionalPlus"; rev = "v${version}"; - sha256 = "sha256-PKd3gx63VTxyq1q0v7WaKXVA0oICpZQfVsKsgUml9wk="; + sha256 = "sha256-y0IRmgG9lhWO4IR4G9/VP2a3B+ORTnF7MCf4FU5EuMk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/hpp-fcl/default.nix b/pkgs/development/libraries/hpp-fcl/default.nix index 98748de393d55..c91d3cbaac4f8 100644 --- a/pkgs/development/libraries/hpp-fcl/default.nix +++ b/pkgs/development/libraries/hpp-fcl/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "hpp-fcl"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "humanoid-path-planner"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-qeAO1FV28L2nbQ/2mDeLMuWS2+FexQ1ORCtt+ztWHj0="; + hash = "sha256-Suow6dvDZI0uS/CkzfkWIxYjn+i4Fbyd2EnqlxM2gMY="; }; strictDeps = true; diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index 2464e95c6b6d7..bcaf1233d3006 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -1,18 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, asio, boost, cmake, hwloc, gperftools, ninja -, pkg-config, python3 }: +{ lib +, stdenv +, fetchFromGitHub +, asio +, boost +, cmake +, hwloc +, gperftools +, ninja +, pkg-config +, python3 +}: stdenv.mkDerivation rec { pname = "hpx"; - version = "1.8.1"; + version = "1.9.1"; src = fetchFromGitHub { owner = "STEllAR-GROUP"; repo = "hpx"; - rev = version; - sha256 = "sha256-YJ4wHaPE5E6ngUAYrQB1SkW4IoHW71tUDKKNANVA9Xw="; + rev = "v${version}"; + hash = "sha256-1gLDwgCqv+3+rOSG7a3fFsnjqfKpnPpWnBmrW+z+jWw="; }; - buildInputs = [ asio boost hwloc gperftools ]; + propagatedBuildInputs = [ hwloc ]; + buildInputs = [ asio boost gperftools ]; nativeBuildInputs = [ cmake pkg-config python3 ]; strictDeps = true; diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index 73bc80ef9d5bf..79186d9149f79 100644 --- a/pkgs/development/libraries/imgui/default.nix +++ b/pkgs/development/libraries/imgui/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgui"; - version = "1.90"; + version = "1.90.1"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-rJMWCPVhho34NcPvJZaB5d6EbZkJyLXEfeotplOOaiA="; + sha256 = "sha256-gf47uLeNiXQic43buB5ZnMqiotlUfIyAsP+3H7yJuFg="; }; dontBuild = true; diff --git a/pkgs/development/libraries/imtui/default.nix b/pkgs/development/libraries/imtui/default.nix index e534a55ae5a42..86b488c1a888d 100644 --- a/pkgs/development/libraries/imtui/default.nix +++ b/pkgs/development/libraries/imtui/default.nix @@ -8,6 +8,7 @@ , withCurl ? (!withEmscripten), curl , withNcurses ? (!withEmscripten), ncurses , static ? withEmscripten +, darwin }: stdenv.mkDerivation rec { @@ -25,10 +26,14 @@ stdenv.mkDerivation rec { buildInputs = lib.optional withEmscripten emscripten ++ lib.optional withCurl curl - ++ lib.optional withNcurses ncurses; + ++ lib.optional withNcurses ncurses + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; postPatch = '' cp -r ${imgui}/include/imgui third-party/imgui + '' + lib.optionalString (lib.versionAtLeast imgui.version "1.90.1") '' + substituteInPlace src/imtui-impl-{emscripten,ncurses}.cpp \ + --replace "ImGuiKey_KeyPadEnter" "ImGuiKey_KeypadEnter" ''; cmakeFlags = [ @@ -54,5 +59,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/ggerganov/imtui/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ azahi ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 4cd31f74058b8..58eba3ddc6d9b 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.3.16"; + version = "22.3.17"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-6cN7qnFpVe362u4o0bZMKlUq1/eCpPZF0nBgon9Eav4="; + sha256 = "sha256-9utlENByIQSayKTdSJapLBWMI2gFpOReNZe7bpbEoj8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/isa-l/default.nix b/pkgs/development/libraries/isa-l/default.nix index a8b0afa41d219..d81f1120742ae 100644 --- a/pkgs/development/libraries/isa-l/default.nix +++ b/pkgs/development/libraries/isa-l/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "isa-l"; - version = "2.30.0"; + version = "2.31.0"; src = fetchFromGitHub { owner = "intel"; repo = "isa-l"; rev = "v${version}"; - sha256 = "sha256-AAuSdDQfDW4QFRu0jHwCZ+ZCSjoVqlQiSW1OOFye1Rs="; + sha256 = "sha256-xBBtpjtWyba0DogdLobtuWmiiAHTXMK4oRnjYuTUCNk="; }; nativeBuildInputs = [ nasm autoreconfHook ]; diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix index e2db993707e21..652fce4a67978 100644 --- a/pkgs/development/libraries/itk/generic.nix +++ b/pkgs/development/libraries/itk/generic.nix @@ -1,6 +1,6 @@ { version, rev, sourceSha256 }: -{ lib, stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake , expat, fftw, gdcm, hdf5-cpp, libjpeg, libminc, libtiff, libpng , libX11, libuuid, xz, vtk, zlib, Cocoa }: @@ -38,6 +38,14 @@ stdenv.mkDerivation { sha256 = sourceSha256; }; + patches = [ + (fetchpatch { + name = "fix-gcc13-build"; + url = "https://github.com/InsightSoftwareConsortium/ITK/commit/9a719a0d2f5f489eeb9351b0ef913c3693147a4f.patch"; + hash = "sha256-dDyqYOzo91afR8W7k2N64X6l7t6Ws1C9iuRkWHUe0fg="; + }) + ]; + postPatch = '' substituteInPlace CMake/ITKSetStandardCompilerFlags.cmake \ --replace "-march=corei7" "" \ diff --git a/pkgs/development/libraries/kdsoap/default.nix b/pkgs/development/libraries/kdsoap/default.nix index c2f94b8e69276..5dc6b5f962e1f 100644 --- a/pkgs/development/libraries/kdsoap/default.nix +++ b/pkgs/development/libraries/kdsoap/default.nix @@ -11,11 +11,11 @@ let cmakeName = if isQt6 then "KDSoap-qt6" else "KDSoap"; in stdenv.mkDerivation rec { pname = "kdsoap"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { url = "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz"; - sha256 = "sha256-rtV/ayAN33YvXSiY9+kijdBwCIHESRrv5ABvf6X1xic="; + sha256 = "sha256-2e8RlIRCGXyfpEvW+63IQrcoCmDfxAV3r2b97WN681Y="; }; outputs = [ "out" "dev" ]; @@ -28,10 +28,8 @@ in stdenv.mkDerivation rec { postInstall = '' moveToOutput bin/kdwsdl2cpp* "$dev" - sed -i "$out/lib/cmake/${cmakeName}/KDSoapTargets.cmake" \ - -e "/^ INTERFACE_INCLUDE_DIRECTORIES/ c INTERFACE_INCLUDE_DIRECTORIES \"$dev/include\"" - sed -i "$out/lib/cmake/${cmakeName}/KDSoapTargets-release.cmake" \ - -e "s@$out/bin@$dev/bin@" + substituteInPlace "$out/lib/cmake/${cmakeName}/KDSoapTargets-release.cmake" \ + --replace $out/bin $dev/bin ''; meta = with lib; { diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix index 37c007db20b4c..57fe21a27c7b5 100644 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -1,26 +1,28 @@ { lib, stdenv, fetchFromGitHub, opencl-headers, cmake, withTracing ? false }: stdenv.mkDerivation rec { - pname = "khronos-ocl-icd-loader"; - version = "2022.01.04"; + pname = "opencl-icd-loader"; + version = "2023.12.14"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-ICD-Loader"; rev = "v${version}"; - sha256 = "sha256-T2tBoN0yv41W+UksFABVjsetdkXlnEFUINfxumGgC04="; + hash = "sha256-/4ixQAwJpygdg+qtR1ccBlz8hmtYYxRgUV5dlJabsg8="; }; - patches = lib.optional withTracing ./tracing.patch; - nativeBuildInputs = [ cmake ]; buildInputs = [ opencl-headers ]; + cmakeFlags = [ + (lib.cmakeBool "OCL_ICD_ENABLE_TRACE" withTracing) + ]; + meta = with lib; { description = "Official Khronos OpenCL ICD Loader"; homepage = "https://github.com/KhronosGroup/OpenCL-ICD-Loader"; license = licenses.asl20; - platforms = platforms.linux; maintainers = with maintainers; [ davidtwco ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch b/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch deleted file mode 100644 index cef22457e5a1e..0000000000000 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/loader/icd.h b/loader/icd.h -index 34751e9..01a33fd 100644 ---- a/loader/icd.h -+++ b/loader/icd.h -@@ -123,7 +123,7 @@ void khrIcdContextPropertiesGetPlatform( - cl_platform_id *outPlatform); - - // internal tracing macros --#if 0 -+#if 1 - #include <stdio.h> - #define KHR_ICD_TRACE(...) \ - do \ diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index 08921c2ca3c07..12cd3f074fcbc 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "leptonica"; - version = "1.84.0"; + version = "1.84.1"; src = fetchurl { url = "https://github.com/DanBloomberg/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-QqApMSod8M1WQBlal5voG/ZiMOFTFkysRWR4RU5yBtU="; + hash = "sha256-Kz4SVLHMo4HnfIGbWcqZd0/0NTAgm5rrUR4dRliKZPY="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libayatana-common/default.nix b/pkgs/development/libraries/libayatana-common/default.nix index 216e05f6709c1..439cc45031f95 100644 --- a/pkgs/development/libraries/libayatana-common/default.nix +++ b/pkgs/development/libraries/libayatana-common/default.nix @@ -4,11 +4,11 @@ , gitUpdater , testers , cmake -, cmake-extras , glib , gobject-introspection , gtest , intltool +, lomiri , pkg-config , systemd , vala @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # Queries via pkg_get_variable, can't override prefix substituteInPlace data/CMakeLists.txt \ - --replace 'DESTINATION "''${SYSTEMD_USER_UNIT_DIR}"' 'DESTINATION "${placeholder "out"}/lib/systemd/user"' + --replace 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemd_user_unit_dir)' 'set(SYSTEMD_USER_UNIT_DIR ''${CMAKE_INSTALL_PREFIX}/lib/systemd/user)' ''; strictDeps = true; @@ -42,8 +42,9 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - cmake-extras + lomiri.cmake-extras glib + lomiri.lomiri-url-dispatcher systemd ]; @@ -53,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DENABLE_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}" - "-DENABLE_LOMIRI_FEATURES=OFF" + "-DENABLE_LOMIRI_FEATURES=ON" "-DGSETTINGS_LOCALINSTALL=ON" "-DGSETTINGS_COMPILE=ON" ]; diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix index e90078b0c8405..3d8cf70b0db6e 100644 --- a/pkgs/development/libraries/libcint/default.nix +++ b/pkgs/development/libraries/libcint/default.nix @@ -9,15 +9,19 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "5.4.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - hash = "sha256-U+ZlD/I7RHtdYNbFhAmeU4qREe45dYJDIAC3Bup2tr0="; + hash = "sha256-qcVVp+81S3Y0fxDWA/PWQeFT2g0N6tIHNUaOHSru2GA="; }; + postPatch = '' + sed -i 's/libcint.so/libcint${stdenv.hostPlatform.extensions.sharedLibrary}/g' testsuite/*.py + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ blas ]; cmakeFlags = [ @@ -46,5 +50,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/sunqm/libcint/blob/master/ChangeLog"; license = licenses.bsd2; maintainers = with maintainers; [ drewrisinger ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 0f96083100c23..006933a4de035 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,8 +1,12 @@ -{ callPackage, zlib }: +{ callPackage +, zlib +, zstd +}: + callPackage ./common.nix rec { - version = "0.4.2"; + version = "0.9.0"; url = "https://www.prevanders.net/libdwarf-${version}.tar.xz"; - hash = "sha512-bSo+vwEENi3Zzs7CcpNWhPl32xGYEO6g7siMn1agQvJgpPbtO7q96Fkv4W+Yy9gbSrKHgAUUDgXI9HXfY4DRwg=="; - buildInputs = [ zlib ]; + hash = "sha512-KC2Q38nacE62SkuhFB8q5mD+6xS78acjdzhmmOMSSSi0SmkU2OiOYUGrCINc5yOtCQqFOtV9vLQ527pXJV+1iQ=="; + buildInputs = [ zlib zstd ]; knownVulnerabilities = []; } diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index f0eb267b05b57..d8c7be41f4a10 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { # There is a DR to fix this issue with Clang which is not merged # yet. # https://reviews.llvm.org/D137043 - NIX_CFLAGS_COMPILE = lib.optional - (stdenv.targetPlatform.isMusl && stdenv.cc.isClang) - "-D__STDC_ISO_10646__=201103L"; + env.NIX_CFLAGS_COMPILE = + lib.optionalString (stdenv.targetPlatform.isMusl && stdenv.cc.isClang) + "-D__STDC_ISO_10646__=201103L"; patches = [ ./01-cygwin.patch ]; diff --git a/pkgs/development/libraries/libewf-legacy/default.nix b/pkgs/development/libraries/libewf-legacy/default.nix new file mode 100644 index 0000000000000..4cfbceb0089ce --- /dev/null +++ b/pkgs/development/libraries/libewf-legacy/default.nix @@ -0,0 +1,32 @@ +{ lib +, fetchurl +, fetchpatch +, stdenv +, zlib +, openssl +, libuuid +, pkg-config +, bzip2 +}: + +stdenv.mkDerivation rec { + pname = "libewf-ewf"; + version = "20140814"; + + src = fetchurl { + url = "https://github.com/libyal/libewf-legacy/releases/download/${version}/libewf-${version}.tar.gz"; + hash = "sha256-OM3QXwnaIDeo66UNjzmu6to53SxgCMn/rE9VTPlX5BQ="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ zlib openssl libuuid ] + ++ lib.optionals stdenv.isDarwin [ bzip2 ]; + + meta = { + description = "Legacy library for support of the Expert Witness Compression Format"; + homepage = "https://sourceforge.net/projects/libewf/"; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ d3vil0p3r ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libfabric/default.nix b/pkgs/development/libraries/libfabric/default.nix index 34089dbdcaa8b..ab92befa9ed85 100644 --- a/pkgs/development/libraries/libfabric/default.nix +++ b/pkgs/development/libraries/libfabric/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.20.0"; + version = "1.20.1"; enableParallelBuilding = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-woRkm/5kLIv1ypSlCosP/ewYgnSXQJYzkuOqdHvEH8I="; + sha256 = "sha256-rQzsh3Q2xaGwmmsfvUmFE8WbAb1e2JEvunSoqZYRHvE="; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix index 96b8e3c02937a..558e6d6fa894e 100644 --- a/pkgs/development/libraries/libhdhomerun/default.nix +++ b/pkgs/development/libraries/libhdhomerun/default.nix @@ -6,34 +6,37 @@ stdenv.mkDerivation rec { pname = "libhdhomerun"; - version = "20220303"; + version = "20231214"; src = fetchurl { url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${version}.tgz"; - sha256 = "sha256-HlT/78LUiTkRUB2jHmYrnQY+bBiv4stcZlMyUnelSpc="; + hash = "sha256-VSoQLoqiq8xBYJDewvb4DaWfl/kfV5aOnp17PcAF268="; }; - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile \ - --replace "-arch x86_64" "-arch ${stdenv.hostPlatform.darwinArch}" - ''; + patches = [ + ./nixos-darwin-no-fat-dylib.patch + ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' + runHook preInstall + mkdir -p $out/{bin,lib,include/hdhomerun} install -Dm444 libhdhomerun${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib install -Dm555 hdhomerun_config $out/bin cp *.h $out/include/hdhomerun + + runHook postInstall ''; meta = with lib; { description = "Implements the libhdhomerun protocol for use with Silicondust HDHomeRun TV tuners"; homepage = "https://www.silicondust.com/support/linux"; license = licenses.lgpl21Only; + maintainers = with maintainers; [ sielicki titanous ]; platforms = platforms.unix; - maintainers = [ maintainers.titanous ]; }; } diff --git a/pkgs/development/libraries/libhdhomerun/nixos-darwin-no-fat-dylib.patch b/pkgs/development/libraries/libhdhomerun/nixos-darwin-no-fat-dylib.patch new file mode 100644 index 0000000000000..99c389a19434f --- /dev/null +++ b/pkgs/development/libraries/libhdhomerun/nixos-darwin-no-fat-dylib.patch @@ -0,0 +1,52 @@ +From 6b9ed19d7874b88b7db5b740dac3dcd7dcda6c8c Mon Sep 17 00:00:00 2001 +From: Nicholas Sielicki <git@opensource.nslick.com> +Date: Sat, 25 Nov 2023 13:54:39 -0600 +Subject: [PATCH] nixos-darwin-no-fat-dylib + +Signed-off-by: Nicholas Sielicki <git@opensource.nslick.com> +--- + Makefile | 24 ++++-------------------- + 1 file changed, 4 insertions(+), 20 deletions(-) + +diff --git a/Makefile b/Makefile +index 1d8fb9f..35c7d15 100644 +--- a/Makefile ++++ b/Makefile +@@ -42,30 +42,14 @@ LIBSRCS += hdhomerun_video.c + + ifeq ($(OS),Darwin) + +-TARGET_X64 := -target x86_64-apple-macos10.11 +-TARGET_ARM64 := -target arm64-apple-macos11 +- + all : hdhomerun_config libhdhomerun.dylib + +-hdhomerun_config_x64 : hdhomerun_config.c $(LIBSRCS) +- $(CC) $(TARGET_X64) $(CFLAGS) $+ $(LDFLAGS) -o $@ +- $(STRIP) $@ +- +-hdhomerun_config_arm64 : hdhomerun_config.c $(LIBSRCS) +- $(CC) $(TARGET_ARM64) $(CFLAGS) $+ $(LDFLAGS) -o $@ ++hdhomerun_config: hdhomerun_config.c $(LIBSRCS) ++ $(CC) $(CFLAGS) $+ $(LDFLAGS) -o $@ + $(STRIP) $@ + +-hdhomerun_config : hdhomerun_config_x64 hdhomerun_config_arm64 +- lipo -create -output hdhomerun_config hdhomerun_config_x64 hdhomerun_config_arm64 +- +-libhdhomerun_x64.dylib : $(LIBSRCS) +- $(CC) $(TARGET_X64) $(CFLAGS) -DDLL_EXPORT -fPIC -dynamiclib $+ $(LDFLAGS) -o $@ +- +-libhdhomerun_arm64.dylib : $(LIBSRCS) +- $(CC) $(TARGET_ARM64) $(CFLAGS) -DDLL_EXPORT -fPIC -dynamiclib $+ $(LDFLAGS) -o $@ +- +-libhdhomerun.dylib : libhdhomerun_x64.dylib libhdhomerun_arm64.dylib +- lipo -create -output libhdhomerun.dylib libhdhomerun_x64.dylib libhdhomerun_arm64.dylib ++libhdhomerun.dylib : $(LIBSRCS) ++ $(CC) $(CFLAGS) -DDLL_EXPORT -fPIC -dynamiclib $+ $(LDFLAGS) -o $@ + + else + +-- +2.42.0 + diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix index 4c12e261f442c..5f914485993a0 100644 --- a/pkgs/development/libraries/libime/default.nix +++ b/pkgs/development/libraries/libime/default.nix @@ -11,9 +11,10 @@ }: let + tableVer = "20240108"; table = fetchurl { - url = "https://download.fcitx-im.org/data/table.tar.gz"; - sha256 = "1dw7mgbaidv3vqy0sh8dbfv8631d2zwv5mlb7npf69a1f8y0b5k1"; + url = "https://download.fcitx-im.org/data/table-${tableVer}.tar.gz"; + hash = "sha256-cpxZbYaQfecnx00Pw/0kHEBsXevStMt07v4CI4funa4="; }; arpaVer = "20230712"; arpa = fetchurl { @@ -28,13 +29,13 @@ let in stdenv.mkDerivation rec { pname = "libime"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; rev = version; - sha256 = "sha256-cjlclemt4xsQcpmZ8CflN79QkOE4m07O4hLOQcLF1nA="; + hash = "sha256-AvlQOpjrHSifUtWSTft2bywlWhwka26VcqqReqAlcv8="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index bbcae6ab19d14..6d9481d1da2d0 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.2.0"; + version = "0.2.1"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "sha256-nLn2s9hX9f6I1Avxzs24ZPQHglJqKSUTpBpwskVyJKw="; + sha256 = "sha256-tCXz62MEqYBnrx2RxlTBwKGTahfhUCVdet4VnXw5klQ="; }; patches = [ diff --git a/pkgs/development/libraries/libnbd/default.nix b/pkgs/development/libraries/libnbd/default.nix index ff90c9b116ad6..5889c8ef12d55 100644 --- a/pkgs/development/libraries/libnbd/default.nix +++ b/pkgs/development/libraries/libnbd/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , bash-completion , pkg-config , perl @@ -13,21 +12,13 @@ stdenv.mkDerivation rec { pname = "libnbd"; - version = "1.18.1"; + version = "1.18.2"; src = fetchurl { url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; - hash = "sha256-UNHRphDw1ycRnp0KClzHlSuLIxs5Mc4gcjB+EF/smbY="; + hash = "sha256-OYtNHAIGgwJuapoJNEMVkurUK9bQ7KO+V223bGC0TFI="; }; - patches = [ - (fetchpatch { - name = "CVE-2023-5871.patch"; - url = "https://gitlab.com/nbdkit/libnbd/-/commit/4451e5b61ca07771ceef3e012223779e7a0c7701.patch"; - hash = "sha256-zmg/kxSJtjp2w9917Sp33ezt7Ccj/inngzCUVesF1Tc="; - }) - ]; - nativeBuildInputs = [ bash-completion pkg-config diff --git a/pkgs/development/libraries/liboqs/default.nix b/pkgs/development/libraries/liboqs/default.nix index c2a0216a34e1c..4962f9459d79d 100644 --- a/pkgs/development/libraries/liboqs/default.nix +++ b/pkgs/development/libraries/liboqs/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-h3mXoGRYgPg0wKQ1u6uFP7wlEUMQd5uIBt4Hr7vjNtA="; }; + patches = [ ./fix-openssl-detection.patch ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ openssl ]; diff --git a/pkgs/development/libraries/liboqs/fix-openssl-detection.patch b/pkgs/development/libraries/liboqs/fix-openssl-detection.patch new file mode 100644 index 0000000000000..33be7188370f9 --- /dev/null +++ b/pkgs/development/libraries/liboqs/fix-openssl-detection.patch @@ -0,0 +1,36 @@ +From 6bdcf53de74ac2afba42deea63522939ca51f871 Mon Sep 17 00:00:00 2001 +From: Raphael Robatsch <raphael-git@tapesoftware.net> +Date: Mon, 25 Dec 2023 16:15:29 +0000 +Subject: [PATCH] Do not forcibly set OPENSSL_ROOT_DIR. + +CMake can already find OpenSSL via pkg-config. Setting OPENSSL_ROOT_DIR +forcibly to "/usr" breaks this. +--- + CMakeLists.txt | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 288bcbe8..9750fae6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -119,17 +119,6 @@ include(.CMake/compiler_opts.cmake) + include(.CMake/alg_support.cmake) + + if(${OQS_USE_OPENSSL}) +- if(NOT DEFINED OPENSSL_ROOT_DIR) +- if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin") +- if(EXISTS "/usr/local/opt/openssl@1.1") +- set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl@1.1") +- elseif(EXISTS "/opt/homebrew/opt/openssl@1.1") +- set(OPENSSL_ROOT_DIR "/opt/homebrew/opt/openssl@1.1") +- endif() +- elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux") +- set(OPENSSL_ROOT_DIR "/usr") +- endif() +- endif() + find_package(OpenSSL 1.1.1 REQUIRED) + endif() + +-- +2.42.0 + diff --git a/pkgs/development/libraries/libremidi/default.nix b/pkgs/development/libraries/libremidi/default.nix index d88ebeea3fb5a..753bcef433fd9 100644 --- a/pkgs/development/libraries/libremidi/default.nix +++ b/pkgs/development/libraries/libremidi/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "A modern C++ MIDI real-time & file I/O library"; homepage = "https://github.com/jcelerier/libremidi"; - maintainers = [ lib.maintainers.paveloom ]; + maintainers = [ ]; license = lib.licenses.bsd2; platforms = lib.platforms.all; }; diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 613f7d3a2b347..740d84072d1e3 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -87,6 +87,15 @@ let platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice fpletz ]; inherit knownVulnerabilities; + + # OpenBSD believes that PowerPC should be always-big-endian; + # this assumption seems to have propagated into recent + # releases of libressl. Since libressl is aliased to many + # other packages (e.g. netcat) it's important to fail early + # here, otherwise it's very difficult to figure out why + # libressl is getting dragged into a failing build. + badPlatforms = with lib.systems.inspect.patterns; + [ (lib.recursiveUpdate isPower64 isLittleEndian) ]; }; }; diff --git a/pkgs/development/libraries/librist/darwin.patch b/pkgs/development/libraries/librist/darwin.patch index f9571fd434f7d..6a5cc8459a367 100644 --- a/pkgs/development/libraries/librist/darwin.patch +++ b/pkgs/development/libraries/librist/darwin.patch @@ -1,3 +1,5 @@ +diff --git a/tools/srp_shared.c b/tools/srp_shared.c +index f782126..23e82a5 100644 --- a/tools/srp_shared.c +++ b/tools/srp_shared.c @@ -173,7 +173,11 @@ void user_verifier_lookup(char * username, @@ -5,9 +7,9 @@ return; +#if defined(__APPLE__) -+ *generation = (buf.st_mtimespec.tv_sec << 32) | buf.st_mtimespec.tv_nsec; ++ *generation = ((uint64_t)buf.st_mtimespec.tv_sec << 32) | buf.st_mtimespec.tv_nsec; +#else - *generation = (buf.st_mtim.tv_sec << 32) | buf.st_mtim.tv_nsec; + *generation = ((uint64_t)buf.st_mtim.tv_sec << 32) | buf.st_mtim.tv_nsec; +#endif #endif diff --git a/pkgs/development/libraries/librist/default.nix b/pkgs/development/libraries/librist/default.nix index c883530907035..3f56ff3248767 100644 --- a/pkgs/development/libraries/librist/default.nix +++ b/pkgs/development/libraries/librist/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "librist"; - version = "0.2.8"; + version = "0.2.10"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "rist"; repo = "librist"; rev = "v${version}"; - hash = "sha256-E12TS+N47UQapkF6oO0Lx66Z3lHAyP0R4tVnx/uKBwQ="; + hash = "sha256-8N4wQXxjNZuNGx/c7WVAV5QS48Bff5G3t11UkihT+K0="; }; patches = [ diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index 2bcc5d0498c4c..09837cd0c1d87 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "libubox"; - version = "unstable-2023-11-28"; + version = "unstable-2023-12-18"; src = fetchgit { url = "https://git.openwrt.org/project/libubox.git"; - rev = "e80dc00ee90c29ef56ae28f414b0e5bb361206e7"; - hash = "sha256-R4Yz4C63LQTNBKyNyiLMQHfc5KJBPFldP1trmtEBb9U="; + rev = "6339204c212b2c3506554a8842030df5ec6fe9c6"; + hash = "sha256-QgpORITt6MYgfzUpaI2T0Ge2a0iVHjDhdYI/nZ2HbJ8="; }; cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" (if with_lua then "-DLUAPATH=${placeholder "out"}/lib/lua" else "-DBUILD_LUA=OFF") ]; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 6f05307381a09..879f6f449b3cf 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -29,7 +29,11 @@ stdenv.mkDerivation rec { # Without latex2man, no man pages are installed despite being # prebuilt in the source tarball. - configureFlags = [ "LATEX2MAN=${buildPackages.coreutils}/bin/true" ]; + configureFlags = [ "LATEX2MAN=${buildPackages.coreutils}/bin/true" ] + # See https://github.com/libunwind/libunwind/issues/693 + ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isMusl) [ + "CFLAGS=-mno-outline-atomics" + ]; propagatedBuildInputs = [ xz ]; @@ -46,7 +50,19 @@ stdenv.mkDerivation rec { description = "A portable and efficient API to determine the call-chain of a program"; maintainers = with maintainers; [ orivej ]; # https://github.com/libunwind/libunwind#libunwind - platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-freebsd13" "i686-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "x86_64-freebsd13" "x86_64-linux" "x86_64-solaris" ]; + platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-freebsd13" "i686-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "s390x-linux" "x86_64-freebsd13" "x86_64-linux" "x86_64-solaris" ]; + # libunwind relies on getcontext/setcontext, + # and only has a musl implementation for some platforms + # https://github.com/libunwind/libunwind/issues/33 + # https://github.com/libunwind/libunwind/issues/69 + badPlatforms = [ { + isAarch64 = false; + isRiscV64 = false; + isS390x = false; + isx86_64 = false; + isMusl = true; + parsed = {}; + } ]; license = licenses.mit; }; } diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix index 31508b01fbd0a..0d7c098255f24 100644 --- a/pkgs/development/libraries/libvgm/default.nix +++ b/pkgs/development/libraries/libvgm/default.nix @@ -40,15 +40,15 @@ let inherit (lib) optional optionals; onOff = val: if val then "ON" else "OFF"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libvgm"; - version = "unstable-2023-08-14"; + version = "unstable-2024-01-03"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "libvgm"; - rev = "079c4e737e6a73b38ae20125521d7d9eafda28e9"; - sha256 = "hmaGIf9AQOYqrpnmKAB9I2vO+EXrzvoRaQ6Epdygy4o="; + rev = "223b6f9d629feda1982dc4bbeebd19fa63b987fb"; + hash = "sha256-CrqgDuOsY+Hpp41De6oWJduj8d8ftMUanMEWJKh79rw="; }; outputs = [ diff --git a/pkgs/development/libraries/mbedtls/2.nix b/pkgs/development/libraries/mbedtls/2.nix index 18793114c2190..b5d8da1016181 100644 --- a/pkgs/development/libraries/mbedtls/2.nix +++ b/pkgs/development/libraries/mbedtls/2.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { - version = "2.28.5"; - hash = "sha256-Gl4UQMSvAwYbOi2b/AUMz+zgkOl1o0UA2VveF/3ek8o="; + version = "2.28.6"; + hash = "sha256-1YyA3O0/u7Tcf8rhNmrMGF64/tnitQH65THpXa7N7P8="; } diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/development/libraries/mbedtls/3.nix index ca069cca1ead2..fe463c43f91db 100644 --- a/pkgs/development/libraries/mbedtls/3.nix +++ b/pkgs/development/libraries/mbedtls/3.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { - version = "3.5.0"; - hash = "sha256-uHHQmaAmFS8Vd7PrAfRpK+aNi3pJ76XBC7rFWcd16NU="; + version = "3.5.1"; + hash = "sha256-HxsHcGbSExp1aG5yMR/J3kPL4zqnmNoN5T5wfV3APaw="; } diff --git a/pkgs/development/libraries/mbedtls/generic.nix b/pkgs/development/libraries/mbedtls/generic.nix index 3ca0b491fb89b..2e79a593b7c31 100644 --- a/pkgs/development/libraries/mbedtls/generic.nix +++ b/pkgs/development/libraries/mbedtls/generic.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { homepage = "https://www.trustedfirmware.org/projects/mbed-tls/"; changelog = "https://github.com/Mbed-TLS/mbedtls/blob/${pname}-${version}/ChangeLog"; description = "Portable cryptographic and TLS library, formerly known as PolarSSL"; - license = licenses.asl20; + license = [ licenses.asl20 /* or */ licenses.gpl2Plus ]; platforms = platforms.all; maintainers = with maintainers; [ raphaelr ]; }; diff --git a/pkgs/development/libraries/mdk-sdk/default.nix b/pkgs/development/libraries/mdk-sdk/default.nix index 1bf8992f948c7..711833cbda8a5 100644 --- a/pkgs/development/libraries/mdk-sdk/default.nix +++ b/pkgs/development/libraries/mdk-sdk/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mdk-sdk"; - version = "0.23.1"; + version = "0.24.0"; src = fetchurl { url = "https://github.com/wang-bin/mdk-sdk/releases/download/v${version}/mdk-sdk-linux-x64.tar.xz"; - hash = "sha256-qC6FL76MJZ2XrrYePQFpWk5VPLTeoRd5ns93AK3iZjw="; + hash = "sha256-kRihFM2+vPg6OAL4ARz0dLLUvAFvZsbrCu5TBI6b2RI="; }; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index cb9d19c30c843..970081741b14b 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -60,6 +60,7 @@ , vulkanLayers ? lib.optionals (!stdenv.isDarwin) [ "device-select" "overlay" "intel-nullhw" ] # No Vulkan support on Darwin , OpenGL, Xplugin , withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light && !valgrind-light.meta.broken, valgrind-light +, withLibunwind ? lib.meta.availableOn stdenv.hostPlatform libunwind , enableGalliumNine ? stdenv.isLinux , enableOSMesa ? stdenv.isLinux , enableOpenCL ? stdenv.isLinux && stdenv.isx86_64 @@ -217,6 +218,8 @@ self = stdenv.mkDerivation { "-Dclang-libdir=${llvmPackages.clang-unwrapped.lib}/lib" ] ++ lib.optionals (!withValgrind) [ "-Dvalgrind=disabled" + ] ++ lib.optionals (!withLibunwind) [ + "-Dlibunwind=disabled" ] ++ lib.optional enablePatentEncumberedCodecs "-Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec" ++ lib.optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}"; @@ -226,7 +229,10 @@ self = stdenv.mkDerivation { libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr libffi libvdpau libelf libXvMC libpthreadstubs openssl /*or another sha1 provider*/ - zstd libunwind + zstd + ] ++ lib.optionals withLibunwind [ + libunwind + ] ++ [ python3Packages.python # for shebang ] ++ lib.optionals haveWayland [ wayland wayland-protocols ] ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal udev lm_sensors ] diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index f53a3268b7394..d3bc279506f92 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -36,14 +36,16 @@ stdenv.mkDerivation rec { "FFLAGS=-fallow-argument-mismatch" # https://github.com/pmodels/mpich/issues/4300 "FCFLAGS=-fallow-argument-mismatch" ] ++ lib.optionals pmixSupport [ - "--with-pmix=${lib.getDev pmix}" + "--with-pmix" ]; enableParallelBuilding = true; nativeBuildInputs = [ gfortran python3 ]; buildInputs = [ perl openssh hwloc ] - ++ lib.optional (!stdenv.isDarwin) ch4backend; + ++ lib.optional (!stdenv.isDarwin) ch4backend + ++ lib.optional pmixSupport pmix; + doCheck = true; diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix index bfd4b87dc07c2..b740e83f4c251 100644 --- a/pkgs/development/libraries/nanoflann/default.nix +++ b/pkgs/development/libraries/nanoflann/default.nix @@ -6,20 +6,20 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.5.3"; + version = "1.5.4"; pname = "nanoflann"; src = fetchFromGitHub { owner = "jlblancoc"; repo = "nanoflann"; rev = "v${finalAttrs.version}"; - hash = "sha256-cTi3Q+SUSNQkSgi2K7nPqfqEQFMkbchbn2+pE2ol9xQ="; + hash = "sha256-7Vt/x9jHRqtVTv0MbHxIwd1/cTUB4aIgOiI+7cz0iu0="; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBUILD_EXAMPLES=${if buildExamples then "ON" else "OFF"}" + (lib.cmakeBool "BUILD_EXAMPLES" buildExamples) ]; doCheck = true; diff --git a/pkgs/development/libraries/ndi/default.nix b/pkgs/development/libraries/ndi/default.nix index 9cd0d186302ba..06eb1b8150691 100644 --- a/pkgs/development/libraries/ndi/default.nix +++ b/pkgs/development/libraries/ndi/default.nix @@ -2,6 +2,12 @@ let versionJSON = lib.importJSON ./version.json; + ndiPlatform = + if stdenv.isAarch64 then "aarch64-rpi4-linux-gnueabi" + else if stdenv.isAarch32 then "arm-rpi2-linux-gnueabihf" + else if stdenv.isx86_64 then "x86_64-linux-gnu" + else if stdenv.isi686 then "i686-linux-gnu" + else throw "unsupported platform for NDI SDK"; in stdenv.mkDerivation rec { pname = "ndi"; @@ -35,12 +41,13 @@ stdenv.mkDerivation rec { installPhase = '' mkdir $out - mv bin/x86_64-linux-gnu $out/bin + mv bin/${ndiPlatform} $out/bin for i in $out/bin/*; do + if [ -L "$i" ]; then continue; fi patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i" done patchelf --set-rpath "${avahi}/lib:${stdenv.cc.libc}/lib" $out/bin/ndi-record - mv lib/x86_64-linux-gnu $out/lib + mv lib/${ndiPlatform} $out/lib for i in $out/lib/*; do if [ -L "$i" ]; then continue; fi patchelf --set-rpath "${avahi}/lib:${stdenv.cc.libc}/lib" "$i" @@ -48,7 +55,6 @@ stdenv.mkDerivation rec { mv include examples $out/ mkdir -p $out/share/doc/${pname}-${version} mv licenses $out/share/doc/${pname}-${version}/licenses - mv logos $out/share/doc/${pname}-${version}/logos mv documentation/* $out/share/doc/${pname}-${version}/ ''; @@ -61,9 +67,9 @@ stdenv.mkDerivation rec { passthru.updateScript = ./update.py; meta = with lib; { - homepage = "https://ndi.tv/sdk/"; + homepage = "https://ndi.video/ndi-sdk/"; description = "NDI Software Developer Kit"; - platforms = ["x86_64-linux"]; + platforms = ["x86_64-linux" "i686-linux" "aarch64-linux" "armv7l-linux"]; hydraPlatforms = []; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; diff --git a/pkgs/development/libraries/ndi/version.json b/pkgs/development/libraries/ndi/version.json index d751aa79e431c..686abdb2c2b76 100644 --- a/pkgs/development/libraries/ndi/version.json +++ b/pkgs/development/libraries/ndi/version.json @@ -1 +1 @@ -{"hash": "sha256:70e04c2e7a629a9854de2727e0f978175b7a4ec6cf4cd9799a22390862f6fa27", "version": "5.5.2"} +{"hash": "sha256:4ff4b92f2c5f42d234aa7d142e2de7e9b045c72b46ad5149a459d48efd9218de", "version": "5.6.0"} diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index f4760ea9e669a..f8b31b703fcfb 100644 --- a/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - hash = "sha256-z6lvtfO5XL/bZgbE+Sak+32QzjEhAdOnkpIO731h+bk="; + hash = "sha256-/lHsHkSySKyZZdjTTYCo0a6cwcMcbOWNvAEcO36/kEw="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 21c96d8bc9233..43cb876fa8846 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.96.1"; - hash = "sha256-HhN3wZEdi9R/KD0nl3+et+94LBJjGLDVqDX8v5qGrqQ="; + version = "3.97"; + hash = "sha256-d26v8a+5EkQ6cFg5SZirT4L22AxfIteiUx4I42msyqw="; } diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 83355c235f31a..f6cd2987aa0da 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -6,7 +6,6 @@ , unzip , SDL2 , boost -, freeimage , freetype , libpng , ois @@ -55,7 +54,6 @@ let buildInputs = [ SDL2 boost - freeimage freetype libpng ois diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/development/libraries/openimageio/default.nix index f2e98e0d34b6e..7d2e78794d8a0 100644 --- a/pkgs/development/libraries/openimageio/default.nix +++ b/pkgs/development/libraries/openimageio/default.nix @@ -3,7 +3,6 @@ , boost , cmake , giflib -, ilmbase , libjpeg , libpng , libtiff @@ -41,7 +40,6 @@ stdenv.mkDerivation rec { buildInputs = [ boost giflib - ilmbase libjpeg libpng libtiff diff --git a/pkgs/development/libraries/openturns/default.nix b/pkgs/development/libraries/openturns/default.nix index 751f98aae6e5c..a2fa42caea609 100644 --- a/pkgs/development/libraries/openturns/default.nix +++ b/pkgs/development/libraries/openturns/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "openturns"; - version = "1.21.2"; + version = "1.22"; src = fetchFromGitHub { owner = "openturns"; repo = "openturns"; rev = "v${version}"; - sha256 = "sha256-Zq+Z3jLjdba3566H4RdwztqbRRID5K5yHvoGmgzq8QM="; + sha256 = "sha256-ku3/mPoa1YJVJB99R/kWlOubIO+OZAiKfPqS/DrtJQk="; }; nativeBuildInputs = [ cmake ] ++ lib.optional enablePython python3Packages.sphinx; diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index 214149edad94b..d822c691417d4 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, jemalloc, c-blosc, tbb, zlib }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec nativeBuildInputs = [ cmake ]; - buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ]; + buildInputs = [ boost tbb jemalloc c-blosc zlib ]; cmakeFlags = [ "-DOPENVDB_CORE_STATIC=OFF" ]; diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 32544bc327bcb..3c739d30d3862 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.32"; + version = "1.0.33"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-Np91NevE0XiFSZ27cpwAUjm0XY2/IuugGDcfG17aV2c="; + sha256 = "sha256-26CRpxiTfZOq6sQSl0H53UmYzPY/6mP33EPObdkwnQs="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 1e01ed4a607a8..6127b83813c71 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -39,7 +39,9 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_43 gettext - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + ] ++ lib.optionals + (!stdenv.buildPlatform.canExecute stdenv.hostPlatform + && !stdenv.hostPlatform.isMinGW) [ mesonEmulatorHook ]; diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 727f41ca344bf..4618a6d431877 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pangolin"; - version = "0.8"; + version = "0.9.1"; src = fetchFromGitHub { owner = "stevenlovegrove"; repo = "Pangolin"; rev = "v${version}"; - sha256 = "sha256-X8TZWJOQOCItYt/F8E5ahiaPJXoppu9qBlEqfHP0vRc="; + sha256 = "sha256-B5YuNcJZHjR3dlVs66rySi68j29O3iMtlQvCjTUZBeY="; }; nativeBuildInputs = [ cmake pkg-config doxygen ]; diff --git a/pkgs/development/libraries/pdfhummus/default.nix b/pkgs/development/libraries/pdfhummus/default.nix index bc587d83f158f..bfba4ad096202 100644 --- a/pkgs/development/libraries/pdfhummus/default.nix +++ b/pkgs/development/libraries/pdfhummus/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pdfhummus"; - version = "4.6.2"; + version = "4.6.3"; src = fetchFromGitHub { owner = "galkahana"; repo = "PDF-Writer"; rev = "v${version}"; - hash = "sha256-PXiLP0lgqBdDbHHfvRT/d0M1jGjMVZZ3VDYnByzkKeI="; + hash = "sha256-6Hp5hacMpVdsiUvMSXBQ5432tPrkHSOiVoWa91sv38k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/pinocchio/default.nix b/pkgs/development/libraries/pinocchio/default.nix index 63ae2bcf62c9b..add7ef6fde22e 100644 --- a/pkgs/development/libraries/pinocchio/default.nix +++ b/pkgs/development/libraries/pinocchio/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "pinocchio"; - version = "2.6.21"; + version = "2.7.0"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-IaWAXzdzhU/wov+9ChzUeCp9SFNFV2/vGToXC35dkb8="; + hash = "sha256-yhrG+MilGJkvwLUNTAgNhDqUWGjPswjrbg38yOLsmHc="; }; strictDeps = true; @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals pythonSupport [ "-DBUILD_WITH_LIBPYTHON=ON" ] ++ lib.optionals (pythonSupport && stdenv.isDarwin) [ - # AssertionError: '.' != '/tmp/nix-build-pinocchio-2.6.21.drv/sou[84 chars].dae' + # AssertionError: '.' != '/tmp/nix-build-pinocchio-2.7.0.drv/sou[84 chars].dae' "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;test-py-bindings_geometry_model_urdf'" ] ++ lib.optionals (!pythonSupport) [ "-DBUILD_PYTHON_INTERFACE=OFF" diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix index f5fb65f7989bc..78605179f710f 100644 --- a/pkgs/development/libraries/pmix/default.nix +++ b/pkgs/development/libraries/pmix/default.nix @@ -1,5 +1,7 @@ { lib, stdenv, fetchFromGitHub, perl, autoconf, automake -, libtool, python3, flex, libevent, hwloc, munge, zlib, pandoc, gitMinimal +, removeReferencesTo, libtool, python3, flex, libevent +, targetPackages, makeWrapper +, hwloc, munge, zlib, pandoc, gitMinimal } : stdenv.mkDerivation rec { @@ -14,6 +16,8 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + outputs = [ "out" "dev" ]; + postPatch = '' patchShebangs ./autogen.pl patchShebangs ./config @@ -28,6 +32,8 @@ stdenv.mkDerivation rec { flex gitMinimal python3 + removeReferencesTo + makeWrapper ]; buildInputs = [ libevent hwloc munge zlib ]; @@ -46,6 +52,27 @@ stdenv.mkDerivation rec { postInstall = '' find $out/lib/ -name "*.la" -exec rm -f \{} \; + + moveToOutput "bin/pmix_info" "''${!outputDev}" + moveToOutput "bin/pmixcc" "''${!outputDev}" + moveToOutput "share/pmix/pmixcc-wrapper-data.txt" "''${!outputDev}" + + # The path to the pmixcc-wrapper-data.txt is hard coded and + # points to $out instead of dev. Use wrapper to fix paths. + wrapProgram $dev/bin/pmixcc \ + --set PMIX_INCLUDEDIR $dev/include \ + --set PMIX_PKGDATADIR $dev/share/pmix + ''; + + postFixup = '' + # The build info (parameters to ./configure) are hardcoded + # into the library. This clears all references to $dev/include. + remove-references-to -t $dev $(readlink -f $out/lib/libpmix.so) + + # Pin the compiler to the current version in a cross compiler friendly way. + # Same pattern as for openmpi (see https://github.com/NixOS/nixpkgs/pull/58964#discussion_r275059427). + sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' \ + $dev/share/pmix/pmixcc-wrapper-data.txt ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 2610c8463b2ea..a1d597adcd1dc 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -164,7 +164,7 @@ let qtwayland = callPackage ./modules/qtwayland.nix { }; qtwebchannel = callPackage ./modules/qtwebchannel.nix { }; qtwebengine = callPackage ./modules/qtwebengine.nix { - inherit (darwin) bootstrap_cmds cctools xnu; + inherit (darwin) autoSignDarwinBinariesHook bootstrap_cmds cctools xnu; inherit (darwin.apple_sdk_11_0) libpm libunwind; inherit (darwin.apple_sdk_11_0.libs) sandbox; inherit (darwin.apple_sdk_11_0.frameworks) diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index affb512a22f27..564c5c60eb516 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -60,6 +60,7 @@ , mesa , enableProprietaryCodecs ? true # darwin +, autoSignDarwinBinariesHook , bootstrap_cmds , cctools , xcbuild @@ -104,6 +105,8 @@ qtModule { which gn nodejs + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook ] ++ lib.optionals stdenv.isDarwin [ bootstrap_cmds cctools @@ -185,16 +188,19 @@ qtModule { "-DQT_FEATURE_pdf_xfa_gif=ON" "-DQT_FEATURE_pdf_xfa_png=ON" "-DQT_FEATURE_pdf_xfa_tiff=ON" - "-DQT_FEATURE_webengine_system_icu=ON" "-DQT_FEATURE_webengine_system_libevent=ON" - "-DQT_FEATURE_webengine_system_libxml=ON" "-DQT_FEATURE_webengine_system_ffmpeg=ON" # android only. https://bugreports.qt.io/browse/QTBUG-100293 # "-DQT_FEATURE_webengine_native_spellchecker=ON" "-DQT_FEATURE_webengine_sanitizer=ON" "-DQT_FEATURE_webengine_kerberos=ON" ] ++ lib.optionals stdenv.isLinux [ + "-DQT_FEATURE_webengine_system_libxml=ON" "-DQT_FEATURE_webengine_webrtc_pipewire=ON" + + # Appears not to work on some platforms + # https://github.com/Homebrew/homebrew-core/issues/104008 + "-DQT_FEATURE_webengine_system_icu=ON" ] ++ lib.optionals enableProprietaryCodecs [ "-DQT_FEATURE_webengine_proprietary_codecs=ON" ] ++ lib.optionals stdenv.isDarwin [ @@ -222,11 +228,9 @@ qtModule { # Text rendering harfbuzz - icu openssl glib - libxml2 libxslt lcms2 @@ -241,6 +245,9 @@ qtModule { protobuf jsoncpp + icu + libxml2 + # Audio formats alsa-lib pulseaudio diff --git a/pkgs/development/libraries/qt-6/patches/qtwebengine-libxml-2.12.patch b/pkgs/development/libraries/qt-6/patches/qtwebengine-libxml-2.12.patch index 1fc7d837f8f34..3c3d59b488da3 100644 --- a/pkgs/development/libraries/qt-6/patches/qtwebengine-libxml-2.12.patch +++ b/pkgs/development/libraries/qt-6/patches/qtwebengine-libxml-2.12.patch @@ -1,22 +1,29 @@ --- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h +++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h -@@ -77,7 +77,7 @@ class XSLTProcessor final : public ScriptWrappable { +@@ -77,7 +77,12 @@ class XSLTProcessor final : public ScriptWrappable { void reset(); -- static void ParseErrorFunc(void* user_data, xmlError*); ++#if LIBXML_VERSION >= 21200 + static void ParseErrorFunc(void* user_data, const xmlError*); ++#else + static void ParseErrorFunc(void* user_data, xmlError*); ++#endif ++ static void GenericErrorFunc(void* user_data, const char* msg, ...); // Only for libXSLT callbacks --- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc +++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc -@@ -66,7 +66,7 @@ void XSLTProcessor::GenericErrorFunc(void*, const char*, ...) { +@@ -66,7 +66,11 @@ void XSLTProcessor::GenericErrorFunc(void*, const char*, ...) { // It would be nice to do something with this error message. } --void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) { ++#if LIBXML_VERSION >= 21200 +void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) { ++#else + void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) { ++#endif FrameConsole* console = static_cast<FrameConsole*>(user_data); if (!console) return; diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 1f9ffb373082f..564eb31a71395 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "qtkeychain"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "frankosterfeld"; repo = "qtkeychain"; rev = version; - sha256 = "sha256-LclYOuIYn+jYCvg69uHFlV3VcZ2KWdr8lFyCSBIB7Kw="; + sha256 = "sha256-aRBhg4RwK2jUQWW/OmzNSMUScaFUPdbWbApD37CXPoI="; }; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix index d0d1a93ad4629..7830e62ccb181 100644 --- a/pkgs/development/libraries/rubberband/default.nix +++ b/pkgs/development/libraries/rubberband/default.nix @@ -1,20 +1,26 @@ { lib, stdenv, fetchurl, pkg-config, libsamplerate, libsndfile, fftw +, lv2, jdk , vamp-plugin-sdk, ladspaH, meson, ninja, darwin }: stdenv.mkDerivation rec { pname = "rubberband"; - version = "3.1.0"; + version = "3.3.0"; src = fetchurl { url = "https://breakfastquay.com/files/releases/${pname}-${version}.tar.bz2"; - sha256 = "sha256-uVp22lzbOWZ3DGARXs2Dj4QGESD4hMO/3JBPdZMeyao="; + hash = "sha256-2e+J4rjvn4WxOsPC+uww4grPLJ86nIxFzmN/K8leV2w="; }; - nativeBuildInputs = [ pkg-config meson ninja ]; - buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH ] ++ lib.optionals stdenv.isDarwin + nativeBuildInputs = [ pkg-config meson ninja jdk ]; + buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH lv2 ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [Accelerate CoreGraphics CoreVideo]); makeFlags = [ "AR:=$(AR)" ]; + # TODO: package boost-test, so we can run the test suite. (Currently it fails + # to find libboost_unit_test_framework.a.) + mesonFlags = [ "-Dtests=disabled" ]; + doCheck = false; + meta = with lib; { description = "High quality software library for audio time-stretching and pitch-shifting"; homepage = "https://breakfastquay.com/rubberband/"; diff --git a/pkgs/development/libraries/science/biology/EBTKS/default.nix b/pkgs/development/libraries/science/biology/EBTKS/default.nix deleted file mode 100644 index 7a6122fbc8db1..0000000000000 --- a/pkgs/development/libraries/science/biology/EBTKS/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libminc }: - -stdenv.mkDerivation rec { - pname = "EBTKS"; - version = "unstable-2017-09-23"; - - src = fetchFromGitHub { - owner = "BIC-MNI"; - repo = pname; - rev = "67e4e197d8a32d6462c9bdc7af44d64ebde4fb5c"; - sha256 = "1a1qw6i47fs1izx60l1ysabpmyx9j5sjnbdv8b47wi2xcc9i3hpq"; - }; - - # error: use of undeclared identifier 'finite'; did you mean 'isfinite'? - postPatch = '' - substituteInPlace templates/EBTKS/SimpleArray.h \ - --replace "#define FINITE(x) finite(x)" "#define FINITE(x) isfinite(x)" - ''; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libminc ]; - - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ]; - - meta = with lib; { - homepage = "https://github.com/BIC-MNI/${pname}"; - description = "Library for working with MINC files"; - maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.free; - }; -} diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index d89b6dbbe6794..8b1aa7d01e818 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "htslib"; - version = "1.19"; + version = "1.19.1"; src = fetchurl { url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-h1HEDE+n0fI6aGTFsgpzdE+L5oI5U1rncpxffTlNBzY="; + sha256 = "sha256-Ii1001dPtnsVjGmIyYDuqrqKBlb15P+3a1+lfwNZM+w="; }; # perl is only used during the check phase. diff --git a/pkgs/development/libraries/science/math/mongoose/default.nix b/pkgs/development/libraries/science/math/mongoose/default.nix index 728dff9aa3e5f..df645809a4450 100644 --- a/pkgs/development/libraries/science/math/mongoose/default.nix +++ b/pkgs/development/libraries/science/math/mongoose/default.nix @@ -7,11 +7,11 @@ }: let - suitesparseVersion = "7.4.0"; + suitesparseVersion = "7.5.1"; in stdenv.mkDerivation { pname = "mongoose"; - version = "3.3.0"; + version = "3.3.1"; outputs = [ "bin" "out" "dev" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation { owner = "DrTimothyAldenDavis"; repo = "SuiteSparse"; rev = "v${suitesparseVersion}"; - hash = "sha256-oR/lISsa+0NGueJJyutswxOEQVl8MmSVgb/q3GMUCn4="; + hash = "sha256-6eC26rag9kZ1E4qJ5KY/dLXGld+EHP2OUpyikjXQhQk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index abc2ff9a37012..45ea5900e286d 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableCuda [ cudaPackages.cuda_cudart.dev cudaPackages.cuda_cudart.lib + cudaPackages.cuda_cccl.dev cudaPackages.libcublas.dev cudaPackages.libcublas.lib ]; diff --git a/pkgs/development/libraries/ubus/default.nix b/pkgs/development/libraries/ubus/default.nix index 4419b4e67a66c..2150ed7b0e826 100644 --- a/pkgs/development/libraries/ubus/default.nix +++ b/pkgs/development/libraries/ubus/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "ubus"; - version = "unstable-2023-11-28"; + version = "unstable-2023-12-18"; src = fetchgit { url = "https://git.openwrt.org/project/ubus.git"; - rev = "f84eb5998c6ea2d34989ca2d3254e56c66139313"; - hash = "sha256-5pIovqIeJczWAA9KQPKFnTnGRrIZVdSNdxBR8AEFtO4="; + rev = "65bb027054def3b94a977229fd6ad62ddd32345b"; + hash = "sha256-n82Ub0IiuvWbnlDCoN+0hjo/1PbplEbc56kuOYMrHxQ="; }; cmakeFlags = [ "-DBUILD_LUA=OFF" ]; diff --git a/pkgs/development/libraries/utf8cpp/default.nix b/pkgs/development/libraries/utf8cpp/default.nix index 1ca767d98cb62..60ae45d2cd8e4 100644 --- a/pkgs/development/libraries/utf8cpp/default.nix +++ b/pkgs/development/libraries/utf8cpp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "utf8cpp"; - version = "4.0.3"; + version = "4.0.5"; src = fetchFromGitHub { owner = "nemtrif"; repo = "utfcpp"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-oUr476HMBYzX64x28Kcudw0B1BVqLUPVVdRzRe82AOc="; + hash = "sha256-Z27/31obVErsmW1b1SVcr45nKlFu01RqqpTMwS0LqJ8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix index 8a415a4df77c9..f58f50b4a72f4 100644 --- a/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/pkgs/development/libraries/xml-tooling-c/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "xml-tooling-c"; - version = "3.0.4"; + version = "3.2.4"; src = fetchgit { url = "https://git.shibboleth.net/git/cpp-xmltooling.git"; rev = version; - sha256 = "0frj4w70l06nva6dvdcivgm1ax69rqbjdzzbgp0sxhiqhddslbas"; + sha256 = "sha256-FQ109ahOSWj3hvaxu1r/0FTpCuWaLgSEKM8NBio+wqU="; }; buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ]; |