diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-12-01 19:00:09 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-12-01 19:00:09 +0100 |
| commit | 9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d (patch) | |
| tree | 4368f9e4cb2d5b93a956c085337e45cb70f1e331 /nixpkgs/pkgs/development/libraries | |
| parent | a9cbfb6941b47d6f50129e6e36927882392daed7 (diff) | |
| parent | 2344fe1da14cb08b0c18743b207995f9b8597915 (diff) | |
| download | nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.gz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.bz2 nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.lz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.xz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.zst nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.zip | |
Merge https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries')
186 files changed, 1865 insertions, 1094 deletions
diff --git a/nixpkgs/pkgs/development/libraries/ada/gnatcoll/bindings.nix b/nixpkgs/pkgs/development/libraries/ada/gnatcoll/bindings.nix index 146bf1091a70..c8896c14c32f 100644 --- a/nixpkgs/pkgs/development/libraries/ada/gnatcoll/bindings.nix +++ b/nixpkgs/pkgs/development/libraries/ada/gnatcoll/bindings.nix @@ -34,13 +34,13 @@ in stdenv.mkDerivation rec { pname = "gnatcoll-${component}"; - version = "23.0.0"; + version = "24.0.0"; src = fetchFromGitHub { owner = "AdaCore"; repo = "gnatcoll-bindings"; rev = "v${version}"; - sha256 = "1jnnfsvll4jh6ip0fww4mh2cm61h7dzpxz3zaa2psrc1w54x34nn"; + sha256 = "00aakpmr67r72l1h3jpkaw83p1a2mjjvfk635yy5c1nss3ji1qjm"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/ada/gnatcoll/core.nix b/nixpkgs/pkgs/development/libraries/ada/gnatcoll/core.nix index 171e9b99eec3..7fdd4e99d550 100644 --- a/nixpkgs/pkgs/development/libraries/ada/gnatcoll/core.nix +++ b/nixpkgs/pkgs/development/libraries/ada/gnatcoll/core.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "gnatcoll-core"; - version = "23.0.0"; + version = "24.0.0"; src = fetchFromGitHub { owner = "AdaCore"; repo = "gnatcoll-core"; rev = "v${version}"; - sha256 = "11q66xszqvpc9jyyzivcakik27d23yniahjdznb47wyqkxphm1dl"; + sha256 = "1cks2w0inj9hvamsdxjriwxnx1igmx2khhr6kwxshsl30rs8nzvb"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/ada/gnatcoll/db.nix b/nixpkgs/pkgs/development/libraries/ada/gnatcoll/db.nix index 6b4ce3677d1f..6eacff1ddb82 100644 --- a/nixpkgs/pkgs/development/libraries/ada/gnatcoll/db.nix +++ b/nixpkgs/pkgs/development/libraries/ada/gnatcoll/db.nix @@ -55,13 +55,13 @@ stdenv.mkDerivation rec { if onlyExecutable then builtins.replaceStrings [ "_" ] [ "-" ] component else "gnatcoll-${component}"; - version = "23.0.0"; + version = "24.0.0"; src = fetchFromGitHub { owner = "AdaCore"; repo = "gnatcoll-db"; rev = "v${version}"; - sha256 = "1j77ina17myahlsvbyiycgxkncd7ijc7jrvzwa4gagx0fwjk7prh"; + sha256 = "0jq76s4s7q2x93jh8la6r0i3jkpvgsfj12vbbaqabh410xccyr3p"; }; # Link executables dynamically unless specified by the platform, diff --git a/nixpkgs/pkgs/development/libraries/ada/xmlada/default.nix b/nixpkgs/pkgs/development/libraries/ada/xmlada/default.nix index e80371e092e8..77e8094277a7 100644 --- a/nixpkgs/pkgs/development/libraries/ada/xmlada/default.nix +++ b/nixpkgs/pkgs/development/libraries/ada/xmlada/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "xmlada"; - version = "23.0.0"; + version = "24.0.0"; src = fetchFromGitHub { name = "xmlada-${version}-src"; owner = "AdaCore"; repo = "xmlada"; rev = "v${version}"; - sha256 = "sha256-covcSwlQQjRKTv0DdMEgahXXlch0TeKnvSyOsGO9+e0="; + sha256 = "sha256-vvM7bdf3dAa3zKgxbGeAGlBT6fvafzmleimJHyRdlvc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/nixpkgs/pkgs/development/libraries/agda/functional-linear-algebra/default.nix index 8d039701d97b..c32c301dd3b3 100644 --- a/nixpkgs/pkgs/development/libraries/agda/functional-linear-algebra/default.nix +++ b/nixpkgs/pkgs/development/libraries/agda/functional-linear-algebra/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, lib, mkDerivation, standard-library }: mkDerivation rec { - version = "0.4"; + version = "0.4.1"; pname = "functional-linear-algebra"; buildInputs = [ standard-library ]; @@ -10,7 +10,7 @@ mkDerivation rec { repo = "functional-linear-algebra"; owner = "ryanorendorff"; rev = "v${version}"; - sha256 = "05jk3792k9xf8iiwzm2hwlvd25f2pqqr3gppmqjf8xb9199i8fk0"; + sha256 = "GrTeMEHEXb0t2RgHWiGfvvofNYl8YYaaoCE18JrG6Q4="; }; preConfigure = '' @@ -26,6 +26,5 @@ mkDerivation rec { license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ ryanorendorff ]; - broken = true; }; } diff --git a/nixpkgs/pkgs/development/libraries/allegro/5.nix b/nixpkgs/pkgs/development/libraries/allegro/5.nix index 487b0dfde0d6..3b9bbfeb244a 100644 --- a/nixpkgs/pkgs/development/libraries/allegro/5.nix +++ b/nixpkgs/pkgs/development/libraries/allegro/5.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "allegro"; - version = "5.2.8.0"; + version = "5.2.9.0"; src = fetchFromGitHub { owner = "liballeg"; repo = "allegro5"; rev = version; - sha256 = "sha256-uNcaeTelFNfg+YjPYc7nK4TrFDxJsEuPhsF8x1cvIYQ="; + sha256 = "sha256-lGaHhFlc9zcalRFx0Xcyd0pZdC9lln0ez5hdfRz6Kt8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/nixpkgs/pkgs/development/libraries/amdvlk/default.nix index 41466a9d7731..74e4958671c7 100644 --- a/nixpkgs/pkgs/development/libraries/amdvlk/default.nix +++ b/nixpkgs/pkgs/development/libraries/amdvlk/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2023.Q4.1"; + version = "2023.Q4.2"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "5fSz8sksH3K9k0nIx9DUmGGUfIo4Fc4NMettaVqRsY8="; + sha256 = "CmlFqHxP6WM4b/MnXbRhd2TvV3qhMiC6rHrn/SHtRdc="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/nixpkgs/pkgs/development/libraries/armadillo/default.nix index 76bf38cce169..63ccedd56a19 100644 --- a/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "12.6.5"; + version = "12.6.6"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-9vHJh/m8K1LpcYg1zEFqUlz1im1XWoUdIZwMarW4xWM="; + hash = "sha256-OFiw/UMXcq8DKtPzXCrrVOjavqWRaefR6fzNeLyCrTU="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/arrayfire/default.nix b/nixpkgs/pkgs/development/libraries/arrayfire/default.nix index 2c1caf0bbb2b..5c4336572b8f 100644 --- a/nixpkgs/pkgs/development/libraries/arrayfire/default.nix +++ b/nixpkgs/pkgs/development/libraries/arrayfire/default.nix @@ -1,91 +1,215 @@ -{ lib -, stdenv -, fetchFromGitHub +{ blas +, boost +, clblast , cmake -, pkg-config -, opencl-clhpp -, ocl-icd +, config +, cudaPackages +, fetchFromGitHub , fftw , fftwFloat -, blas +, fmt_9 +, forge +, freeimage +, gtest , lapack -, boost -, mesa -, libGLU +, lib , libGL -, freeimage +, mesa +, ocl-icd +, opencl-clhpp +, pkg-config , python3 -, clfft -, clblas -, doxygen -, buildDocs ? false -, config +, span-lite +, stdenv + # NOTE: We disable tests by default, because they cannot be run easily on + # non-NixOS systems when either CUDA or OpenCL support is enabled (CUDA and + # OpenCL need access to drivers that are installed outside of Nix on + # non-NixOS systems). +, doCheck ? false +, cpuSupport ? true , cudaSupport ? config.cudaSupport -, cudatoolkit -, darwin + # OpenCL needs mesa which is broken on Darwin +, openclSupport ? !stdenv.isDarwin + # This argument lets one run CUDA & OpenCL tests on non-NixOS systems by + # telling Nix where to find the drivers. If you know the version of the + # NVidia driver that is installed on your system, you can do: + # + # arrayfire.override { + # nvidiaComputeDrivers = + # callPackage + # (prev.linuxPackages.nvidiaPackages.mkDriver { + # version = cudaVersion; # our driver version + # sha256_64bit = cudaHash; # sha256 of the .run binary + # useGLVND = false; + # useProfiles = false; + # useSettings = false; + # usePersistenced = false; + # ... + # }) + # { libsOnly = true; }; + # } +, nvidiaComputeDrivers ? null }: +# ArrayFire compiles with 64-bit BLAS, but some tests segfault or throw +# exceptions, which means that it isn't really supported yet... +assert blas.isILP64 == false; + stdenv.mkDerivation rec { pname = "arrayfire"; - version = "3.7.3"; + version = "3.9.0"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "0gcbg6b6gs38xhks5pp0vkcqs89zl7rh9982jqlzsd0h724qddw0"; - fetchSubmodules = true; + rev = "v3.9.0"; + hash = "sha256-80fxdkaeAQ5u0X/UGPaI/900cdkZ/vXNcOn5tkZ+C3Y="; + }; + + # We cannot use the clfft from Nixpkgs because ArrayFire maintain a fork + # of clfft where they've modified the CMake build system, and the + # CMakeLists.txt of ArrayFire assumes that we're using that fork. + # + # This can be removed once ArrayFire upstream their changes. + clfft = fetchFromGitHub { + owner = pname; + repo = "clfft"; + rev = "760096b37dcc4f18ccd1aac53f3501a83b83449c"; + sha256 = "sha256-vJo1YfC2AJIbbRj/zTfcOUmi0Oj9v64NfA9MfK8ecoY="; + }; + glad = fetchFromGitHub { + owner = pname; + repo = "glad"; + rev = "ef8c5508e72456b714820c98e034d9a55b970650"; + sha256 = "sha256-u9Vec7XLhE3xW9vzM7uuf+b18wZsh/VMtGbB6nMVlno="; + }; + threads = fetchFromGitHub { + owner = pname; + repo = "threads"; + rev = "4d4a4f0384d1ac2f25b2c4fc1d57b9e25f4d6818"; + sha256 = "sha256-qqsT9woJDtQvzuV323OYXm68pExygYs/+zZNmg2sN34="; + }; + test-data = fetchFromGitHub { + owner = pname; + repo = "arrayfire-data"; + rev = "a5f533d7b864a4d8f0dd7c9aaad5ff06018c4867"; + sha256 = "sha256-AWzhsrDXyZrQN2bd0Ng/XlE8v02x7QWTiFTyaAuRXSw="; + }; + # ArrayFire fails to compile with newer versions of spdlog, so we can't use + # the one in Nixpkgs. Once they upgrade, we can switch to using spdlog from + # Nixpkgs. + spdlog = fetchFromGitHub { + owner = "gabime"; + repo = "spdlog"; + rev = "v1.9.2"; + hash = "sha256-GSUdHtvV/97RyDKy8i+ticnSlQCubGGWHg4Oo+YAr8Y="; }; cmakeFlags = [ - "-DAF_BUILD_OPENCL=OFF" + "-DBUILD_TESTING=ON" + # We do not build examples, because building tests already takes long enough... "-DAF_BUILD_EXAMPLES=OFF" - "-DBUILD_TESTING=OFF" - ] ++ lib.optional cudaSupport "-DCMAKE_LIBRARY_PATH=${cudatoolkit}/lib/stubs"; + # No need to build forge, because it's a separate package + "-DAF_BUILD_FORGE=OFF" + "-DAF_COMPUTE_LIBRARY='FFTW/LAPACK/BLAS'" + # Prevent ArrayFire from trying to download some matrices from the Internet + "-DAF_TEST_WITH_MTX_FILES=OFF" + # Have to use the header-only version, because we're not using the version + # from Nixpkgs. Otherwise, libaf.so won't be able to find the shared + # library, because ArrayFire's CMake files do not run the install step of + # spdlog. + "-DAF_WITH_SPDLOG_HEADER_ONLY=ON" + (if cpuSupport then "-DAF_BUILD_CPU=ON" else "-DAF_BUILD_CPU=OFF") + (if openclSupport then "-DAF_BUILD_OPENCL=ON" else "-DAF_BUILD_OPENCL=OFF") + (if cudaSupport then "-DAF_BUILD_CUDA=ON" else "-DAF_BUILD_CUDA=OFF") + ] ++ lib.optionals cudaSupport [ + # ArrayFire use deprecated FindCUDA in their CMake files, so we help CMake + # locate cudatoolkit. + "-DCUDA_LIBRARIES_PATH=${cudaPackages.cudatoolkit}/lib" + ]; - patches = [ ./no-download.patch ]; + # ArrayFire have a repo with assets for the examples. Since we don't build + # the examples anyway, remove the dependency on assets. + patches = [ ./no-assets.patch ./no-download.patch ]; postPatch = '' - mkdir -p ./build/third_party/clFFT/src - cp -R --no-preserve=mode,ownership ${clfft.src}/ ./build/third_party/clFFT/src/clFFT-ext/ - mkdir -p ./build/third_party/clBLAS/src - cp -R --no-preserve=mode,ownership ${clblas.src}/ ./build/third_party/clBLAS/src/clBLAS-ext/ - mkdir -p ./build/include/CL - cp -R --no-preserve=mode,ownership ${opencl-clhpp}/include/CL/cl2.hpp ./build/include/CL/cl2.hpp - ''; + mkdir -p ./extern/af_glad-src + mkdir -p ./extern/af_threads-src + mkdir -p ./extern/af_test_data-src + mkdir -p ./extern/ocl_clfft-src + mkdir -p ./extern/spdlog-src + cp -R --no-preserve=mode,ownership ${glad}/* ./extern/af_glad-src/ + cp -R --no-preserve=mode,ownership ${threads}/* ./extern/af_threads-src/ + cp -R --no-preserve=mode,ownership ${test-data}/* ./extern/af_test_data-src/ + cp -R --no-preserve=mode,ownership ${clfft}/* ./extern/ocl_clfft-src/ + cp -R --no-preserve=mode,ownership ${spdlog}/* ./extern/spdlog-src/ - preBuild = lib.optionalString cudaSupport '' - export CUDA_PATH="${cudatoolkit}" + # libaf.so (the unified backend) tries to load the right shared library at + # runtime, and the search paths are hard-coded... We tweak them to point to + # the installation directory in the Nix store. + substituteInPlace src/api/unified/symbol_manager.cpp \ + --replace '"/opt/arrayfire-3/lib/",' \ + "\"$out/lib/\", \"/opt/arrayfire-3/lib/\"," ''; - nativeBuildInputs = [ - cmake - pkg-config - python3 - ]; - - strictDeps = true; + inherit doCheck; + checkPhase = + let + LD_LIBRARY_PATH = builtins.concatStringsSep ":" ( + [ "${forge}/lib" "${freeimage}/lib" ] + ++ lib.optional cudaSupport "${cudaPackages.cudatoolkit}/lib64" + # On non-NixOS systems, help the tests find Nvidia drivers + ++ lib.optional (nvidiaComputeDrivers != null) "${nvidiaComputeDrivers}/lib" + ); + ctestFlags = builtins.concatStringsSep " " ( + # We have to run with "-j1" otherwise various segfaults occur on non-NixOS systems. + [ "--output-on-errors" "-j1" ] + # See https://github.com/arrayfire/arrayfire/issues/3484 + ++ lib.optional openclSupport "-E '(inverse_dense|cholesky_dense)'" + ); + in + '' + export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} + '' + + # On non-NixOS systems, help the tests find Nvidia drivers + lib.optionalString (openclSupport && nvidiaComputeDrivers != null) '' + export OCL_ICD_VENDORS=${nvidiaComputeDrivers}/etc/OpenCL/vendors + '' + '' + # Note: for debugging, enable AF_TRACE=all + AF_PRINT_ERRORS=1 ctest ${ctestFlags} + ''; buildInputs = [ - opencl-clhpp + blas + boost.dev + boost.out + clblast fftw fftwFloat - blas + # We need fmt_9 because ArrayFire fails to compile with newer versions. + fmt_9 + forge + freeimage + gtest lapack - libGLU libGL - mesa - freeimage - boost.out - boost.dev - ] ++ lib.optionals stdenv.isLinux [ ocl-icd - ] ++ lib.optionals cudaSupport [ - cudatoolkit - ] ++ lib.optionals buildDocs [ - doxygen - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Accelerate + opencl-clhpp + span-lite + ] + ++ lib.optionals cudaSupport [ + cudaPackages.cudatoolkit + cudaPackages.cudnn + cudaPackages.cuda_cccl + ] + ++ lib.optionals openclSupport [ + mesa + ]; + + nativeBuildInputs = [ + cmake + pkg-config + python3 ]; meta = with lib; { @@ -95,7 +219,7 @@ stdenv.mkDerivation rec { ''; license = licenses.bsd3; homepage = "https://arrayfire.com/"; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ chessai ]; + platforms = platforms.linux; + maintainers = with maintainers; [ chessai twesterhout ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/arrayfire/no-assets.patch b/nixpkgs/pkgs/development/libraries/arrayfire/no-assets.patch new file mode 100644 index 000000000000..b8820f8aa55b --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/arrayfire/no-assets.patch @@ -0,0 +1,35 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 12d6e557c..cc004555d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -321,11 +321,6 @@ if(NOT TARGET nonstd::span-lite) + + endif() + +-af_dep_check_and_populate(${assets_prefix} +- URI https://github.com/arrayfire/assets.git +- REF master +-) +-set(ASSETS_DIR ${${assets_prefix}_SOURCE_DIR}) + + # when crosscompiling use the bin2cpp file from the native bin directory + if(CMAKE_CROSSCOMPILING) +@@ -473,18 +468,6 @@ install(FILES ${ArrayFire_BINARY_DIR}/include/af/version.h + DESTINATION "${AF_INSTALL_INC_DIR}/af/" + COMPONENT headers) + +-# install the examples irrespective of the AF_BUILD_EXAMPLES value +-# only the examples source files are installed, so the installation of these +-# source files does not depend on AF_BUILD_EXAMPLES +-# when AF_BUILD_EXAMPLES is OFF, the examples source is installed without +-# building the example executables +-install(DIRECTORY examples/ #NOTE The slash at the end is important +- DESTINATION ${AF_INSTALL_EXAMPLE_DIR} +- COMPONENT examples) +- +-install(DIRECTORY ${ASSETS_DIR}/examples/ #NOTE The slash at the end is important +- DESTINATION ${AF_INSTALL_EXAMPLE_DIR} +- COMPONENT examples) + + install(DIRECTORY "${ArrayFire_SOURCE_DIR}/LICENSES/" + DESTINATION LICENSES diff --git a/nixpkgs/pkgs/development/libraries/arrayfire/no-download.patch b/nixpkgs/pkgs/development/libraries/arrayfire/no-download.patch index 2b3ac492a54d..f7903e74112d 100644 --- a/nixpkgs/pkgs/development/libraries/arrayfire/no-download.patch +++ b/nixpkgs/pkgs/development/libraries/arrayfire/no-download.patch @@ -1,28 +1,31 @@ -diff --git a/CMakeModules/build_clBLAS.cmake b/CMakeModules/build_clBLAS.cmake -index 8de529e8..6361b613 100644 ---- a/CMakeModules/build_clBLAS.cmake -+++ b/CMakeModules/build_clBLAS.cmake -@@ -14,8 +14,7 @@ find_package(OpenCL) - - ExternalProject_Add( - clBLAS-ext -- GIT_REPOSITORY https://github.com/arrayfire/clBLAS.git -- GIT_TAG arrayfire-release -+ DOWNLOAD_COMMAND true - BUILD_BYPRODUCTS ${clBLAS_location} - PREFIX "${prefix}" - INSTALL_DIR "${prefix}" -diff --git a/CMakeModules/build_clFFT.cmake b/CMakeModules/build_clFFT.cmake -index 28be38a3..85e3915e 100644 ---- a/CMakeModules/build_clFFT.cmake -+++ b/CMakeModules/build_clFFT.cmake -@@ -20,8 +20,7 @@ ENDIF() - - ExternalProject_Add( - clFFT-ext -- GIT_REPOSITORY https://github.com/arrayfire/clFFT.git -- GIT_TAG arrayfire-release -+ DOWNLOAD_COMMAND true - PREFIX "${prefix}" - INSTALL_DIR "${prefix}" - UPDATE_COMMAND "" +diff --git a/CMakeModules/AFconfigure_deps_vars.cmake b/CMakeModules/AFconfigure_deps_vars.cmake +index aac332f5a..e9e711159 100644 +--- a/CMakeModules/AFconfigure_deps_vars.cmake ++++ b/CMakeModules/AFconfigure_deps_vars.cmake +@@ -94,7 +94,7 @@ macro(af_dep_check_and_populate dep_prefix) + URL ${adcp_args_URI} + URL_HASH ${adcp_args_REF} + DOWNLOAD_COMMAND \"\" +- UPDATE_DISCONNECTED ON ++ UPDATE_COMMAND \"\" + SOURCE_DIR "${ArrayFire_SOURCE_DIR}/extern/${dep_prefix}-src" + BINARY_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-build" + SUBBUILD_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-subbuild" +@@ -104,7 +104,7 @@ macro(af_dep_check_and_populate dep_prefix) + QUIET + URL ${adcp_args_URI} + DOWNLOAD_COMMAND \"\" +- UPDATE_DISCONNECTED ON ++ UPDATE_COMMAND \"\" + SOURCE_DIR "${ArrayFire_SOURCE_DIR}/extern/${dep_prefix}-src" + BINARY_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-build" + SUBBUILD_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-subbuild" +@@ -116,7 +116,7 @@ macro(af_dep_check_and_populate dep_prefix) + GIT_REPOSITORY ${adcp_args_URI} + GIT_TAG ${adcp_args_REF} + DOWNLOAD_COMMAND \"\" +- UPDATE_DISCONNECTED ON ++ UPDATE_COMMAND \"\" + SOURCE_DIR "${ArrayFire_SOURCE_DIR}/extern/${dep_prefix}-src" + BINARY_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-build" + SUBBUILD_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-subbuild" diff --git a/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix b/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix index 2a47de8d5643..7af9edd26865 100644 --- a/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix +++ b/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -24,23 +23,15 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.48.3"; + version = "2.50.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "NzFt9DypmJzlOdVM9CmnaMKLs4oLNJUL6t0EIYJ+31U="; + sha256 = "6fWoyCNcndljshcd6RIDARKcZ33ekzlV4d9hi5ScStw="; }; - patches = [ - # Fix implicit declaration of `strcasecmp`, which is an error on clang 16. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/147.patch"; - hash = "sha256-UU2n//Z9F1SyUGyuDKsiwZDyThsp/tJprz/zolDDTyw="; - }) - ]; - nativeBuildInputs = [ glib meson diff --git a/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix b/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix index 8955c8876adc..3b5224c97f93 100644 --- a/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hoene/libmysofa"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/buddy/default.nix b/nixpkgs/pkgs/development/libraries/buddy/default.nix index 47b61fe03510..eb9d146291d9 100644 --- a/nixpkgs/pkgs/development/libraries/buddy/default.nix +++ b/nixpkgs/pkgs/development/libraries/buddy/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ bison ]; patches = [ ./gcc-4.3.3-fixes.patch ]; configureFlags = [ "CFLAGS=-O3" "CXXFLAGS=-O3" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=register"; NIX_LDFLAGS = "-lm"; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/cairomm/1.16.nix b/nixpkgs/pkgs/development/libraries/cairomm/1.16.nix index 10e5286c5010..9da00741c34e 100644 --- a/nixpkgs/pkgs/development/libraries/cairomm/1.16.nix +++ b/nixpkgs/pkgs/development/libraries/cairomm/1.16.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cairomm"; - version = "1.16.2"; + version = "1.18.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://www.cairographics.org/releases/cairomm-${version}.tar.xz"; - sha256 = "amO/mKl92isPVeNNG18/uQnvi3D5uNOCyx/zl459wT8="; + sha256 = "uBJVOU4+qOiqiHJ20ir6iYX8ja72BpLrJAfSMEnwPPs="; }; nativeBuildInputs = [ @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dbuild-tests=true" - "-Dboost-shared=true" ]; # Meson is no longer able to pick up Boost automatically. @@ -54,18 +53,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; meta = with lib; { - description = "A 2D graphics library with support for multiple output devices"; - longDescription = '' - Cairo is a 2D graphics library with support for multiple output - devices. Currently supported output targets include the X - Window System, Quartz, Win32, image buffers, PostScript, PDF, - and SVG file output. Experimental backends include OpenGL - (through glitz), XCB, BeOS, OS/2, and DirectFB. - - Cairo is designed to produce consistent output on all output - media while taking advantage of display hardware acceleration - when available (e.g., through the X Render Extension). - ''; + description = "C++ bindings for the Cairo vector graphics library"; homepage = "https://www.cairographics.org/"; license = with licenses; [ lgpl2Plus mpl10 ]; maintainers = teams.gnome.members; diff --git a/nixpkgs/pkgs/development/libraries/cairomm/default.nix b/nixpkgs/pkgs/development/libraries/cairomm/default.nix index 9a5ebfb289ea..d8d908cbc40d 100644 --- a/nixpkgs/pkgs/development/libraries/cairomm/default.nix +++ b/nixpkgs/pkgs/development/libraries/cairomm/default.nix @@ -3,9 +3,9 @@ , lib , pkg-config , darwin +, boost , cairo , fontconfig -, freetype , libsigcxx , meson , ninja @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cairomm"; - version = "1.14.4"; + version = "1.14.5"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://www.cairographics.org/releases/cairomm-${version}.tar.xz"; - sha256 = "R0nSWisu9nzAwBTKr1yH+kZ5L8Sz7eGG+w/JMtIFUVg="; + sha256 = "cBNiA1QMiE6Jzhye37Y2m5lTk39s1ZbZfHjJdYpdSNs="; }; nativeBuildInputs = [ @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + boost # for tests fontconfig - freetype ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); @@ -40,25 +40,20 @@ stdenv.mkDerivation rec { libsigcxx ]; - doCheck = true; - - meta = with lib; { - description = "A 2D graphics library with support for multiple output devices"; + mesonFlags = [ + "-Dbuild-tests=true" + ]; - longDescription = '' - Cairo is a 2D graphics library with support for multiple output - devices. Currently supported output targets include the X - Window System, Quartz, Win32, image buffers, PostScript, PDF, - and SVG file output. Experimental backends include OpenGL - (through glitz), XCB, BeOS, OS/2, and DirectFB. + # Meson is no longer able to pick up Boost automatically. + # https://github.com/NixOS/nixpkgs/issues/86131 + BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; + BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; - Cairo is designed to produce consistent output on all output - media while taking advantage of display hardware acceleration - when available (e.g., through the X Render Extension). - ''; + doCheck = !stdenv.isDarwin; + meta = with lib; { + description = "C++ bindings for the Cairo vector graphics library"; homepage = "https://www.cairographics.org/"; - license = with licenses; [ lgpl2Plus mpl10 ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/capnproto/default.nix b/nixpkgs/pkgs/development/libraries/capnproto/default.nix index 05e80893ebb0..0312eeaf7eed 100644 --- a/nixpkgs/pkgs/development/libraries/capnproto/default.nix +++ b/nixpkgs/pkgs/development/libraries/capnproto/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "capnproto"; - version = "1.0.1"; + version = "1.0.1.1"; # release tarballs are missing some ekam rules src = fetchFromGitHub { owner = "capnproto"; repo = "capnproto"; rev = "v${version}"; - sha256 = "sha256-ZruJikcMZuUBmNq+f6+wUl4Rr6MVFxmgcj1TSOKM1ZE="; + sha256 = "sha256-LFpCQiepPG78iMq/d3NAN6cSZI1X0QgkKRIxeeZhfEQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix b/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix index 18d055a387ac..d6049d284513 100644 --- a/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, cmake, boost, zlib}: +{lib, stdenv, fetchurl, fetchpatch, cmake, boost, zlib}: stdenv.mkDerivation rec { pname = "clucene-core"; @@ -40,8 +40,21 @@ stdenv.mkDerivation rec { # required for darwin and linux-musl ./pthread-include.patch + ] ++ lib.optionals stdenv.isDarwin [ + ./fix-darwin.patch - ] ++ lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ]; + # see https://bugs.gentoo.org/869170 + (fetchpatch { + url = "https://869170.bugs.gentoo.org/attachment.cgi?id=858825"; + hash = "sha256-TbAfBKdXh+1HepZc8J6OhK1XGwhwBCMvO8QBDsad998="; + }) + ]; + + # see https://github.com/macports/macports-ports/commit/236d43f2450c6be52dc42fd3a2bbabbaa5136201 + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace src/shared/CMakeLists.txt --replace 'fstati64;_fstati64;fstat64;fstat;_fstat' 'fstat;_fstat' + substituteInPlace src/shared/CMakeLists.txt --replace 'stati64;_stati64;stat64;stat;_stat' 'stat;_stat' + ''; # fails with "Unable to find executable: # /build/clucene-core-2.3.3.4/build/bin/cl_test" diff --git a/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix b/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix index 5223f2039cf7..b15335a37ca4 100644 --- a/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix +++ b/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.24.1"; + version = "5.24.2"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Prb593+jXhYzwPHQnwen2qgaNfdX1Atiz1FhmXm9X7U="; + sha256 = "sha256-boV0OO8GzgH0HpNh00nYLM2+wCmvuDxwKHvCMCdmiJs="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix b/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix index c2799b97e2a5..cca1da7ec627 100644 --- a/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix +++ b/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "ctranslate2"; - version = "3.21.0"; + version = "3.22.0"; src = fetchFromGitHub { owner = "OpenNMT"; repo = "CTranslate2"; rev = "v${version}"; - hash = "sha256-ehybfwwMYMKPPeyv05zgDxmw0zr35eoY8wc/tb7DQw0="; + hash = "sha256-Fw0pMTc0Zmr4RfH2rdPgpOODZW9CL5UbDbIeH6A4zZQ="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/libraries/drogon/default.nix b/nixpkgs/pkgs/development/libraries/drogon/default.nix index 5d2e3b3245c3..b5aee15a3045 100644 --- a/nixpkgs/pkgs/development/libraries/drogon/default.nix +++ b/nixpkgs/pkgs/development/libraries/drogon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "drogon"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-KZRW/ra84RegCCT6J0k+N7XqZF+xW+Ecq2TVdPZnM7M="; + sha256 = "sha256-6F+LRcoBqHEbweqbVFHlR3I9nj1NaYty8zKcR4ZHKxg="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/libraries/forge/default.nix b/nixpkgs/pkgs/development/libraries/forge/default.nix index ba85cea73d69..d9996ada5067 100644 --- a/nixpkgs/pkgs/development/libraries/forge/default.nix +++ b/nixpkgs/pkgs/development/libraries/forge/default.nix @@ -1,19 +1,50 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, arrayfire, expat, fontconfig, freeimage, freetype, boost -, mesa, libGLU, libGL, glfw3, SDL2, cudatoolkit +{ boost +, cmake +, expat +, fetchFromGitHub +, fontconfig +, freeimage +, freetype +, glfw3 +, glm +, lib +, libGLU +, libGL +, mesa +, opencl-clhpp +, pkg-config +, stdenv +, SDL2 }: stdenv.mkDerivation rec { pname = "forge"; - version = "1.0.4"; + version = "1.0.8"; src = fetchFromGitHub { owner = "arrayfire"; - repo = "forge"; - rev = "v${version}"; - sha256 = "00pmky6kccd7pwi8sma79qpmzr2f9pbn6gym3gyqm64yckw6m484"; - fetchSubmodules = true; + repo = pname; + rev = "v1.0.8"; + sha256 = "sha256-lSZAwcqAHiuZkpYcVfwvZCfNmEF3xGN9S/HuZQrGeKU="; }; + glad = fetchFromGitHub { + owner = "arrayfire"; + repo = "glad"; + rev = "b94680aee5b8ce01ae1644c5f2661769366c765a"; + hash = "sha256-CrZy76gOGMpy9f1NuMK4tokZ57U//zYeNH5ZYY0SC2U="; + }; + + # This patch ensures that Forge does not try to fetch glad from GitHub and + # uses our sources that we've checked out via Nix. + patches = [ ./no-download-glad.patch ]; + + postPatch = '' + mkdir -p ./extern + cp -R --no-preserve=mode,ownership ${glad} ./extern/fg_glad-src + ln -s ${opencl-clhpp} ./extern/cl2hpp + ''; + + cmakeFlags = [ "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" ]; nativeBuildInputs = [ cmake @@ -21,18 +52,19 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - expat - fontconfig - freetype boost.out boost.dev + expat + fontconfig freeimage - mesa - libGLU libGL + freetype glfw3 + glm + libGL + libGLU + opencl-clhpp SDL2 - cudatoolkit - arrayfire + mesa ]; meta = with lib; { @@ -45,7 +77,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; homepage = "https://arrayfire.com/"; platforms = platforms.linux; - maintainers = with maintainers; [ chessai ]; + maintainers = with maintainers; [ chessai twesterhout ]; }; - } diff --git a/nixpkgs/pkgs/development/libraries/forge/no-download-glad.patch b/nixpkgs/pkgs/development/libraries/forge/no-download-glad.patch new file mode 100644 index 000000000000..0957be82a3b7 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/forge/no-download-glad.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeModules/ForgeConfigureDepsVars.cmake b/CMakeModules/ForgeConfigureDepsVars.cmake +index ee5c2fc..2f75181 100644 +--- a/CMakeModules/ForgeConfigureDepsVars.cmake ++++ b/CMakeModules/ForgeConfigureDepsVars.cmake +@@ -84,7 +84,7 @@ macro(fg_dep_check_and_populate dep_prefix) + URL ${fdcp_args_URI} + URL_HASH ${fdcp_args_REF} + DOWNLOAD_COMMAND \"\" +- UPDATE_DISCONNECTED ON ++ UPDATE_COMMAND \"\" + SOURCE_DIR "${Forge_SOURCE_DIR}/extern/${dep_prefix}-src" + BINARY_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-build" + SUBBUILD_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-subbuild" +@@ -94,7 +94,7 @@ macro(fg_dep_check_and_populate dep_prefix) + QUIET + URL ${fdcp_args_URI} + DOWNLOAD_COMMAND \"\" +- UPDATE_DISCONNECTED ON ++ UPDATE_COMMAND \"\" + SOURCE_DIR "${Forge_SOURCE_DIR}/extern/${dep_prefix}-src" + BINARY_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-build" + SUBBUILD_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-subbuild" +@@ -106,7 +106,7 @@ macro(fg_dep_check_and_populate dep_prefix) + GIT_REPOSITORY ${fdcp_args_URI} + GIT_TAG ${fdcp_args_REF} + DOWNLOAD_COMMAND \"\" +- UPDATE_DISCONNECTED ON ++ UPDATE_COMMAND \"\" + SOURCE_DIR "${Forge_SOURCE_DIR}/extern/${dep_prefix}-src" + BINARY_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-build" + SUBBUILD_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-subbuild" diff --git a/nixpkgs/pkgs/development/libraries/gdal/default.nix b/nixpkgs/pkgs/development/libraries/gdal/default.nix index 28f083c31b10..626c18352b03 100644 --- a/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -76,13 +76,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal"; - version = "3.7.3"; + version = "3.8.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-+69mh1hKL1r7SNwDilaQz5UochMMWFG2lrBLYBF31JY="; + hash = "sha256-EQWAJZgufUC0FADuIotrGhP0Nf5qlgOwmiSlqLSv00A="; }; nativeBuildInputs = [ @@ -221,6 +221,9 @@ stdenv.mkDerivation (finalAttrs: { "gcore/vsis3.py" "gdrivers/gdalhttp.py" "gdrivers/wms.py" + + # disable benchmarks + "benchmark/*" ]; disabledTests = [ # tests that attempt to make network requests diff --git a/nixpkgs/pkgs/development/libraries/gdcm/default.nix b/nixpkgs/pkgs/development/libraries/gdcm/default.nix index 3298be5cc3cc..2a4fdaca2725 100644 --- a/nixpkgs/pkgs/development/libraries/gdcm/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdcm/default.nix @@ -76,6 +76,8 @@ stdenv.mkDerivation rec { "TestSCUValidation" # errors because 3 classes not wrapped: "TestWrapPython" + ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ + "TestRescaler2" ]; checkPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/gensio/default.nix b/nixpkgs/pkgs/development/libraries/gensio/default.nix index a11b5674b58a..3dac6d6804e3 100644 --- a/nixpkgs/pkgs/development/libraries/gensio/default.nix +++ b/nixpkgs/pkgs/development/libraries/gensio/default.nix @@ -2,19 +2,20 @@ , fetchFromGitHub , lib , nix-update-script +, openssl , pkg-config , stdenv }: stdenv.mkDerivation rec { pname = "gensio"; - version = "2.6.2"; + version = "2.7.7"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lpP/pmM06zIw+9EZe+zywExLOcrN3K7IMK32XSrCmYs="; + sha256 = "sha256-fm850eDqKhvjwU5RwdwAro4R23yRn41ePn5++8MXHZ0="; }; passthru = { @@ -27,6 +28,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = lib.optionals stdenv.isDarwin [ openssl ]; + meta = with lib; { description = "General Stream I/O"; homepage = "https://sourceforge.net/projects/ser2net/"; diff --git a/nixpkgs/pkgs/development/libraries/getdns/default.nix b/nixpkgs/pkgs/development/libraries/getdns/default.nix index 0c6fa4a1e633..0a6f34eab6cc 100644 --- a/nixpkgs/pkgs/development/libraries/getdns/default.nix +++ b/nixpkgs/pkgs/development/libraries/getdns/default.nix @@ -1,7 +1,7 @@ # Getdns and Stubby are released together, see https://getdnsapi.net/releases/ { lib, stdenv, fetchurl, cmake, darwin, doxygen, libidn2, libyaml, openssl -, systemd, unbound, yq, nimPackages }: +, systemd, unbound, yq }: let metaCommon = with lib; { maintainers = with maintainers; [ leenaars ehmry ]; @@ -34,8 +34,6 @@ in rec { postInstall = "rm -r $out/share/doc"; - passthru.tests.nim = nimPackages.getdns; - meta = with lib; metaCommon // { description = "A modern asynchronous DNS API"; diff --git a/nixpkgs/pkgs/development/libraries/gjs/default.nix b/nixpkgs/pkgs/development/libraries/gjs/default.nix index 55425c6aa7f2..edcb29f3ccb7 100644 --- a/nixpkgs/pkgs/development/libraries/gjs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gjs/default.nix @@ -9,7 +9,7 @@ , gtk3 , atk , gobject-introspection -, spidermonkey_102 +, spidermonkey_115 , pango , cairo , readline @@ -31,13 +31,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.76.2"; + version = "1.78.0"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-99jJ1lPqb9eK/kpQcg4EaqK/wHj9pjXdEwZ90ZnGJdQ="; + sha256 = "sha256-+6og4JF2aIMIAPkpUWiPn8CPASlq/9XNtLNfdQvifck="; }; patches = [ @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { cairo readline libsysprof-capture - spidermonkey_102 + spidermonkey_115 ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/glib-networking/default.nix b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix index 8b7c18cf1335..d646830c771f 100644 --- a/nixpkgs/pkgs/development/libraries/glib-networking/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.76.1"; + version = "2.78.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "XGmKmZTd5R79+xAmpWaYoiHWJQ6J3FDrzd2nuBSApCs="; + sha256 = "Uv5M6T99xRM0sQKJRZmFjSPIplrEoRELMJIFZdaNOro="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix index 8a1ba46f50eb..c11f6b8432bc 100644 --- a/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -2,7 +2,6 @@ , lib , stdenv , fetchurl -, fetchpatch2 , gettext , meson , ninja @@ -24,17 +23,12 @@ assert stdenv.isLinux -> util-linuxMinimal != null; -# TODO: -# * Make it build without python -# Problem: an example (test?) program needs it. -# Possible solution: disable compilation of this example somehow -# Reminder: add 'sed -e 's@python2\.[0-9]@python@' -i -# $out/bin/gtester-report' to postInstall if this is solved /* + * TODO: * Use --enable-installed-tests for GNOME-related packages, and use them as a separately installed tests run by Hydra (they should test an already installed package) - https://wiki.gnome.org/GnomeGoals/InstalledTests + https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests * Support org.freedesktop.Application, including D-Bus activation from desktop files */ let @@ -56,11 +50,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.76.4"; + version = "2.78.1"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - sha256 = "WloZHJaDbhZqd3H36myisAacYDx9o8uhzTjRaUo5Xdo="; + sha256 = "kVvD0PhQfWUOrTgy4vj7Zw/OWarE13VKfatvHm/teLI="; }; patches = lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/libraries/glib/split-dev-programs.patch b/nixpkgs/pkgs/development/libraries/glib/split-dev-programs.patch index f0a217f65702..f3497e6a7811 100644 --- a/nixpkgs/pkgs/development/libraries/glib/split-dev-programs.patch +++ b/nixpkgs/pkgs/development/libraries/glib/split-dev-programs.patch @@ -1,5 +1,5 @@ diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build -index 65faae9b2..4297513d4 100644 +index 65faae9..4297513 100644 --- a/gio/gdbus-2.0/codegen/meson.build +++ b/gio/gdbus-2.0/codegen/meson.build @@ -20,7 +20,7 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir) @@ -12,30 +12,30 @@ index 65faae9b2..4297513d4 100644 configuration : gdbus_codegen_conf ) diff --git a/gio/meson.build b/gio/meson.build -index 462606f3b..a3047fca1 100644 +index b19c59f..3b20e84 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -880,14 +880,15 @@ pkg.generate(libgio, - variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), - 'schemasdir=' + join_paths('${datadir}', schemas_subdir), - 'bindir=' + join_paths('${prefix}', get_option('bindir')), -+ 'devbindir=' + get_option('devbindir'), - 'giomoduledir=' + pkgconfig_giomodulesdir, - 'gio=' + join_paths('${bindir}', 'gio'), -- 'gio_querymodules=@0@'.format(pkgconfig_multiarch_bindir / 'gio-querymodules'), -- 'glib_compile_schemas=@0@'.format(pkgconfig_multiarch_bindir / 'glib-compile-schemas'), -- 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), -+ 'gio_querymodules=@0@'.format('${devbindir}' / 'gio-querymodules'), -+ 'glib_compile_schemas=@0@'.format('${devbindir}' / 'glib-compile-schemas'), -+ 'glib_compile_resources=' + join_paths('${devbindir}', 'glib-compile-resources'), - 'gdbus=' + join_paths('${bindir}', 'gdbus'), -- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'), -- 'gresource=' + join_paths('${bindir}', 'gresource'), -+ 'gdbus_codegen=' + join_paths('${devbindir}', 'gdbus-codegen'), -+ 'gresource=' + join_paths('${devbindir}', 'gresource'), - 'gsettings=' + join_paths('${bindir}', 'gsettings')], +@@ -879,14 +879,15 @@ pkg.generate(libgio, + 'datadir=' + '${prefix}' / get_option('datadir'), + 'schemasdir=' + '${datadir}' / schemas_subdir, + 'bindir=' + '${prefix}' / get_option('bindir'), ++ 'devbindir=' + get_option('devbindir'), + 'giomoduledir=' + pkgconfig_giomodulesdir, + 'gio=' + '${bindir}' / 'gio', +- 'gio_querymodules=' + pkgconfig_multiarch_bindir / 'gio-querymodules', +- 'glib_compile_schemas=' + pkgconfig_multiarch_bindir / 'glib-compile-schemas', +- 'glib_compile_resources=' + '${bindir}' / 'glib-compile-resources', ++ 'gio_querymodules=' + '${devbindir}' / 'gio-querymodules', ++ 'glib_compile_schemas=' + '${devbindir}' / 'glib-compile-schemas', ++ 'glib_compile_resources=' + '${devbindir}' / 'glib-compile-resources', + 'gdbus=' + '${bindir}' /'gdbus', +- 'gdbus_codegen=' + '${bindir}' / 'gdbus-codegen', +- 'gresource=' + '${bindir}' / 'gresource', ++ 'gdbus_codegen=' + '${devbindir}' / 'gdbus-codegen', ++ 'gresource=' + '${devbindir}' / 'gresource', + 'gsettings=' + '${bindir}' / 'gsettings', + ], version : glib_version, - install_dir : glib_pkgconfigreldir, @@ -989,6 +990,7 @@ executable('gio', gio_tool_sources, executable('gresource', 'gresource-tool.c', @@ -71,24 +71,24 @@ index 462606f3b..a3047fca1 100644 c_args : gio_c_args, # intl.lib is not compatible with SAFESEH diff --git a/glib/meson.build b/glib/meson.build -index da76fc005..8e2ef990c 100644 +index c26a35e..38effe1 100644 --- a/glib/meson.build +++ b/glib/meson.build -@@ -441,9 +441,10 @@ pkg.generate(libglib, - subdirs : ['glib-2.0'], - extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, - variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), -- 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'), -- 'gobject_query=' + join_paths('${bindir}', 'gobject-query'), -- 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')], -+ 'devbindir=' + get_option('devbindir'), -+ 'glib_genmarshal=' + join_paths('${devbindir}', 'glib-genmarshal'), -+ 'gobject_query=' + join_paths('${devbindir}', 'gobject-query'), -+ 'glib_mkenums=' + join_paths('${devbindir}', 'glib-mkenums')], - version : glib_version, - install_dir : glib_pkgconfigreldir, - filebase : 'glib-2.0', -@@ -480,6 +481,7 @@ if host_system == 'windows' +@@ -447,9 +447,10 @@ pkg.generate(libglib, + variables : [ + 'bindir=' + '${prefix}' / get_option('bindir'), + 'datadir=' + '${prefix}' / get_option('datadir'), +- 'glib_genmarshal=' + '${bindir}' / 'glib-genmarshal', +- 'gobject_query=' + '${bindir}' / 'gobject-query', +- 'glib_mkenums=' + '${bindir}' / 'glib-mkenums', ++ 'devbindir=' + get_option('devbindir'), ++ 'glib_genmarshal=' + '${devbindir}' / 'glib-genmarshal', ++ 'gobject_query=' + '${devbindir}' / 'gobject-query', ++ 'glib_mkenums=' + '${devbindir}' / 'glib-mkenums', + 'glib_valgrind_suppressions=' + '${datadir}' / + valgrind_suppression_file_install_subdir / + fs.name(valgrind_suppression_file), +@@ -490,6 +491,7 @@ if host_system == 'windows' else gtester = executable('gtester', 'gtester.c', install : true, @@ -96,7 +96,7 @@ index da76fc005..8e2ef990c 100644 install_tag : 'bin-devel', c_args : ['-UG_DISABLE_ASSERT'], include_directories : configinc, -@@ -492,7 +494,7 @@ report_conf.set('PYTHON', python_name) +@@ -505,7 +507,7 @@ report_conf.set('PYTHON', python_name) configure_file( input: 'gtester-report.in', output: 'gtester-report', @@ -106,7 +106,7 @@ index da76fc005..8e2ef990c 100644 configuration: report_conf, install_mode: 'rwxr-xr-x' diff --git a/gobject/meson.build b/gobject/meson.build -index 2129aaf8a..da8462428 100644 +index 2129aaf..da84624 100644 --- a/gobject/meson.build +++ b/gobject/meson.build @@ -94,7 +94,7 @@ foreach tool: python_tools @@ -127,7 +127,7 @@ index 2129aaf8a..da8462428 100644 dependencies : [libglib_dep, libgobject_dep]) diff --git a/meson_options.txt b/meson_options.txt -index 517d5757c..198cc1b3c 100644 +index 517d575..198cc1b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,6 +4,11 @@ option('runtime_libdir', @@ -143,7 +143,7 @@ index 517d5757c..198cc1b3c 100644 type : 'string', value : '', diff --git a/tools/meson.build b/tools/meson.build -index 2d4192e46..d7e710d6f 100644 +index 257312e..f831539 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -8,7 +8,7 @@ if have_sh diff --git a/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix b/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix index ece609893f7e..187ca8655962 100644 --- a/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix +++ b/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.76.0"; + version = "2.78.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-hjfYDOq9lP3dbkiXCggqJkVY1KuCaE4V/8h+fvNGKrI="; + sha256 = "sha256-XS6HJWSZbwKgbYu6w2d+fDlK+LAN0VJq69R6+EKj71A="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gloox/default.nix b/nixpkgs/pkgs/development/libraries/gloox/default.nix index bb2ff11be3d8..b4cd3ca75ee1 100644 --- a/nixpkgs/pkgs/development/libraries/gloox/default.nix +++ b/nixpkgs/pkgs/development/libraries/gloox/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec{ pname = "gloox"; - version = "1.0.27"; + version = "1.0.28"; src = fetchurl { url = "https://camaya.net/download/gloox-${version}.tar.bz2"; - sha256 = "sha256-C4tzcUObxY2eUThLYWyWSxi3tBuHrxt4VRBDgO2ob/s="; + sha256 = "sha256-WRvRLCSe3gtQoe9rmawN6O+cG6T9Lhhvl6dAIVzFlmw="; }; # needed since gcc12 diff --git a/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix b/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix index 7ba77c14d6c8..3817d8bb9ced 100644 --- a/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix +++ b/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix @@ -36,7 +36,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gobject-introspection"; - version = "1.76.1"; + version = "1.78.1"; # outputs TODO: share/gobject-introspection-1.0/tests is needed during build # by pygobject3 (and maybe others), but it's only searched in $out @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gobject-introspection/${lib.versions.majorMinor finalAttrs.version}/gobject-introspection-${finalAttrs.version}.tar.xz"; - sha256 = "GWF4v2Q0VQHc3E2EabNqpv6ASJNU7+cct8uKuCo3OL8="; + sha256 = "vXur2Zr3JY52gZ5Fukprw5lgj+di2D/ePKwDPFCEG7Q="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/goffice/default.nix b/nixpkgs/pkgs/development/libraries/goffice/default.nix index ece0f168ec55..2d25a6d9e4d6 100644 --- a/nixpkgs/pkgs/development/libraries/goffice/default.nix +++ b/nixpkgs/pkgs/development/libraries/goffice/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "goffice"; - version = "0.10.55"; + version = "0.10.56"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "FqIhGRhVpqbA0Gse+OSBzz9SBBplTsltNYFwRboama8="; + sha256 = "uGQKL+4MCld4SypbkpRKKTLHidsQOd31ommtY0eW5+I="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index 7534ea5d08aa..f898f3d3bcd8 100644 --- a/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "44.0"; + version = "45.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "6y3kXK2QWZSEnmQqYjret11BshsGJtQNKge46igf7A4="; + sha256 = "NlyNBNr3mzjIs9yWJjSaAk+eS+/dMf7edLQvep++CuI="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/gssdp/1.6.nix b/nixpkgs/pkgs/development/libraries/gssdp/1.6.nix index 9479a9cfe88d..468c2a84ca28 100644 --- a/nixpkgs/pkgs/development/libraries/gssdp/1.6.nix +++ b/nixpkgs/pkgs/development/libraries/gssdp/1.6.nix @@ -1,6 +1,5 @@ { stdenv , lib -, fetchpatch , fetchurl , meson , ninja @@ -18,24 +17,15 @@ stdenv.mkDerivation rec { pname = "gssdp"; - version = "1.6.2"; + version = "1.6.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "QQs3be7O2YNrV/SI+ABS/koU+J4HWxzszyjlH0kPn7k="; + sha256 = "L+21r9sizxTVSYo5p3PKiXiKJQ/PcBGHg9+CHh8/NEY="; }; - patches = [ - (fetchpatch { - # https://gitlab.gnome.org/GNOME/gssdp/-/merge_requests/11 - name = "gi-docgen-as-native-dep.patch"; - url = "https://gitlab.gnome.org/GNOME/gssdp/-/commit/db9d02c22005be7e5e81b43a3ab777250bd7b27b.diff"; - hash = "sha256-Q2kwZlpNvSzIcMalrOm5lO5iFe+myS7J0S0vkcp10cw="; - }) - ]; - depsBuildBuild = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix b/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix index 9272d042685c..72cefea7e59a 100644 --- a/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix @@ -9,19 +9,20 @@ , glib , gtk3 , freerdp +, fuse3 , unstableGitUpdater }: stdenv.mkDerivation rec { pname = "gtk-frdp"; - version = "unstable-2023-04-14"; + version = "unstable-2023-09-16"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = "9af99d95ed532128c1856e7a1bfd0b59dd61a35f"; - sha256 = "cz4JJ/NKBYBv5bw18BBfwtWtxPWGBmrwSHgTZ1hS3Qk="; + rev = "62fc62c5ccb7634f0bc87c57a4673877c24c94ed"; + sha256 = "H+ebFWjpmp4Ua22Bd6K3LsxNHqEbtpawnzA5ry8+XFc="; }; nativeBuildInputs = [ @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { glib gtk3 freerdp + fuse3 ]; passthru = { diff --git a/nixpkgs/pkgs/development/libraries/gtk/4.x.nix b/nixpkgs/pkgs/development/libraries/gtk/4.x.nix index 0503ac199f90..218efb6559fb 100644 --- a/nixpkgs/pkgs/development/libraries/gtk/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/4.x.nix @@ -3,6 +3,7 @@ , buildPackages , substituteAll , fetchurl +, fetchpatch , pkg-config , gettext , graphene @@ -40,6 +41,7 @@ , libGL # experimental and can cause crashes in inspector , vulkanSupport ? false +, shaderc , vulkan-loader , vulkan-headers , wayland @@ -67,7 +69,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.10.4"; + version = "4.12.3"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -79,12 +81,19 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "dyVABILgaF4oJl4ibGKEf05zz8qem0FqxYOCB/U3eiQ="; + sha256 = "FIziYvbIZIdFX7HZeTw/WLw+HaR3opYX+tsEIPWHCok="; }; patches = [ # https://github.com/NixOS/nixpkgs/pull/218143#issuecomment-1501059486 ./patches/4.0-fix-darwin-build.patch + + # gdk: Fix compilation on macos + # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6208 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/aa888c0b3f775776fe3b71028396b7a8c6adb1d6.patch"; + sha256 = "sha256-Jw6BvWDX0wIs4blUiX3qdQCR574yhcaO06Vy/IqfbJo="; + }) ]; depsBuildBuild = [ @@ -106,6 +115,8 @@ stdenv.mkDerivation rec { mesonEmulatorHook ] ++ lib.optionals waylandSupport [ wayland-scanner + ] ++ lib.optionals vulkanSupport [ + shaderc # for glslc ] ++ setupHooks; buildInputs = [ @@ -168,7 +179,7 @@ stdenv.mkDerivation rec { mesonFlags = [ # ../docs/tools/shooter.c:4:10: fatal error: 'cairo-xlib.h' file not found - "-Dgtk_doc=${lib.boolToString x11Support}" + "-Ddocumentation=${lib.boolToString x11Support}" "-Dbuild-tests=false" "-Dtracker=${if trackerSupport then "enabled" else "disabled"}" "-Dbroadway-backend=${lib.boolToString broadwaySupport}" @@ -201,6 +212,7 @@ stdenv.mkDerivation rec { files=( build-aux/meson/gen-demo-header.py + build-aux/meson/gen-visibility-macros.py demos/gtk-demo/geninclude.py gdk/broadway/gen-c-array.py gdk/gen-gdk-gresources-xml.py diff --git a/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix b/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix index e1ed8307a39d..21bfdd858c29 100644 --- a/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix @@ -6,6 +6,7 @@ , ninja , python3 , gtk4 +, glib , glibmm_2_68 , cairomm_1_16 , pangomm_2_48 @@ -17,13 +18,13 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "4.10.0"; + version = "4.12.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "4bEJdxVX7MU8upFagLbt6Cf/29AEnGL9+L1/p5r8xus="; + sha256 = "+8PnYYEjNFwBSO9xq7ZUjUIfUrsiT72jSHW2d9wDLJI="; }; nativeBuildInputs = [ @@ -31,6 +32,7 @@ stdenv.mkDerivation rec { meson ninja python3 + glib # glib-compile-resources ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix b/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix index ae0a640234cb..ee2d694c18ff 100644 --- a/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; - version = "5.8.0"; + version = "5.10.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "EQ3Uwg3vIYhvv3dymP4O+Mwq1gI7jzbHQkQRpBSBiTM="; + sha256 = "s4owEMNPWeE7BRdenSDKAqMRBEP+wrHldHQTgBvJwj8="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix b/nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix index ebdff6d74663..60a3bfe91117 100644 --- a/nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix +++ b/nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix b/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix index 8f5e002653fd..eb33748c4589 100644 --- a/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix +++ b/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.6.5"; + version = "1.6.6"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-Q33/lwFC6EBwh6iYVfcX4g0nydduBbTNUX32IcfYiM0="; + hash = "sha256-ydxQ6MeLN5LRsObFxfUsk+k0XT2uKJHjEamTpXT1oE8="; }; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/gvfs/default.nix b/nixpkgs/pkgs/development/libraries/gvfs/default.nix index b88daae22db8..23cf8571daa6 100644 --- a/nixpkgs/pkgs/development/libraries/gvfs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gvfs/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.50.6"; + version = "1.52.1"; src = fetchurl { url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor version}/gvfs-${version}.tar.xz"; - hash = "sha256-xPbhH8TqqZM/TbjHo0R14GaM6tK//tloZ9Bhvj053aU="; + hash = "sha256-zb1EQPbQh5Km51ISRMFzhuIL1TfTdRFwmfyPto/pF0E="; }; patches = [ @@ -61,10 +61,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - # patchShebangs requires executable file - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - patchShebangs test test-driver + patchShebangs test ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix b/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix index 6c6818b455d9..96a6f99925de 100644 --- a/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gvm-libs"; - version = "22.7.2"; + version = "22.7.3"; src = fetchFromGitHub { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vcCugIohuZg+GhUA7ZgkyhMxN0KSvCFVO/HLOnrNxxA="; + hash = "sha256-Vo+lFUGLeGPKq3aUCiiBcBYu6BZ4KQI5vCtnQyRUUiU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/hiredis/default.nix b/nixpkgs/pkgs/development/libraries/hiredis/default.nix index f3be75f0dcbe..fe9442b7d80d 100644 --- a/nixpkgs/pkgs/development/libraries/hiredis/default.nix +++ b/nixpkgs/pkgs/development/libraries/hiredis/default.nix @@ -1,8 +1,9 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { pname = "hiredis"; version = "1.2.0"; + nativeBuildInputs = [openssl]; src = fetchFromGitHub { owner = "redis"; @@ -12,6 +13,7 @@ stdenv.mkDerivation rec { }; PREFIX = "\${out}"; + USE_SSL = 1; meta = with lib; { homepage = "https://github.com/redis/hiredis"; diff --git a/nixpkgs/pkgs/development/libraries/hivex/default.nix b/nixpkgs/pkgs/development/libraries/hivex/default.nix index 650fd5bb6df1..d8e320a44c19 100644 --- a/nixpkgs/pkgs/development/libraries/hivex/default.nix +++ b/nixpkgs/pkgs/development/libraries/hivex/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "hivex"; - version = "1.3.21"; + version = "1.3.23"; src = fetchurl { url = "https://libguestfs.org/download/hivex/${pname}-${version}.tar.gz"; - sha256 = "sha256-ms4+9KL/LKUKmb4Gi2D7H9vJ6rivU+NF6XznW6S2O1Y="; + hash = "sha256-QM9UhPFclGciWfs7makL7285DmPzelKhwGgIogFqa70="; }; patches = [ ./hivex-syms.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/hivex/hivex-syms.patch b/nixpkgs/pkgs/development/libraries/hivex/hivex-syms.patch index bacd34e8515d..f2b06da6aaf1 100644 --- a/nixpkgs/pkgs/development/libraries/hivex/hivex-syms.patch +++ b/nixpkgs/pkgs/development/libraries/hivex/hivex-syms.patch @@ -1,13 +1,11 @@ diff -rupN hivex-1.3.14/lib/Makefile.am hivex-1.3.14-new/lib/Makefile.am --- hivex-1.3.14/lib/Makefile.am 2013-09-10 13:04:12.000000000 +0200 +++ hivex-1.3.14-new/lib/Makefile.am 2014-11-06 01:31:05.956106861 +0100 -@@ -40,8 +40,7 @@ libhivex_la_SOURCES = \ - - libhivex_la_LIBADD = ../gnulib/lib/libgnu.la $(LTLIBOBJS) - libhivex_la_LDFLAGS = \ -- -version-info 0:0:0 \ +@@ -51,7 +51,6 @@ + -pthread \ + -version-info 0:0:0 \ + -no-undefined \ - $(VERSION_SCRIPT_FLAGS)$(srcdir)/hivex.syms \ -+ -version-info 0:0:0 $(LTLIBICONV) \ $(LTLIBINTL) \ $(LTLIBTHREAD) diff --git a/nixpkgs/pkgs/development/libraries/hpp-fcl/default.nix b/nixpkgs/pkgs/development/libraries/hpp-fcl/default.nix index 53bd7f067b29..98748de393d5 100644 --- a/nixpkgs/pkgs/development/libraries/hpp-fcl/default.nix +++ b/nixpkgs/pkgs/development/libraries/hpp-fcl/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "hpp-fcl"; - version = "2.3.7"; + version = "2.4.0"; src = fetchFromGitHub { owner = "humanoid-path-planner"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Bytm5uaHYsfMeZ+JKs75003iHNObRBGDpV7Rz9yW7jQ="; + hash = "sha256-qeAO1FV28L2nbQ/2mDeLMuWS2+FexQ1ORCtt+ztWHj0="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/igraph/default.nix b/nixpkgs/pkgs/development/libraries/igraph/default.nix index 21396a6bdaf8..f8232c35dc01 100644 --- a/nixpkgs/pkgs/development/libraries/igraph/default.nix +++ b/nixpkgs/pkgs/development/libraries/igraph/default.nix @@ -26,13 +26,13 @@ assert (blas.isILP64 == lapack.isILP64 && stdenv.mkDerivation (finalAttrs: { pname = "igraph"; - version = "0.10.7"; + version = "0.10.8"; src = fetchFromGitHub { owner = "igraph"; repo = finalAttrs.pname; rev = finalAttrs.version; - hash = "sha256-1ge5V9G2jmIWQE5TW7+6cXCV9viFkhcnjpYrLQVLrgg="; + hash = "sha256-suma1iS9NdJwU/4EQl6qoFyD4bErLSkY+0yxgh3dHkw="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index b909051aa77b..8782e4a5ea65 100644 --- a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.3.12"; + version = "22.3.14"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-BfMH3gFInWiBCuFZC0bZzpoZCEQzv/+tMvRH9ep5rLk="; + sha256 = "sha256-hNewfGN/hO9hx2+1YmdPPqUORqpNwckQYSSO7zfeVAY="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/itk/generic.nix b/nixpkgs/pkgs/development/libraries/itk/generic.nix index 3a6b2afee0d9..e2db993707e2 100644 --- a/nixpkgs/pkgs/development/libraries/itk/generic.nix +++ b/nixpkgs/pkgs/development/libraries/itk/generic.nix @@ -1,7 +1,8 @@ { version, rev, sourceSha256 }: -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper -, pkg-config, libX11, libuuid, xz, vtk, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake +, expat, fftw, gdcm, hdf5-cpp, libjpeg, libminc, libtiff, libpng +, libX11, libuuid, xz, vtk, zlib, Cocoa }: let itkGenericLabelInterpolatorSrc = fetchFromGitHub { @@ -41,8 +42,6 @@ stdenv.mkDerivation { substituteInPlace CMake/ITKSetStandardCompilerFlags.cmake \ --replace "-march=corei7" "" \ --replace "-mtune=native" "" - substituteInPlace Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/src/lib/openjp2/libopenjp2.pc.cmake.in \ - --replace "@OPENJPEG_INSTALL_LIB_DIR@" "@OPENJPEG_INSTALL_FULL_LIB_DIR@" ln -sr ${itkGenericLabelInterpolatorSrc} Modules/External/ITKGenericLabelInterpolator ln -sr ${itkAdaptiveDenoisingSrc} Modules/External/ITKAdaptiveDenoising ln -sr ${itkSimpleITKFiltersSrc} Modules/External/ITKSimpleITKFilters @@ -52,6 +51,15 @@ stdenv.mkDerivation { "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" "-DITK_FORBID_DOWNLOADS=ON" + "-DITK_USE_SYSTEM_LIBRARIES=ON" # finds common libraries e.g. hdf5, libpng, libtiff, zlib, but not GDCM, NIFTI, MINC, etc. + # note ITK_USE_SYSTEM_EIGEN, part of ITK_USE_SYSTEM_LIBRARIES, + # causes "...-itk-5.2.1/include/ITK-5.2/itkSymmetricEigenAnalysis.h:23:31: fatal error: Eigen/Eigenvalues: No such file or directory" + # when compiling c3d, but maybe an ITK 5.2/eigen version issue: + "-DITK_USE_SYSTEM_EIGEN=OFF" + "-DITK_USE_SYSTEM_GOOGLETEST=OFF" # ANTs build failure due to https://github.com/ANTsX/ANTs/issues/1489 + "-DITK_USE_SYSTEM_GDCM=ON" + "-DITK_USE_SYSTEM_MINC=ON" + "-DLIBMINC_DIR=${libminc}/lib/cmake" "-DModule_ITKMINC=ON" "-DModule_ITKIOMINC=ON" "-DModule_ITKIOTransformMINC=ON" @@ -63,8 +71,12 @@ stdenv.mkDerivation { "-DModule_GenericLabelInterpolator=ON" ]; - nativeBuildInputs = [ cmake xz makeWrapper ]; - buildInputs = [ libX11 libuuid vtk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + nativeBuildInputs = [ cmake xz ]; + buildInputs = [ + libX11 + libuuid + vtk + ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; # Due to ITKVtkGlue=ON and the additional dependencies needed to configure VTK 9 # (specifically libGL and libX11 on Linux), # it's now seemingly necessary for packages that configure ITK to @@ -72,11 +84,20 @@ stdenv.mkDerivation { # These deps were propagated from VTK 9 in https://github.com/NixOS/nixpkgs/pull/206935, # so we simply propagate them again from ITK. # This admittedly is a hack and seems like an issue with VTK 9's CMake configuration. - propagatedBuildInputs = vtk.propagatedBuildInputs; - - postInstall = '' - wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin" - ''; + propagatedBuildInputs = [ + # The dependencies we've un-vendored from ITK, such as GDCM, must be propagated, + # otherwise other software built against ITK fails to configure since ITK headers + # refer to these previously vendored libraries: + expat + fftw + gdcm + hdf5-cpp + libjpeg + libminc + libpng + libtiff + zlib + ] ++ vtk.propagatedBuildInputs; meta = { description = "Insight Segmentation and Registration Toolkit"; diff --git a/nixpkgs/pkgs/development/libraries/java/saxon/default.nix b/nixpkgs/pkgs/development/libraries/java/saxon/default.nix index 4ff3e69c34ce..17dfd7385e12 100644 --- a/nixpkgs/pkgs/development/libraries/java/saxon/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/saxon/default.nix @@ -72,7 +72,7 @@ in { description = "Complete and conformant processor of XSLT 2.0, XQuery 1.0, and XPath 2.0"; }; - saxon-he = common { + saxon_9-he = common { pname = "saxon-he"; version = "9.9.0.1"; prog = "saxon-he"; @@ -83,4 +83,16 @@ in { }; description = "Processor for XSLT 3.0, XPath 2.0 and 3.1, and XQuery 3.1"; }; + + saxon-he = common { + pname = "saxon-he"; + version = "11.5"; + prog = "saxon-he"; + jar = "saxon-he-11.5"; + src = fetchurl { + url = "https://github.com/Saxonica/Saxon-HE/raw/a6d11dec3853326b661e9aff283e30b43c02e163/11/Java/SaxonHE11-5J.zip"; + sha256 = "2Nwh6dG3YAjc/OTr8DMOfbnRvdCWB0YsVP3ZLRbM9U0="; + }; + description = "Processor for XSLT 3.0, XPath 2.0 and 3.1, and XQuery 3.1"; + }; } diff --git a/nixpkgs/pkgs/development/libraries/json-glib/default.nix b/nixpkgs/pkgs/development/libraries/json-glib/default.nix index 0ca03efca025..79075929c651 100644 --- a/nixpkgs/pkgs/development/libraries/json-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/json-glib/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { pname = "json-glib"; - version = "1.6.6"; + version = "1.8.0"; outputs = [ "out" "dev" "installedTests" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "luyYvnqR9t3jNjZyDj2i/27LuQ52zKpJSX8xpoVaSQ4="; + sha256 = "l+9euSyoEQOa1Qpl8GYz8armR5J4kwe+cXB5XYsxlFQ="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch b/nixpkgs/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch index 626db09cd03f..ff09a0115587 100644 --- a/nixpkgs/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch +++ b/nixpkgs/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch @@ -15,13 +15,13 @@ index 1eb56c8..dca444e 100644 install_data(test_data, install_dir: installed_test_bindir) diff --git a/meson_options.txt b/meson_options.txt -index 068a03f..03f398a 100644 +index 5a96998..383aa6c 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -10,3 +10,6 @@ option('man', - option('tests', - type: 'boolean', value: true, - description: 'Build the tests') +@@ -13,3 +13,6 @@ option('tests', + option('nls', + type: 'feature', value: 'auto', yield: true, + description: 'Enable native language support (translations)') +option('installed_test_prefix', + description: 'Prefix for installed tests', + type: 'string') diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/default.nix index 29a02d750762..b5aed8236fd3 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/default.nix @@ -2,6 +2,7 @@ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty, kservice, qtbase, + useSudo ? false }: mkDerivation { @@ -11,5 +12,6 @@ mkDerivation { propagatedBuildInputs = [ kpty ]; outputs = [ "out" "dev" ]; patches = [ ./kdesu-search-for-wrapped-daemon-first.patch ]; + cmakeFlags = lib.optionals useSudo [ "-DKDESU_USE_SUDO_DEFAULT=On" ]; meta.platforms = lib.platforms.linux ++ lib.platforms.freebsd; } diff --git a/nixpkgs/pkgs/development/libraries/lib2geom/default.nix b/nixpkgs/pkgs/development/libraries/lib2geom/default.nix index 0c97f116a0bf..e0db2b76f19e 100644 --- a/nixpkgs/pkgs/development/libraries/lib2geom/default.nix +++ b/nixpkgs/pkgs/development/libraries/lib2geom/default.nix @@ -37,6 +37,17 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/inkscape/lib2geom/-/commit/23d9393af4bee17aeb66a3c13bdad5dbed982d08.patch"; hash = "sha256-LAaGMIXpDI/Wzv5E2LasW1Y2/G4ukhuEzDmFu3AzZOA="; }) + + # Fix ellipses rendering near page corners. + # https://gitlab.com/inkscape/lib2geom/-/issues/66 + (fetchpatch { + url = "https://gitlab.com/inkscape/lib2geom/-/commit/039ce8d4af23a0a2a9d48eb970b321d9795dcc08.patch"; + hash = "sha256-JfgGrqBcYSYKcdl4Bt7vGZ4aTBPSHM6JjZ95IlzxPwI="; + }) + (fetchpatch { + url = "https://gitlab.com/inkscape/lib2geom/-/commit/cf523857e48c87f9f6a09217bdf935fff457823d.patch"; + hash = "sha256-BRg8ANHMSgoi6vt9PNbhwG1fRkzEPXb4gPTPO3sY0XE="; + }) ]; nativeBuildInputs = [ @@ -70,7 +81,13 @@ stdenv.mkDerivation rec { # Broken on all platforms, test just accidentally passes on some. # https://gitlab.com/inkscape/lib2geom/-/issues/63 "elliptical-arc-test" - ]; + ] + ++ lib.optionals stdenv.hostPlatform.isMusl [ + # Fails due to rounding differences + # https://gitlab.com/inkscape/lib2geom/-/issues/70 + "circle-test" + ] + ; in '' runHook preCheck ctest --output-on-failure -E '^${lib.concatStringsSep "|" disabledTests}$' diff --git a/nixpkgs/pkgs/development/libraries/libLAS/default.nix b/nixpkgs/pkgs/development/libraries/libLAS/default.nix index 7f2c12a9dea2..195f77d19231 100644 --- a/nixpkgs/pkgs/development/libraries/libLAS/default.nix +++ b/nixpkgs/pkgs/development/libraries/libLAS/default.nix @@ -25,6 +25,13 @@ stdenv.mkDerivation rec { url = "https://github.com/libLAS/libLAS/commit/0d3b8d75f371a6b7c605bbe5293091cb64a7e2d3.patch"; hash = "sha256-gtNIazR+l1h+Xef+4qQc7EVi+Nlht3F8CrwkINothtA="; }) + # remove on update. fix compile error in apps/las2col.c + # https://github.com/libLAS/libLAS/pull/151 + (fetchpatch { + name = "fflush-x2-is-not-an-fsync.patch"; + url = "https://github.com/libLAS/libLAS/commit/e789d43df4500da0c12d2f6d3ac1d031ed835493.patch"; + hash = "sha256-0zI0NvOt9C5BPrfAbgU1N1kj3rZFB7rf0KRj7yemyWI="; + }) ]; nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; diff --git a/nixpkgs/pkgs/development/libraries/libadwaita/default.nix b/nixpkgs/pkgs/development/libraries/libadwaita/default.nix index 5ce92c04e3ef..3b4aed7a8215 100644 --- a/nixpkgs/pkgs/development/libraries/libadwaita/default.nix +++ b/nixpkgs/pkgs/development/libraries/libadwaita/default.nix @@ -8,6 +8,7 @@ , sassc , vala , gobject-introspection +, appstream , fribidi , glib , gtk4 @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.3.5"; + version = "1.4.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-lxNIysW2uth4Hp6NHjo0vWHupITb9qWkkdG8YEDLrUE="; + hash = "sha256-LXrlTca50ALo+Nm55fwXNb4k3haLqHNnzLPc08VhA5s="; }; depsBuildBuild = [ @@ -54,6 +55,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + appstream fribidi ] ++ lib.optionals stdenv.isDarwin [ AppKit diff --git a/nixpkgs/pkgs/development/libraries/libblockdev/default.nix b/nixpkgs/pkgs/development/libraries/libblockdev/default.nix index e2bbd8a485d2..7b317ecec5a5 100644 --- a/nixpkgs/pkgs/development/libraries/libblockdev/default.nix +++ b/nixpkgs/pkgs/development/libraries/libblockdev/default.nix @@ -31,13 +31,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libblockdev"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libblockdev"; rev = "${finalAttrs.version}-1"; - hash = "sha256-vQ+JHMhfCNb5PALGL9FchRYPHGj+6oQpRfmmGS0ZczI="; + hash = "sha256-9tPI8FyHQ9i7p4HLrxiseIH8Y5uqnlsNjcZ1qIHCcRY="; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix b/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix index 41a51f001451..5977ea33bd24 100644 --- a/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix @@ -1,14 +1,27 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, glib, mesonEmulatorHook }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, gobject-introspection +, vala +, gtk-doc +, docbook_xsl +, glib +, mesonEmulatorHook +, gnome +}: # TODO: Add installed tests once https://gitlab.gnome.org/World/libcloudproviders/issues/4 is fixed stdenv.mkDerivation rec { pname = "libcloudproviders"; - version = "0.3.1"; + version = "0.3.5"; src = fetchurl { - url = "https://gitlab.gnome.org/World/${pname}/repository/archive.tar.gz?ref=${version}"; - sha256 = "0zazjhj3xbwxyzi2b2aws7qdnwn092zg9yrk9v3wd19m3mxq5na3"; + url = "mirror://gnome/sources/libcloudproviders/${lib.versions.majorMinor version}/libcloudproviders-${version}.tar.xz"; + sha256 = "uYdFbt2vcVup1iOqK8UBqxtpff/rEaqng6Y3J13xhto="; }; outputs = [ "out" "dev" "devdoc" ]; @@ -32,6 +45,12 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; + passthru = { + updateScript = gnome.updateScript { + packageName = "libcloudproviders"; + }; + }; + meta = with lib; { description = "DBus API that allows cloud storage sync clients to expose their services"; homepage = "https://gitlab.gnome.org/World/libcloudproviders"; diff --git a/nixpkgs/pkgs/development/libraries/libcotp/default.nix b/nixpkgs/pkgs/development/libraries/libcotp/default.nix index dae73136c7d5..829ab2b9aedf 100644 --- a/nixpkgs/pkgs/development/libraries/libcotp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcotp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcotp"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QvDYdplPhivG4a2otT4MuSY546a2Dw/amWly5aheabQ="; + sha256 = "sha256-5zyQSoz5d/HYrIaj0ChtZYK79bBNlYDsFMSDuzcVhY0="; }; postPatch = lib.optionalString stdenv.cc.isClang '' diff --git a/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock b/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock index 26a8f6666460..966dcb72535e 100644 --- a/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock +++ b/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock @@ -203,7 +203,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e" dependencies = [ "concurrent-queue", - "event-listener 3.0.1", + "event-listener 3.1.0", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -224,9 +224,9 @@ dependencies = [ [[package]] name = "async-imap" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e542b1682eba6b85a721daef0c58e79319ffd0c678565c07ac57c8071c548b5" +checksum = "d736a74edf6c327b53dd9c932eae834253470ac5f0c55770e7e133bcbf986362" dependencies = [ "async-channel 2.1.0", "base64 0.21.5", @@ -585,9 +585,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" +checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff" dependencies = [ "serde", ] @@ -931,9 +931,9 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", "rand_core 0.6.4", @@ -1087,7 +1087,7 @@ dependencies = [ [[package]] name = "deltachat" -version = "1.131.1" +version = "1.131.7" dependencies = [ "ansi_term", "anyhow", @@ -1165,7 +1165,7 @@ dependencies = [ [[package]] name = "deltachat-jsonrpc" -version = "1.131.1" +version = "1.131.7" dependencies = [ "anyhow", "async-channel 2.1.0", @@ -1189,7 +1189,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.131.1" +version = "1.131.7" dependencies = [ "ansi_term", "anyhow", @@ -1204,7 +1204,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.131.1" +version = "1.131.7" dependencies = [ "anyhow", "deltachat", @@ -1229,7 +1229,7 @@ dependencies = [ [[package]] name = "deltachat_ffi" -version = "1.131.1" +version = "1.131.7" dependencies = [ "anyhow", "deltachat", @@ -1479,15 +1479,15 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.16.8" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ "der 0.7.8", "digest 0.10.7", - "elliptic-curve 0.13.6", + "elliptic-curve 0.13.8", "rfc6979 0.4.0", - "signature 2.1.0", + "signature 2.2.0", "spki 0.7.2", ] @@ -1508,7 +1508,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ "pkcs8 0.10.2", - "signature 2.1.0", + "signature 2.2.0", ] [[package]] @@ -1528,14 +1528,15 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" +checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" dependencies = [ "curve25519-dalek 4.1.1", "ed25519 2.2.3", "serde", "sha2 0.10.8", + "subtle", "zeroize", ] @@ -1578,12 +1579,12 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.13.6" +version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct 0.2.0", - "crypto-bigint 0.5.3", + "crypto-bigint 0.5.5", "digest 0.10.7", "ff 0.13.0", "generic-array", @@ -1763,9 +1764,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" +checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" dependencies = [ "libc", "windows-sys", @@ -1798,9 +1799,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.0.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cec0252c2afff729ee6f00e903d479fba81784c8e2bd77447673471fdfaea1" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" dependencies = [ "concurrent-queue", "parking", @@ -1813,7 +1814,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" dependencies = [ - "event-listener 3.0.1", + "event-listener 3.1.0", "pin-project-lite", ] @@ -1899,9 +1900,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f69037fe1b785e84986b4f2cbcf647381876a00671d25ceef715d7812dd7e1dd" +checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" [[package]] name = "filetime" @@ -2150,9 +2151,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.21" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ "bytes", "fnv", @@ -2160,7 +2161,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap", "slab", "tokio", "tokio-util", @@ -2175,12 +2176,6 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" @@ -2195,7 +2190,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.2", + "hashbrown", ] [[package]] @@ -2301,9 +2296,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95b9abcae896730d42b78e09c155ed4ddf82c07b4de772c64aee5b2d8b7c150" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -2474,22 +2469,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown", ] [[package]] @@ -3175,8 +3160,8 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" dependencies = [ - "ecdsa 0.16.8", - "elliptic-curve 0.13.6", + "ecdsa 0.16.9", + "elliptic-curve 0.13.8", "primeorder", "sha2 0.10.8", ] @@ -3198,8 +3183,8 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" dependencies = [ - "ecdsa 0.16.8", - "elliptic-curve 0.13.6", + "ecdsa 0.16.9", + "elliptic-curve 0.13.8", "primeorder", "sha2 0.10.8", ] @@ -3296,8 +3281,8 @@ dependencies = [ "derive_builder", "des", "digest 0.10.7", - "ed25519-dalek 2.0.0", - "elliptic-curve 0.13.6", + "ed25519-dalek 2.1.0", + "elliptic-curve 0.13.8", "flate2", "generic-array", "hex", @@ -3316,7 +3301,7 @@ dependencies = [ "sha1", "sha2 0.10.8", "sha3", - "signature 2.1.0", + "signature 2.2.0", "smallvec", "thiserror", "twofish", @@ -3516,11 +3501,11 @@ dependencies = [ [[package]] name = "primeorder" -version = "0.13.3" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7dbe9ed3b56368bd99483eb32fe9c17fdd3730aebadc906918ce78d54c7eeb4" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" dependencies = [ - "elliptic-curve 0.13.6", + "elliptic-curve 0.13.8", ] [[package]] @@ -4016,7 +4001,7 @@ dependencies = [ "pkcs1 0.7.5", "pkcs8 0.10.2", "rand_core 0.6.4", - "signature 2.1.0", + "signature 2.2.0", "spki 0.7.2", "subtle", "zeroize", @@ -4074,9 +4059,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" dependencies = [ "bitflags 2.4.1", "errno", @@ -4087,9 +4072,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.8" +version = "0.21.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" dependencies = [ "ring 0.17.5", "rustls-webpki", @@ -4479,9 +4464,9 @@ dependencies = [ [[package]] name = "signature" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", "rand_core 0.6.4", @@ -4743,9 +4728,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] @@ -5014,7 +4999,7 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ - "indexmap 2.1.0", + "indexmap", "serde", "serde_spanned", "toml_datetime", @@ -5094,9 +5079,9 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.4" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ "log", "once_cell", @@ -5105,9 +5090,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -5273,9 +5258,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ "getrandom 0.2.11", "serde", @@ -5694,18 +5679,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.25" +version = "0.7.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" +checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.25" +version = "0.7.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" +checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" dependencies = [ "proc-macro2", "quote", @@ -5714,9 +5699,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] diff --git a/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix b/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix index d62e8bf245ca..11e34045c36f 100644 --- a/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cargo , cmake +, deltachat-desktop , deltachat-repl , openssl , perl @@ -30,13 +31,13 @@ let }; in stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.131.1"; + version = "1.131.7"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-JXSZrlekvPVGKR+ritxk3Eru2DhtUN9UBtqUZ7G9/gg="; + hash = "sha256-QzNZBBQ0fFqQByaNRNebtnoljC4rQqVTxbNz2M3LDAc="; }; patches = [ @@ -70,10 +71,18 @@ in stdenv.mkDerivation rec { cargoCheckHook ]; + # Sometimes -fmacro-prefix-map= can redirect __FILE__ to non-existent + # paths. This breaks packages like `python3.pkgs.deltachat`. We embed + # absolute path to headers by expanding `__FILE__`. + postInstall = '' + substituteInPlace $out/include/deltachat.h \ + --replace __FILE__ '"${placeholder "out"}/include/deltachat.h"' + ''; + passthru = { inherit cargoLock; tests = { - inherit deltachat-repl; + inherit deltachat-desktop deltachat-repl; python = python3.pkgs.deltachat; }; }; diff --git a/nixpkgs/pkgs/development/libraries/libdex/default.nix b/nixpkgs/pkgs/development/libraries/libdex/default.nix index 7e17773f3f4c..b5a1ecac0af0 100644 --- a/nixpkgs/pkgs/development/libraries/libdex/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdex/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "libdex"; - version = "0.2.0"; + version = "0.4.1"; outputs = [ "out" "dev" "devdoc" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libdex"; rev = version; - sha256 = "54TwMdO29jordVqlBsMZOVtHc7s7ivf/4OkpCSNu7VE="; + sha256 = "e2Q3KhdMqvMeVVZZKQfVoc3BqbOcUYEnBBG24FJRI1k="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libfabric/default.nix b/nixpkgs/pkgs/development/libraries/libfabric/default.nix index ab2da122da74..34089dbdcaa8 100644 --- a/nixpkgs/pkgs/development/libraries/libfabric/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfabric/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.19.0"; + version = "1.20.0"; enableParallelBuilding = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7VOhdZOPBe1qh8OK8OTNKA5I4A5whl6aOubAzsUDSRw="; + sha256 = "sha256-woRkm/5kLIv1ypSlCosP/ewYgnSXQJYzkuOqdHvEH8I="; }; outputs = [ "out" "dev" "man" ]; diff --git a/nixpkgs/pkgs/development/libraries/libgbinder/default.nix b/nixpkgs/pkgs/development/libraries/libgbinder/default.nix index 32ff8a1e216f..208bd35c6a12 100644 --- a/nixpkgs/pkgs/development/libraries/libgbinder/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgbinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.34"; + version = "1.1.35"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-e4J7K1AZyw3AvBNMj69VGKo7gtJ6Nr2ELjqgoqPlObU="; + sha256 = "sha256-GinEbclpIXMwry2J7Ny20S8G99mPgNLse2rs/IpfWoU="; }; outputs = [ "out" "dev" ]; @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { sed -i -e "s@Cflags: @Cflags: $($PKG_CONFIG --cflags libglibutil) @g" $dev/lib/pkgconfig/$pname.pc ''; - meta = with lib; { + meta = { description = "GLib-style interface to binder"; homepage = "https://github.com/mer-hybris/libgbinder"; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ mcaju ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ mcaju ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix b/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix index 6b5e395efba6..9b160e6b29e8 100644 --- a/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix @@ -38,12 +38,12 @@ stdenv.mkDerivation rec { #hardeningDisable = [ "format" ]; - meta = { + meta = with lib; { description = "Library implementing attempt to create a tiff based interchange format for georeferenced raster imagery"; homepage = "https://github.com/OSGeo/libgeotiff"; changelog = "https://github.com/OSGeo/libgeotiff/blob/${src.rev}/libgeotiff/NEWS"; - license = lib.licenses.mit; - maintainers = [lib.maintainers.marcweber]; - platforms = with lib.platforms; linux ++ darwin; + license = licenses.mit; + maintainers = with maintainers; teams.geospatial.members ++ [ marcweber ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix b/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix index 917fc831ab4b..9d16775f626b 100644 --- a/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libgit2-glib"; - version = "1.1.0"; + version = "1.2.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "w43XV12vgUHh5CIzOldfr2XzySEMCOg+mBuI3UG/HvM="; + sha256 = "EzHa2oOPTh9ZGyZFnUQSajJd52LcPNJhU6Ma+9/hgZA="; }; nativeBuildInputs = [ @@ -52,10 +52,8 @@ stdenv.mkDerivation rec { ]; postPatch = '' - for f in meson_vapi_link.py meson_python_compile.py; do - chmod +x $f - patchShebangs $f - done + chmod +x meson_python_compile.py + patchShebangs meson_python_compile.py ''; passthru = { diff --git a/nixpkgs/pkgs/development/libraries/libglibutil/default.nix b/nixpkgs/pkgs/development/libraries/libglibutil/default.nix index e210fa9e26ba..70fc7d2dbeef 100644 --- a/nixpkgs/pkgs/development/libraries/libglibutil/default.nix +++ b/nixpkgs/pkgs/development/libraries/libglibutil/default.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation rec { sed -i -e "s@Cflags: @Cflags: $($PKG_CONFIG --cflags glib-2.0) @g" $dev/lib/pkgconfig/$pname.pc ''; - meta = with lib; { + meta = { description = "Library of glib utilities."; homepage = "https://git.sailfishos.org/mer-core/libglibutil"; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ mcaju ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ mcaju ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libgsf/default.nix b/nixpkgs/pkgs/development/libraries/libgsf/default.nix index 172e3a2a2c78..eec93fa11169 100644 --- a/nixpkgs/pkgs/development/libraries/libgsf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgsf/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libgsf"; - version = "1.14.50"; + version = "1.14.51"; outputs = [ "out" "dev" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libgsf"; rev = "LIBGSF_${lib.replaceStrings ["."] ["_"] version}"; - hash = "sha256-6RP2DJWcDQ8dkKtcPxAkRsS7jSvvLoDNZHXiDJwR8Eg="; + hash = "sha256-iJcfR+iy1bbRkh+yCAEhY5ks8V6vXIPH7namZSvP98c="; }; postPatch = '' @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GNOME's Structured File Library"; homepage = "https://www.gnome.org/projects/libgsf"; - license = licenses.lgpl2Plus; + license = licenses.lgpl21Only; maintainers = with maintainers; [ lovek323 ]; platforms = lib.platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/libgtop/default.nix b/nixpkgs/pkgs/development/libraries/libgtop/default.nix index 4fffa6740f8e..ae4938483590 100644 --- a/nixpkgs/pkgs/development/libraries/libgtop/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgtop/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "libgtop"; - version = "2.41.1"; + version = "2.41.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Q+qa0T98r5gwPmQXKxkb6blrqzQLAZ3u7HIlHuFA/js="; + hash = "sha256-2QJs2KSNJ83/0zL41gqSdktWQk5SLEIM0ToB9A2vksM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libgweather/default.nix b/nixpkgs/pkgs/development/libraries/libgweather/default.nix index 37c5efc5d069..0ce3450f053e 100644 --- a/nixpkgs/pkgs/development/libraries/libgweather/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgweather/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "libgweather"; - version = "4.2.0"; + version = "4.4.0"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "r4qBLaDYl2oADh1iVywlYIaoFzI/vzWwZtv92NLKYgM="; + sha256 = "Nm6Gb/KnCLiUz+qUdbjo/1TLPitHfqcqit4Nq+5fSKQ="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/libliftoff/default.nix b/nixpkgs/pkgs/development/libraries/libliftoff/default.nix index e14347355060..08b7ab13a275 100644 --- a/nixpkgs/pkgs/development/libraries/libliftoff/default.nix +++ b/nixpkgs/pkgs/development/libraries/libliftoff/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/emersion/libliftoff/releases/tag/v${version}"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ pedrohlc primeos Scrumplex ]; + maintainers = with maintainers; [ primeos Scrumplex ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix b/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix index 42164052075e..668389091c01 100644 --- a/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { "ac_cv_func_realloc_0_nonnull=yes" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration -Wno-implicit-int"; + }; + meta = { description = "Replacement for the old crypt() package and crypt(1) command, with extensions"; homepage = "https://mcrypt.sourceforge.net"; diff --git a/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.74.nix b/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.74.nix new file mode 100644 index 000000000000..c4b3343ecd4c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.74.nix @@ -0,0 +1,10 @@ +{ callPackage, fetchurl }: + +callPackage ./generic.nix ( rec { + version = "0.9.74"; + + src = fetchurl { + url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz"; + sha256 = "sha256-QgNdAmE3MyS/tDQBj0q4klFLECU9GvIy5BtMwsEeZQs="; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/libndtypes/default.nix b/nixpkgs/pkgs/development/libraries/libndtypes/default.nix index 1f0709af6cfc..175b48f10934 100644 --- a/nixpkgs/pkgs/development/libraries/libndtypes/default.nix +++ b/nixpkgs/pkgs/development/libraries/libndtypes/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub }: @@ -6,6 +7,8 @@ stdenv.mkDerivation { pname = "libndtypes"; version = "unstable-2019-08-01"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "xnd-project"; repo = "ndtypes"; diff --git a/nixpkgs/pkgs/development/libraries/libpanel/default.nix b/nixpkgs/pkgs/development/libraries/libpanel/default.nix index 3a9c80ed9c4c..c5b325cb8217 100644 --- a/nixpkgs/pkgs/development/libraries/libpanel/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpanel/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "libpanel"; - version = "1.2.0"; + version = "1.4.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/libpanel/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "2QVbu6uWJfP1zm0f1xMutuo0proHqH6ZOJAfuLMVgeI="; + sha256 = "gPFD2QDoztj/hPqG/jTra0gyPLYQvPtoWOpl2LmPFSw="; }; nativeBuildInputs = [ @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Dock/panel library for GTK 4"; homepage = "https://gitlab.gnome.org/GNOME/libpanel"; - license = licenses.lgpl21Plus; + license = licenses.lgpl3Plus; maintainers = teams.gnome.members; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/libpeas/2.x.nix b/nixpkgs/pkgs/development/libraries/libpeas/2.x.nix new file mode 100644 index 000000000000..2b3bd0bc5797 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libpeas/2.x.nix @@ -0,0 +1,86 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, gi-docgen +, gobject-introspection +, meson +, ninja +, gjs +, glib +, lua5_1 +, python3 +, spidermonkey_115 +, gnome +}: + +stdenv.mkDerivation rec { + pname = "libpeas"; + version = "2.0.0"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + hash = "sha256-VAesvAwS95D3DJ0rmCJKzBvjrEScYGA7gZLKAgtJcBE="; + }; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + gi-docgen + gobject-introspection + meson + ninja + pkg-config + ]; + + buildInputs = [ + gjs + glib + lua5_1 + lua5_1.pkgs.lgi + python3 + python3.pkgs.pygobject3 + spidermonkey_115 + ]; + + propagatedBuildInputs = [ + # Required by libpeas-2.pc + gobject-introspection + ]; + + mesonFlags = [ + "-Dgtk_doc=true" + ]; + + postPatch = '' + # Checks lua51 and lua5.1 executable but we have non of them. + substituteInPlace meson.build --replace \ + "find_program('lua51', required: false)" \ + "find_program('lua', required: false)" + ''; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + passthru = { + updateScript = gnome.updateScript { + attrPath = "libpeas2"; + packageName = "libpeas"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "A GObject-based plugins engine"; + homepage = "https://wiki.gnome.org/Projects/Libpeas"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = teams.gnome.members; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libportal/default.nix b/nixpkgs/pkgs/development/libraries/libportal/default.nix index 0052f710a1d5..b5c06c609f30 100644 --- a/nixpkgs/pkgs/development/libraries/libportal/default.nix +++ b/nixpkgs/pkgs/development/libraries/libportal/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , meson , ninja , pkg-config @@ -19,7 +18,7 @@ assert variant == null || variant == "gtk3" || variant == "gtk4" || variant == " stdenv.mkDerivation rec { pname = "libportal" + lib.optionalString (variant != null) "-${variant}"; - version = "0.6"; + version = "0.7.1"; outputs = [ "out" "dev" ] ++ lib.optional (variant != "qt5") "devdoc"; @@ -28,19 +27,9 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = "libportal"; rev = version; - sha256 = "sha256-wDDE43UC6FBgPYLS+WWExeheURCH/3fCKu5oJg7GM+A="; + sha256 = "sha256-3roZJHnGFM7ClxbB7I/haexPTwYskidz9F+WV3RL9Ho="; }; - # TODO: remove on 0.7 - patches = [ - # https://github.com/flatpak/libportal/pull/107 - (fetchpatch { - name = "check-presence-of-sys-vfs-h.patch"; - url = "https://github.com/flatpak/libportal/commit/e91a5d2ceb494ca0dd67295736e671b0142c7540.patch"; - sha256 = "sha256-uFyhlU2fJgW4z0I31fABdc+pimLFYkqM4lggSIFs1tw="; - }) - ]; - depsBuildBuild = [ pkg-config ]; @@ -67,10 +56,12 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dbackends=${lib.optionalString (variant != null) variant}" - "-Dvapi=${if variant != "qt5" then "true" else "false"}" - "-Dintrospection=${if variant != "qt5" then "true" else "false"}" - "-Ddocs=${if variant != "qt5" then "true" else "false"}" # requires introspection=true + (lib.mesonEnable "backend-gtk3" (variant == "gtk3")) + (lib.mesonEnable "backend-gtk4" (variant == "gtk4")) + (lib.mesonEnable "backend-qt5" (variant == "qt5")) + (lib.mesonBool "vapi" (variant != "qt5")) + (lib.mesonBool "introspection" (variant != "qt5")) + (lib.mesonBool "docs" (variant != "qt5")) # requires introspection=true ]; postFixup = '' diff --git a/nixpkgs/pkgs/development/libraries/libpostal/0001-test-adding-header-to-fix-warning.patch b/nixpkgs/pkgs/development/libraries/libpostal/0001-test-adding-header-to-fix-warning.patch new file mode 100644 index 000000000000..cddd20d29e95 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libpostal/0001-test-adding-header-to-fix-warning.patch @@ -0,0 +1,24 @@ +From bfdb6b8f87cc1cae9ba47870ff23deae0bb8ba51 Mon Sep 17 00:00:00 2001 +From: Al <albarrentine@gmail.com> +Date: Sun, 17 Dec 2017 20:17:01 -0500 +Subject: [PATCH] [test] adding header to fix warning + +--- + test/test_expand.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/test_expand.c b/test/test_expand.c +index 59ed9af7..2b211728 100644 +--- a/test/test_expand.c ++++ b/test/test_expand.c +@@ -4,6 +4,7 @@ + #include <stdarg.h> + + #include "greatest.h" ++#include "../src/string_utils.h" + #include "../src/libpostal.h" + + SUITE(libpostal_expansion_tests); +-- +2.42.0 + diff --git a/nixpkgs/pkgs/development/libraries/libpostal/default.nix b/nixpkgs/pkgs/development/libraries/libpostal/default.nix index 30c7af9ccc56..fbeb60022a1d 100644 --- a/nixpkgs/pkgs/development/libraries/libpostal/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpostal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "libpostal"; @@ -11,6 +11,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-gQTD2LQibaB2TK0SbzoILAljAGExURvDcF3C/TfDXqk="; }; + patches = [ + # Fix darwin compilation with XCode 12 https://github.com/openvenues/libpostal/issues/511 + (fetchpatch { + name = "Fix-C-compilation-macOS.patch"; + url = "https://github.com/openvenues/libpostal/commit/9fcf066e38121b5c1439fc6bdc9a7e02234c8622.patch"; + hash = "sha256-VpboGK+5sc1XrxMB051KWc8vP7Eu2g7zmTirzSaerns="; + }) + # https://github.com/openvenues/libpostal/commit/bfdb6b8f87cc1cae9ba47870ff23deae0bb8ba51.patch + # with extra hunk removed so it applies + ./0001-test-adding-header-to-fix-warning.patch + ]; + nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/libre/default.nix b/nixpkgs/pkgs/development/libraries/libre/default.nix index 9a86643061ce..256d90321939 100644 --- a/nixpkgs/pkgs/development/libraries/libre/default.nix +++ b/nixpkgs/pkgs/development/libraries/libre/default.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation rec { - version = "3.6.0"; + version = "3.6.2"; pname = "libre"; src = fetchFromGitHub { owner = "baresip"; repo = "re"; rev = "v${version}"; - sha256 = "sha256-pFtrmrNRSL1lw10LjayOoNFrW/tTPXwmUipwC5v1MZs="; + sha256 = "sha256-mbwi6tJer4JC7ijB6WGDNoC/EM5rqCtejbYRFi9Kwgk="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/librem/default.nix b/nixpkgs/pkgs/development/libraries/librem/default.nix index e6ed4d2b6799..8a1d24948aa4 100644 --- a/nixpkgs/pkgs/development/libraries/librem/default.nix +++ b/nixpkgs/pkgs/development/libraries/librem/default.nix @@ -2,13 +2,13 @@ , cmake }: stdenv.mkDerivation rec { - version = "2.10.0"; + version = "2.12.0"; pname = "librem"; src = fetchFromGitHub { owner = "baresip"; repo = "rem"; rev = "v${version}"; - sha256 = "sha256-wyzpx0WjQLA8UKx4S6QOETMehf51Af5napZsxMXttmM="; + sha256 = "sha256-MsXSUxFH89EqxMe4285xFV1Tsqmv2l5RnEeli48O3XQ="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ zlib openssl libre ]; diff --git a/nixpkgs/pkgs/development/libraries/librsvg/default.nix b/nixpkgs/pkgs/development/libraries/librsvg/default.nix index 7ba6f1963e71..e8658558f69a 100644 --- a/nixpkgs/pkgs/development/libraries/librsvg/default.nix +++ b/nixpkgs/pkgs/development/libraries/librsvg/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "librsvg"; - version = "2.56.3"; + version = "2.57.0"; outputs = [ "out" "dev" ] ++ lib.optionals withIntrospection [ "devdoc" @@ -50,13 +50,13 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz"; - hash = "sha256-WjKASKAtAUZFzSf2EUD04LESgPssfyohhk/gxZrBzog="; + hash = "sha256-M1/i4MLL8be/BmhlEiSiPhNUUfCxeTzYE2Sb4r/6dOg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; name = "librsvg-deps-${finalAttrs.version}"; - hash = "sha256-s7eNMSdajr2VhB/BPVUFftHhHKCqpR9sTfxfWwag1mI="; + hash = "sha256-P8W4z/MwSpP0xqrxoVZPAip7ymdIUL2+uP88Q2Y3hVU="; # TODO: move this to fetchCargoTarball dontConfigure = true; }; diff --git a/nixpkgs/pkgs/development/libraries/libsecret/default.nix b/nixpkgs/pkgs/development/libraries/libsecret/default.nix index 3dfb0c295b1f..2818e27ae4cf 100644 --- a/nixpkgs/pkgs/development/libraries/libsecret/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsecret/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "libsecret"; - version = "0.20.5"; + version = "0.21.1"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "P7PONA/NfbVNh8iT5pv8Kx9uTUsnkGX/5m2snw/RK00="; + sha256 = "Z09RMjpfdOTLfjJ32mi1r93TM+yiW8n9LYIKkpcvkLE="; }; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/libserdes/default.nix b/nixpkgs/pkgs/development/libraries/libserdes/default.nix index 8b61669d1c6d..a3cec3788b58 100644 --- a/nixpkgs/pkgs/development/libraries/libserdes/default.nix +++ b/nixpkgs/pkgs/development/libraries/libserdes/default.nix @@ -39,6 +39,11 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs configure lds-gen.pl + '' + lib.optionalString (stdenv.cc.libcxx != null) '' + # fix for https://github.com/NixOS/nixpkgs/issues/166205 + # llvm12+ isn't adding libc++abi + substituteInPlace src-cpp/Makefile \ + --replace "LIBS += -lstdc++" "LIBS += -lc++ -l${stdenv.cc.libcxx.cxxabi.libName}" ''; # Has a configure script but it’s not Autoconf so steal some bits from multiple-outputs.sh: diff --git a/nixpkgs/pkgs/development/libraries/libshumate/default.nix b/nixpkgs/pkgs/development/libraries/libshumate/default.nix index e449a9085bbe..a7a9eda44f2f 100644 --- a/nixpkgs/pkgs/development/libraries/libshumate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libshumate/default.nix @@ -12,13 +12,14 @@ , sqlite , libsoup_3 , gtk4 +, libsysprof-capture , xvfb-run , gnome }: stdenv.mkDerivation rec { pname = "libshumate"; - version = "1.0.5"; + version = "1.1.2"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libshumate"; rev = version; - sha256 = "mHfhCKzLfP1BkqM+FiLUlo/I0TCe3G8C0lmO6007pMY="; + sha256 = "g/82LQNwM/dwQ/zKDhAGtZE7JEtQ0jFWcylcP1azvSY="; }; nativeBuildInputs = [ @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { sqlite libsoup_3 gtk4 + libsysprof-capture ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix b/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix index ab36b271b3ae..9ed8a3fd4c3f 100644 --- a/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix +++ b/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libsigc++"; - version = "3.4.0"; + version = "3.6.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "AuJjD/tc6TzVLDhCNSHf5wYzKIY6bpbUHXZaYRa4cH4="; + sha256 = "w9I7N9/W458uCfCRt3sVQfv6F8Twtr9cibrvcikIDhc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix b/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix index b5919d62d448..3afb588af1b1 100644 --- a/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libsigc++"; - version = "2.10.8"; + version = "2.12.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-I1pAvsc0bHuCtqjKrgRWNT3AbnHxS8QUvMhYrxg4cZo="; + sha256 = "sha256-qdvuMjNR0Qm3ruB0qcuJyj57z4rY7e8YUfTPNZvVCEM="; }; nativeBuildInputs = [ pkg-config meson ninja ]; diff --git a/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix b/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix index ba4d1b0cd8a6..60b7d2f38321 100644 --- a/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "libsoup"; - version = "3.4.2"; + version = "3.4.4"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-eMj6N8sVLUDsjEoUjWFV4vaUfz8WAqfNo6Ma1A9e4vM="; + sha256 = "sha256-KRxncl827ZDqQ+//JQZLacWi0ZgUiEd8BcSBo7Swxao="; }; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/libubox/default.nix b/nixpkgs/pkgs/development/libraries/libubox/default.nix index a1fe567af8b1..f54e5c5a5afa 100644 --- a/nixpkgs/pkgs/development/libraries/libubox/default.nix +++ b/nixpkgs/pkgs/development/libraries/libubox/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "libubox"; - version = "unstable-2023-05-23"; + version = "unstable-2023-11-03"; src = fetchgit { url = "https://git.openwrt.org/project/libubox.git"; - rev = "75a3b870cace1171faf57bd55e5a9a2f1564f757"; - hash = "sha256-QhJ09i7IWP6rbxrYuhisVsCr82Ou/JAZMEdkaLhZp1o="; + rev = "f7d1569113110ea8df071d2ea64fd17aaf5b42c9"; + hash = "sha256-W0+QXI0gJ4WwrlRMPAJOChvilZ4zlAf4kXrfgBAkQAE="; }; cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" (if with_lua then "-DLUAPATH=${placeholder "out"}/lib/lua" else "-DBUILD_LUA=OFF") ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation { description = "C utility functions for OpenWrt"; homepage = "https://git.openwrt.org/?p=project/libubox.git;a=summary"; license = licenses.isc; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz mkg20001 ]; mainProgram = "jshn"; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/development/libraries/libva/default.nix b/nixpkgs/pkgs/development/libraries/libva/default.nix index 43fe69af2b0e..f3d58613b25d 100644 --- a/nixpkgs/pkgs/development/libraries/libva/default.nix +++ b/nixpkgs/pkgs/development/libraries/libva/default.nix @@ -9,16 +9,17 @@ , mpv , intel-vaapi-driver , vlc +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libva" + lib.optionalString minimal "-minimal"; version = "2.20.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-ENAsytjqvS8xHZyZLPih3bzBgQ1f/j+s3dWZs1GTWHs="; }; @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { # other drivers depending on libva and selected application users. # Please get a confirmation from the maintainer before adding more applications. inherit intel-compute-runtime intel-media-driver intel-vaapi-driver mpv vlc; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { @@ -52,9 +54,12 @@ stdenv.mkDerivation rec { driver-specific acceleration backends for each supported hardware vendor. ''; homepage = "https://01.org/linuxmedia/vaapi"; - changelog = "https://raw.githubusercontent.com/intel/libva/${version}/NEWS"; + changelog = "https://raw.githubusercontent.com/intel/libva/${finalAttrs.version}/NEWS"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; + pkgConfigModules = [ "libva" "libva-drm" ] ++ lib.optionals (!minimal) [ + "libva-glx" "libva-wayland" "libva-x11" + ]; platforms = platforms.unix; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/libwacom/default.nix b/nixpkgs/pkgs/development/libraries/libwacom/default.nix index 254769349b15..2fbb29347d42 100644 --- a/nixpkgs/pkgs/development/libraries/libwacom/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwacom/default.nix @@ -41,7 +41,10 @@ stdenv.mkDerivation rec { libgudev ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform && lib.meta.availableOn stdenv.hostPlatform valgrind; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform + && lib.meta.availableOn stdenv.hostPlatform valgrind + && !stdenv.hostPlatform.isPower # one test times out + ; mesonFlags = [ "-Dtests=${if doCheck then "enabled" else "disabled"}" diff --git a/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix b/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix index a535763b8c19..af028888b23b 100644 --- a/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libwebsockets"; - version = "4.3.2"; + version = "4.3.3"; src = fetchFromGitHub { owner = "warmcat"; repo = "libwebsockets"; rev = "v${version}"; - hash = "sha256-why8LAcc4XN0JdTJ1JoNWijKENL5mOHBsi9K4wpYr2c="; + hash = "sha256-IXA9NUh55GtZmn4BhCXntVdHcKZ34iZIJ/0wlySj0/M="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libxmlb/default.nix b/nixpkgs/pkgs/development/libraries/libxmlb/default.nix index 2a1f0941f4db..391874e531d7 100644 --- a/nixpkgs/pkgs/development/libraries/libxmlb/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxmlb/default.nix @@ -13,11 +13,12 @@ , shared-mime-info , nixosTests , xz +, zstd }: stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.3.10"; + version = "0.3.14"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "sha256-uitnVqR2VVNAf8H1Q/u6LezhvfQJ/G2bE0Dv9dyP8+A="; + hash = "sha256-lpVXl/n/ecDLbbLQg9T+o4GdGZM7pNXGYTyVogNCl2E="; }; patches = [ @@ -47,6 +48,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib xz + zstd ]; mesonFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch b/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch index 0e74d131b2e8..e9bd27e1fff1 100644 --- a/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch +++ b/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch @@ -1,9 +1,6 @@ -diff --git a/meson.build b/meson.build -index c98e1a7..025d9c8 100644 --- a/meson.build +++ b/meson.build -@@ -110,8 +110,8 @@ else - prefix = get_option('prefix') +@@ -111,7 +111,7 @@ else datadir = join_paths(prefix, get_option('datadir')) libexecdir = join_paths(prefix, get_option('libexecdir')) - installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name()) @@ -13,12 +10,11 @@ index c98e1a7..025d9c8 100644 endif gio = dependency('gio-2.0', version : '>= 2.45.8') -diff --git a/meson_options.txt b/meson_options.txt -index 54ab698..8a7122a 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -3,3 +3,4 @@ option('introspection', type : 'boolean', value : true, description : 'generate +@@ -3,4 +3,5 @@ option('introspection', type : 'boolean', value : true, description : 'generate option('tests', type : 'boolean', value : true, description : 'enable tests') option('stemmer', type : 'boolean', value : false, description : 'enable stemmer support') option('cli', type : 'boolean', value : true, description : 'build and install the xb-tool CLI') + option('zstd', type : 'boolean', value : true, description : 'enable zstd support') +option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') diff --git a/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix b/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix index 717ef7c70bde..9ec4090f60f0 100644 --- a/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1sb3akryklvh2v6m6dihdnbpf1lkx441v972q9hlz1sq6bfspm2a"; }; + configureFlags = [ + # remove if library is updated + "CXXFLAGS=-std=c++11" + ]; + outputs = [ "out" "devdoc" ]; nativeBuildInputs = [ pkg-config perl ]; diff --git a/nixpkgs/pkgs/development/libraries/log4cplus/default.nix b/nixpkgs/pkgs/development/libraries/log4cplus/default.nix index 163281ef4890..df5fab1839cd 100644 --- a/nixpkgs/pkgs/development/libraries/log4cplus/default.nix +++ b/nixpkgs/pkgs/development/libraries/log4cplus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "log4cplus"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "mirror://sourceforge/log4cplus/log4cplus-${version}.tar.bz2"; - sha256 = "sha256-oElFrKX7wEh1A8hSvvuc3vvDrj/mFLCKkFMz9t91Q4c="; + sha256 = "sha256-ZZfeeCd15OD7qP3K2TjDcJ/YOagITEtu3648xQRuJog="; }; meta = { diff --git a/nixpkgs/pkgs/development/libraries/luabind/0.9.1-discover-luajit.patch b/nixpkgs/pkgs/development/libraries/luabind/0.9.1-discover-luajit.patch new file mode 100644 index 000000000000..eab2bda7b9ca --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/luabind/0.9.1-discover-luajit.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/Modules/FindLua52.cmake b/cmake/Modules/FindLua52.cmake +index f4398e4..17377c0 100644 +--- a/cmake/Modules/FindLua52.cmake ++++ b/cmake/Modules/FindLua52.cmake +@@ -61,7 +61,7 @@ FIND_PATH(LUA_INCLUDE_DIR lua.h + ) + + FIND_LIBRARY(_LUA_LIBRARY_RELEASE +- NAMES lua52 lua5.2 lua-5.2 lua ++ NAMES lua52 lua5.2 lua-5.2 lua luajit-5.1 + HINTS + $ENV{LUA_DIR} + PATH_SUFFIXES lib64 lib +@@ -75,7 +75,7 @@ FIND_LIBRARY(_LUA_LIBRARY_RELEASE + ) + + FIND_LIBRARY(_LUA_LIBRARY_DEBUG +- NAMES lua52-d lua5.2-d lua-5.2-d lua-d ++ NAMES lua52-d lua5.2-d lua-5.2-d lua-d luajit-5.1-d + HINTS + $ENV{LUA_DIR} + PATH_SUFFIXES lib64 lib diff --git a/nixpkgs/pkgs/development/libraries/luabind/default.nix b/nixpkgs/pkgs/development/libraries/luabind/default.nix index 069e13ddde11..f7f0878bdffa 100644 --- a/nixpkgs/pkgs/development/libraries/luabind/default.nix +++ b/nixpkgs/pkgs/development/libraries/luabind/default.nix @@ -21,8 +21,10 @@ stdenv.mkDerivation rec { inherit lua; }; + patches = [./0.9.1-discover-luajit.patch]; + meta = { - homepage = "https://github.com/luabind/luabind"; + homepage = "https://github.com/Oberon00/luabind"; description = "A library that helps you create bindings between C++ and Lua"; license = lib.licenses.mit; platforms = lib.platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/mac/default.nix b/nixpkgs/pkgs/development/libraries/mac/default.nix index f2eb23423251..8bb245342ca5 100644 --- a/nixpkgs/pkgs/development/libraries/mac/default.nix +++ b/nixpkgs/pkgs/development/libraries/mac/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"; license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/matio/default.nix b/nixpkgs/pkgs/development/libraries/matio/default.nix index a1aee4dd8f51..aebd14780636 100644 --- a/nixpkgs/pkgs/development/libraries/matio/default.nix +++ b/nixpkgs/pkgs/development/libraries/matio/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "matio"; - version = "1.5.23"; + version = "1.5.26"; src = fetchurl { url = "mirror://sourceforge/matio/${pname}-${version}.tar.gz"; - sha256 = "sha256-n5Hq5mHfRupTwxGhstz/cgUQlbAjxhLXy/wJQGyfTW4="; + sha256 = "sha256-i0fCn1jkaNunpVVTccanKtTGqosV9FmysLZaMDwGOTM="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/miniaudio/default.nix b/nixpkgs/pkgs/development/libraries/miniaudio/default.nix index 2df349b83dcc..76b77227130b 100644 --- a/nixpkgs/pkgs/development/libraries/miniaudio/default.nix +++ b/nixpkgs/pkgs/development/libraries/miniaudio/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { pname = "miniaudio"; - version = "0.11.18"; + version = "0.11.20"; src = fetchFromGitHub { owner = "mackron"; repo = "miniaudio"; rev = version; - hash = "sha256-y0o33hnKoZ8gWWFNFIOUJcXMWENaYzMLZzeTOoVETOY="; + hash = "sha256-qIUqHLHTHFMtZU0GMZp5iWnoBJ/+Zv3tbLopSHolB4s="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix b/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix index 2606edc76098..bfb7cd26fbb2 100644 --- a/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix +++ b/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizip-ng"; - version = "4.0.2"; + version = "4.0.3"; src = fetchFromGitHub { owner = "zlib-ng"; repo = finalAttrs.pname; rev = finalAttrs.version; - hash = "sha256-aJ6KYR9DazVQoPuc4w/gClKH9ditNE1JDU/F9dCJOsw="; + hash = "sha256-rP3WficGQZ2sSYnU9Tj0lVl36ShwV76fn/1lv+TrK2c="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/nanoflann/default.nix b/nixpkgs/pkgs/development/libraries/nanoflann/default.nix index 1fa8a216e4dd..a9fb463e707a 100644 --- a/nixpkgs/pkgs/development/libraries/nanoflann/default.nix +++ b/nixpkgs/pkgs/development/libraries/nanoflann/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.5.0"; + version = "1.5.1"; pname = "nanoflann"; src = fetchFromGitHub { owner = "jlblancoc"; repo = "nanoflann"; rev = "v${finalAttrs.version}"; - hash = "sha256-vPLL6l4sFRi7nvIfdMbBn/gvQ1+1lQHlZbR/2ok0Iw8="; + hash = "sha256-ozFYqEq6PSe1C6Lc13Szxt8+sUTTlbXrmMgb8cvX04I="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix b/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix index 6f285fdff367..8714c6b4037a 100644 --- a/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix +++ b/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nix-plugins"; - version = "12.0.0"; + version = "14.0.0"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-plugins"; rev = version; - hash = "sha256-VJqLfOT7y32Jupl57YXxqeDPy0tOWi46tRLN1QUDIow="; + hash = "sha256-RDKAuLwcZ3Pbn5JUDmGBcfD0xbM6Jud2ouXh/YKpfS8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/nss/latest.nix b/nixpkgs/pkgs/development/libraries/nss/latest.nix index c4d619e77144..9244978061ee 100644 --- a/nixpkgs/pkgs/development/libraries/nss/latest.nix +++ b/nixpkgs/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.94"; - hash = "sha256-RjrhgO6eXunjrU9ikyZlfiNngMyGVXKpMKFlIKutndg="; + version = "3.95"; + hash = "sha256-RpiI5B6KeABRzgDtzZFOimvTjaiKgs+4SJjdOIY1gio="; } diff --git a/nixpkgs/pkgs/development/libraries/ogre/default.nix b/nixpkgs/pkgs/development/libraries/ogre/default.nix index d9b907ebeaae..83355c235f31 100644 --- a/nixpkgs/pkgs/development/libraries/ogre/default.nix +++ b/nixpkgs/pkgs/development/libraries/ogre/default.nix @@ -100,8 +100,8 @@ let in { ogre_14 = common { - version = "14.1.0"; - hash = "sha256-CPyXqlUb69uLCsoomjFUbBj7bzPyI01m2yinFuoX5nE="; + version = "14.1.2"; + hash = "sha256-qPoC5VXA9IC1xiFLrvE7cqCZFkuiEM0OMowUXDlmhF4="; }; ogre_13 = common { diff --git a/nixpkgs/pkgs/development/libraries/olm/default.nix b/nixpkgs/pkgs/development/libraries/olm/default.nix index f8c3193b8355..bb7553c2eb3e 100644 --- a/nixpkgs/pkgs/development/libraries/olm/default.nix +++ b/nixpkgs/pkgs/development/libraries/olm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "olm"; - version = "3.2.15"; + version = "3.2.16"; src = fetchFromGitLab { domain = "gitlab.matrix.org"; owner = "matrix-org"; repo = pname; rev = version; - sha256 = "sha256-1mT0mcwssqe+DN502ExkcC/q3w9uBmlTil2gVJsMvvc="; + sha256 = "sha256-JX20mpuLO+UoNc8iQlXEHAbH9sfblkBbM1gE27Ve0ac="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/openvr/default.nix b/nixpkgs/pkgs/development/libraries/openvr/default.nix index cc2a81ac4de7..01f73d3da667 100644 --- a/nixpkgs/pkgs/development/libraries/openvr/default.nix +++ b/nixpkgs/pkgs/development/libraries/openvr/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { description = "An API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting"; homepage = "https://github.com/ValveSoftware/openvr"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ pedrohlc Scrumplex ]; + maintainers = with lib.maintainers; [ Scrumplex ]; platforms = lib.platforms.unix; }; }) diff --git a/nixpkgs/pkgs/development/libraries/paho-mqtt-cpp/default.nix b/nixpkgs/pkgs/development/libraries/paho-mqtt-cpp/default.nix index b62e774ba513..2e390da0bef4 100644 --- a/nixpkgs/pkgs/development/libraries/paho-mqtt-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/paho-mqtt-cpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "paho.mqtt.cpp"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "eclipse"; repo = "paho.mqtt.cpp"; rev = "v${version}"; - hash = "sha256-tcq0a4X5dKE4rnczRMAVe3Wt43YzUKbxsv9Sk+q+IB8="; + hash = "sha256-QV6r4GzSVghgVQtF8OQ1a23PtCdjg7PeuGRBdA+WbE0="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/pango/default.nix b/nixpkgs/pkgs/development/libraries/pango/default.nix index 3d866a922954..43f2eae80935 100644 --- a/nixpkgs/pkgs/development/libraries/pango/default.nix +++ b/nixpkgs/pkgs/development/libraries/pango/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "pango"; - version = "1.50.14"; + version = "1.51.0"; outputs = [ "bin" "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HWfyBb/DGMJ6Kc/ftoKFaN9WZ5XfDLUdIYnN5/LVgeg="; + sha256 = "dO/BCa5vkDu+avd+qirGCUuO4kWi4j8TKnqPCGLRqfU="; }; depsBuildBuild = [ @@ -80,9 +80,6 @@ stdenv.mkDerivation rec { # it should be a build-time dep for build # TODO: send upstream postPatch = '' - substituteInPlace meson.build \ - --replace "dependency('gi-docgen', ver" "dependency('gi-docgen', native:true, ver" - substituteInPlace docs/meson.build \ --replace "'gi-docgen', req" "'gi-docgen', native:true, req" ''; diff --git a/nixpkgs/pkgs/development/libraries/pangomm/2.42.2-add-missing-include-attrlist.cc.patch b/nixpkgs/pkgs/development/libraries/pangomm/2.42.2-add-missing-include-attrlist.cc.patch new file mode 100644 index 000000000000..019c2dec2bc9 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/pangomm/2.42.2-add-missing-include-attrlist.cc.patch @@ -0,0 +1,12 @@ +diff --git a/untracked/pango/pangomm/attrlist.cc b/untracked/pango/pangomm/attrlist.cc +index 76c3341..0c6d68d 100755 +--- a/untracked/pango/pangomm/attrlist.cc ++++ b/untracked/pango/pangomm/attrlist.cc +@@ -3,6 +3,7 @@ + + #include <glibmm.h> + ++#include <pango-1.0/pango/pango-markup.h> + #include <pangomm/attrlist.h> + #include <pangomm/private/attrlist_p.h> + diff --git a/nixpkgs/pkgs/development/libraries/pangomm/2.42.nix b/nixpkgs/pkgs/development/libraries/pangomm/2.42.nix index 33cc40c96840..267e46c48c3d 100644 --- a/nixpkgs/pkgs/development/libraries/pangomm/2.42.nix +++ b/nixpkgs/pkgs/development/libraries/pangomm/2.42.nix @@ -10,6 +10,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-GyTJJiSuEnXMtXdYF10198Oa0zQtjAtLpg8NmEnS0Io="; }; + patches = [ + # Fixes a missing include leading to build failures while compiling `attrlist.cc` (as outlined by @dslm4515 [1]) + # Note that the files in that directory are generated and not tracked in Git [2], which is why we can't simply + # try to cherry-pick an upstream patch from future versions. + # [1]: https://github.com/dslm4515/BMLFS/issues/16#issuecomment-914624797 + # [2]: https://github.com/GNOME/pangomm/tree/master/untracked + ./2.42.2-add-missing-include-attrlist.cc.patch + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix b/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix index b1df2875fab7..149f541ee42f 100644 --- a/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix +++ b/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix @@ -35,15 +35,15 @@ in builtins.listToAttrs (map (a: { name = a.pname; value = mkDataset a; }) [ { pname = "G4NDL"; - version = "4.6"; - sha256 = "sha256-nSh88q4PuIeirc6AHudPub4hsNFm2rSby+6UCKUUVAg="; + version = "4.7"; + sha256 = "sha256-fn09JiEQLcYU91OtkocwopDRlmDu2WMEqdJLRT1nAwk="; envvar = "NEUTRONHP"; } { pname = "G4EMLOW"; - version = "8.0"; - sha256 = "sha256-2Rmo5YOGiCV7kkimE5EOsqdjMFngMMi1DAosKtn9Kzs="; + version = "8.2"; + sha256 = "sha256-PXdoJk/1pTvLlgh2BLvhHGC3/qkKqsj30SUhg+Go5Cc="; envvar = "LE"; } diff --git a/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix b/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix index 4e635a08414b..b2b368f0349e 100644 --- a/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix @@ -3,7 +3,8 @@ , enableQT ? false # deprecated name , enableQt ? enableQT , enableXM ? false -, enableOpenGLX11 ? true +, mesa +, enableOpenGLX11 ? !mesa.meta.broken , enablePython ? false , enableRaytracerX11 ? false @@ -47,14 +48,20 @@ in lib.warnIf (enableQT != false) "geant4: enableQT is deprecated, please use enableQt" stdenv.mkDerivation rec { - version = "11.0.4"; + version = "11.1.3"; pname = "geant4"; src = fetchurl { url = "https://cern.ch/geant4-data/releases/geant4-v${version}.tar.gz"; - hash = "sha256-4wofoo0vLPd8/9CFY8EonpL8R9mcg5Wa9H/ve9UDSyc="; + hash = "sha256-TF++pnidjWGe2sygYx1rUhGmDhv5l0w9P6ue+eImkvU="; }; + # Fix broken paths in a .pc + postPatch = '' + substituteInPlace source/externals/ptl/cmake/Modules/PTLPackageConfigHelpers.cmake \ + --replace '${"$"}{prefix}/${"$"}{PTL_INSTALL_' '${"$"}{PTL_INSTALL_' + ''; + cmakeFlags = [ "-DGEANT4_INSTALL_DATA=OFF" "-DGEANT4_USE_GDML=ON" @@ -69,7 +76,7 @@ stdenv.mkDerivation rec { "-DGEANT4_USE_SYSTEM_EXPAT=ON" "-DGEANT4_USE_SYSTEM_ZLIB=ON" "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals (enableOpenGLX11 && stdenv.isDarwin) [ "-DXQuartzGL_INCLUDE_DIR=${libGL.dev}/include" "-DXQuartzGL_gl_LIBRARY=${libGL}/lib/libGL.dylib" ] ++ lib.optionals (enableMultiThreading && enablePython) [ @@ -88,11 +95,13 @@ stdenv.mkDerivation rec { ]; dontWrapQtApps = true; # no binaries - buildInputs = [ libGLU libXext libXmu ] + buildInputs = + lib.optionals enableOpenGLX11 [ libGLU libXext libXmu ] ++ lib.optionals enableInventor [ libXpm coin3d soxt motif ] ++ lib.optionals enablePython [ boost_python python3 ]; - propagatedBuildInputs = [ clhep expat xercesc zlib libGL ] + propagatedBuildInputs = [ clhep expat xercesc zlib ] + ++ lib.optionals enableOpenGLX11 [ libGL ] ++ lib.optionals enableXM [ motif ] ++ lib.optionals enableQt [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/pinocchio/default.nix b/nixpkgs/pkgs/development/libraries/pinocchio/default.nix index af7fff14e8f3..63ae2bcf62c9 100644 --- a/nixpkgs/pkgs/development/libraries/pinocchio/default.nix +++ b/nixpkgs/pkgs/development/libraries/pinocchio/default.nix @@ -13,22 +13,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "pinocchio"; - version = "2.6.20"; + version = "2.6.21"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Pu/trCpqdue7sQKDbLhyxTfgj/+xRiVcG7Luz6ZQXtM="; + hash = "sha256-IaWAXzdzhU/wov+9ChzUeCp9SFNFV2/vGToXC35dkb8="; }; - # error: use of undeclared identifier '__sincos' - postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' - substituteInPlace src/math/sincos.hpp \ - --replace "__APPLE__" "0" - ''; - strictDeps = true; nativeBuildInputs = [ @@ -54,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.20.drv/sou[84 chars].dae' + # AssertionError: '.' != '/tmp/nix-build-pinocchio-2.6.21.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/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix b/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix index 37dea2ece86a..c58ff8399aec 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.4.15"; + version = "0.4.16"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - hash = "sha256-VwzpPAVfoaV47O7OjXtPQj5s8zfH5rkB22Pdlg7u5Fg="; + hash = "sha256-BJ4Q34wLGQNxoihH+M8NBY5ZDw/D9RMda9GvFw7BemY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/poco/default.nix b/nixpkgs/pkgs/development/libraries/poco/default.nix index b3037c463e52..b4ba1790d58d 100644 --- a/nixpkgs/pkgs/development/libraries/poco/default.nix +++ b/nixpkgs/pkgs/development/libraries/poco/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { MYSQL_DIR = libmysqlclient; MYSQL_INCLUDE_DIR = "${MYSQL_DIR}/include/mysql"; - cmakeFlags = [ - "-DPOCO_UNBUNDLED=ON" + configureFlags = [ + "--unbundled" ]; postFixup = '' diff --git a/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix b/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix index 431e6348b3fa..72538da6a997 100644 --- a/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix @@ -1,35 +1,63 @@ -{ lib, stdenv -, fetchurl +{ lib +, stdenv +, fetchFromGitLab +, gitUpdater +, testers , cmake , pkg-config , gtest , doxygen , graphviz -, lcov +, lomiri }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "properties-cpp"; - version = "0.0.1"; + version = "0.0.3"; - src = let srcver = "${version}+14.10.20140730"; in - fetchurl { - url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${srcver}.orig.tar.gz"; - sha256 = "08vjyv7ibn6jh2ikj5v48kjpr3n6hlkp9qlvdn8r0vpiwzah0m2w"; - }; + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lib-cpp/properties-cpp"; + rev = finalAttrs.version; + hash = "sha256-C/BDEuKNMQHOjATO5aWBptjIlgfv6ykzjFAsHb6uP3Q="; + }; - postPatch = '' + postPatch = lib.optionalString (!finalAttrs.doCheck) '' sed -i "/add_subdirectory(tests)/d" CMakeLists.txt ''; - nativeBuildInputs = [ cmake pkg-config ]; + strictDeps = true; + + nativeBuildInputs = [ + cmake + doxygen + graphviz + pkg-config + ]; + + buildInputs = [ + lomiri.cmake-extras + ]; - buildInputs = [ gtest doxygen graphviz lcov ]; + checkInputs = [ + gtest + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; meta = with lib; { - homepage = "https://launchpad.net/properties-cpp"; + homepage = "https://gitlab.com/ubports/development/core/lib-cpp/properties-cpp"; description = "A very simple convenience library for handling properties and signals in C++11"; license = licenses.lgpl3Only; maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.linux; + pkgConfigModules = [ + "properties-cpp" + ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/qmenumodel/default.nix b/nixpkgs/pkgs/development/libraries/qmenumodel/default.nix new file mode 100644 index 000000000000..a8d11529808f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qmenumodel/default.nix @@ -0,0 +1,99 @@ +{ stdenv +, lib +, fetchFromGitHub +, gitUpdater +, testers +, cmake +, cmake-extras +, dbus +, dbus-test-runner +, glib +, pkg-config +, python3 +, qtbase +, qtdeclarative +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "qmenumodel"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "AyatanaIndicators"; + repo = "qmenumodel"; + rev = finalAttrs.version; + hash = "sha256-zbKAfq9R5fD2IqVYOAhy903QX1TDom9m6Ib2qpkFMak="; + }; + + outputs = [ "out" "dev" ]; + + postPatch = '' + substituteInPlace libqmenumodel/src/qmenumodel.pc.in \ + --replace "\''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@" "\''${prefix}/lib" \ + --replace "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" "\''${prefix}/include" + + substituteInPlace libqmenumodel/QMenuModel/CMakeLists.txt \ + --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + '' + lib.optionalString finalAttrs.doCheck '' + patchShebangs tests/{client,script}/*.py + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + cmake-extras + glib + qtbase + qtdeclarative + ]; + + nativeCheckInputs = [ + dbus + dbus-test-runner + (python3.withPackages (ps: with ps; [ + dbus-python + pygobject3 + ])) + ]; + + dontWrapQtApps = true; + + cmakeFlags = [ + "-DENABLE_TESTS=${lib.boolToString finalAttrs.doCheck}" + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + # Tests have been flaky sometimes, hoping that not running in parallel helps + enableParallelChecking = false; + + preCheck = '' + # Tests all need some Qt stuff + export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} + ''; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Qt5 renderer for Ayatana Indicators"; + longDescription = '' + QMenuModel - a Qt/QML binding for GMenuModel + (see http://developer.gnome.org/gio/unstable/GMenuModel.html) + ''; + homepage = "https://github.com/AyatanaIndicators/qmenumodel"; + license = licenses.lgpl3Only; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + pkgConfigModules = [ + "qmenumodel" + ]; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix index a2b38046c5a8..68a3e3531e19 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix @@ -375,6 +375,5 @@ let if stdenv.buildPlatform == stdenv.hostPlatform then bootstrapScope.qttranslations else null; - qutebrowser = final.callPackage ../../../../applications/networking/browsers/qutebrowser { }; }); in finalScope diff --git a/nixpkgs/pkgs/development/libraries/qt-6/default.nix b/nixpkgs/pkgs/development/libraries/qt-6/default.nix index bef3f7ef62e8..6c71f4b42a55 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/default.nix @@ -1,6 +1,8 @@ { newScope , lib , stdenv +, generateSplicesForMkScope +, makeScopeWithSplicing' , fetchurl , fetchpatch , fetchpatch2 @@ -12,6 +14,7 @@ , overrideSDK , buildPackages , python3 +, config # options , developerBuild ? false @@ -24,10 +27,11 @@ let mirror = "mirror://qt"; }; - addPackages = self: with self; + addPackages = self: let callPackage = self.newScope ({ - inherit qtModule srcs python3; + inherit (self) qtModule; + inherit srcs python3; stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }); in @@ -47,18 +51,27 @@ let ./patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch ./patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch ./patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch - ./patches/0004-qtbase-fix-locating-tzdir-on-NixOS.patch - ./patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch - ./patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch - ./patches/0007-qtbase-find-tools-in-PATH.patch - ./patches/0008-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch - ./patches/0009-qtbase-allow-translations-outside-prefix.patch - ./patches/0010-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch - ./patches/0011-qtbase-check-in-the-QML-folder-of-this-library-does-.patch + ./patches/0004-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch + ./patches/0005-qtbase-qt-cmake-always-use-cmake-from-path.patch + ./patches/0006-qtbase-find-tools-in-PATH.patch + ./patches/0007-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch + ./patches/0008-qtbase-allow-translations-outside-prefix.patch + ./patches/0009-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch + ./patches/0010-qtbase-check-in-the-QML-folder-of-this-library-does-.patch + ./patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch + # Revert "macOS: Silence warning about supporting secure state restoration" + # fix build with macOS sdk < 12.0 + (fetchpatch2 { + url = "https://github.com/qt/qtbase/commit/fc1549c01445bb9c99d3ba6de8fa9da230614e72.patch"; + revert = true; + hash = "sha256-cjB2sC4cvZn0UEc+sm6ZpjyC78ssqB1Kb5nlZQ15M4A="; + }) ]; }; env = callPackage ./qt-env.nix { }; - full = env "qt-full-${qtbase.version}" ([ + full = callPackage ({ env, qtbase }: env "qt-full-${qtbase.version}" + # `with self` is ok to use here because having these spliced is unnecessary + ( with self;[ qt3d qt5compat qtcharts @@ -96,7 +109,7 @@ let qtwebengine qtwebsockets qtwebview - ] ++ lib.optionals (!stdenv.isDarwin) [ qtwayland libglvnd ]); + ] ++ lib.optionals (!stdenv.isDarwin) [ qtwayland libglvnd ])) { }; qt3d = callPackage ./modules/qt3d.nix { }; qt5compat = callPackage ./modules/qt5compat.nix { }; @@ -149,11 +162,11 @@ let GameController ImageCaptureCore LocalAuthentication MediaAccessibility MediaPlayer MetalKit Network OpenDirectory Quartz ReplayKit SecurityInterface Vision; - qtModule = qtModule.override { + qtModule = callPackage ({ qtModule }: qtModule.override { stdenv = if stdenv.isDarwin then overrideSDK stdenv { darwinMinVersion = "10.13"; darwinSdkVersion = "11.0"; } else stdenv; - }; + }) { }; xcbuild = buildPackages.xcbuild.override { productBuildVer = "20A2408"; }; @@ -163,26 +176,32 @@ let inherit (darwin.apple_sdk_11_0.frameworks) WebKit; }; - wrapQtAppsHook = makeSetupHook + wrapQtAppsHook = callPackage ({ makeBinaryWrapper }: makeSetupHook { name = "wrap-qt6-apps-hook"; - propagatedBuildInputs = [ buildPackages.makeBinaryWrapper ]; - } ./hooks/wrap-qt-apps-hook.sh; + propagatedBuildInputs = [ makeBinaryWrapper ]; + } ./hooks/wrap-qt-apps-hook.sh) { }; - qmake = makeSetupHook + qmake = callPackage ({ qtbase }: makeSetupHook { name = "qmake6-hook"; - propagatedBuildInputs = [ self.qtbase.dev ]; + propagatedBuildInputs = [ qtbase.dev ]; substitutions = { inherit debug; fix_qmake_libtool = ./hooks/fix-qmake-libtool.sh; }; - } ./hooks/qmake-hook.sh; + } ./hooks/qmake-hook.sh) { }; + } // lib.optionalAttrs config.allowAliases { + # Convert to a throw on 03-01-2023 and backport the change. + # Warnings show up in various cli tool outputs, throws do not. + # Remove completely before 24.05 + overrideScope' = lib.warnIf (lib.isInOldestRelease 2311) "qt6 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope; }; - # TODO(@Artturin): convert to makeScopeWithSplicing' - # simple example of how to do that in 5568a4d25ca406809530420996d57e0876ca1a01 - baseScope = lib.makeScope newScope addPackages; + baseScope = makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "qt6"; + f = addPackages; + }; bootstrapScope = baseScope.overrideScope(final: prev: { qtbase = prev.qtbase.override { qttranslations = null; }; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh b/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh index 1081cf062417..13ff1bef65a1 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh +++ b/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.qt.io/official_releases/qt/6.6/6.6.0/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.6/6.6.1/submodules/ -A '*.tar.xz' ) diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix index c0a20503e64c..edf29ab8d36f 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -11,11 +11,9 @@ , lndir , perl , pkg-config -, python3 , which , cmake , ninja -, ccache , xmlstarlet , libproxy , xorg @@ -236,11 +234,13 @@ stdenv.mkDerivation rec { "-DQT_FEATURE_cxx17_filesystem=OFF" ] ++ lib.optional (qttranslations != null) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations"; - NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ + env.NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ # Undefined symbols for architecture arm64: "___gss_c_nt_hostbased_service_oid_desc" "-framework GSS" ]); + env.NIX_CFLAGS_COMPILE = "-DNIXPKGS_QT_PLUGIN_PREFIX=\"${qtPluginPrefix}\""; + outputs = [ "out" "dev" ]; moveToDev = false; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix index 5608a9a9156c..bd8c0983282b 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -5,12 +5,12 @@ qtModule rec { pname = "qtmqtt"; - version = "6.6.0"; + version = "6.6.1"; src = fetchFromGitHub { owner = "qt"; repo = "qtmqtt"; rev = "v${version}"; - hash = "sha256-rFi1w0Z4jLvHvhu0/VOIT0MWmKjy51jSK5M56qLs0gI="; + hash = "sha256-6jQrUT1wLk6rhDIns0ubdUCZ7e/m38Oqvl8c1/sfWxI="; }; propagatedBuildInputs = [ qtbase ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtsvg.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtsvg.nix index 699b35b27042..d81634d9ef1b 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtsvg.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtsvg.nix @@ -5,7 +5,6 @@ , libmng , zlib , pkg-config -, fetchpatch2 }: qtModule { @@ -13,13 +12,4 @@ qtModule { propagatedBuildInputs = [ qtbase ]; buildInputs = [ libwebp jasper libmng zlib ]; nativeBuildInputs = [ pkg-config ]; - patches = [ - # Fix nullptr dereference with invalid SVG - # https://bugreports.qt.io/projects/QTBUG/issues/QTBUG-117944 - (fetchpatch2 { - name = "QTBUG-117944.patch"; - url = "https://code.qt.io/cgit/qt/qtsvg.git/patch/?id=edc8ca7f"; - hash = "sha256-kBQYlQqPb0QkRhatQyaGdxE1Y5zHd6/ZEd5zn0gRVoM="; - }) - ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwayland.nix index 94f3b80e9c37..de13977304e2 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -13,11 +13,11 @@ qtModule { buildInputs = [ wayland libdrm ]; nativeBuildInputs = [ pkg-config ]; patches = [ - # Fix a freezing bug with fcitx5. - # https://codereview.qt-project.org/c/qt/qtwayland/+/517601 + # Fix potential crash issues when some submenus are expanded + # https://codereview.qt-project.org/c/qt/qtwayland/+/519344/ (fetchpatch { - url = "https://code.qt.io/cgit/qt/qtwayland.git/patch/?id=6fe83f6076423068b652fa4fcb0b5adbd297f2a8"; - hash = "sha256-TlZozKezpYm90B9qFP9qv76asRdIt+5bq9E3GcmFiDc="; + url = "https://code.qt.io/cgit/qt/qtwayland.git/patch/?id=aae65c885d8e38d8abc2959cded7b5e9e5fc88b3"; + hash = "sha256-FD1VaiTgl9Z1y+5EDpWYShM1ULoFdET86FoFfqDmjyo="; }) ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 4b4172897e08..4adcf8ab0a3b 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -308,7 +308,7 @@ qtModule { meta = with lib; { description = "A web engine based on the Chromium web browser"; - platforms = platforms.unix; + platforms = [ "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7a-linux" "armv7l-linux" "x86_64-linux" ]; # This build takes a long time; particularly on slow architectures # 1 hour on 32x3.6GHz -> maybe 12 hours on 4x2.4GHz timeout = 24 * 3600; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch index a0ee1e11b068..de35178f7929 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch @@ -1,4 +1,4 @@ -From afbe4002948e60ee3b27cb9be9e549ae416373f8 Mon Sep 17 00:00:00 2001 +From 90734859d2f9e6b9a1754c3e694ceb1a3c870bce Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Thu, 13 Apr 2023 23:42:29 +0800 Subject: [PATCH 01/11] qtbase: qmake: always use libname instead of absolute diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch index 8ffe0c936b72..d7b41691370e 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch @@ -1,4 +1,4 @@ -From 8d3f5ee63ed29fe41927b904aa1e2b40f90c8ef4 Mon Sep 17 00:00:00 2001 +From a804a9b1efdab0a71b9947e5c2bf9f6f5e316e0e Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Fri, 14 Apr 2023 21:43:04 +0800 Subject: [PATCH 02/11] qtbase: qmake: fix mkspecs for darwin diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch index 041960352b1f..53f226254a19 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch @@ -1,4 +1,4 @@ -From 8ce66fca339d9daf6bd132771c2ea582a461f31c Mon Sep 17 00:00:00 2001 +From 6088085d3074316dd74639fc6c1233e5862aff11 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Fri, 14 Apr 2023 09:34:46 +0800 Subject: [PATCH 03/11] qtbase: qmake: fix includedir in generated pkg-config diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0004-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch index 8e04bda13645..ccd0fb02fcd8 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0004-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch @@ -1,7 +1,7 @@ -From 880fe5653a86d8091f3f577977f8af93552c48fd Mon Sep 17 00:00:00 2001 +From 82e243f326aea40e7f3da935d8166979b11e8063 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Tue, 21 Mar 2023 15:48:49 +0800 -Subject: [PATCH 05/11] qtbase: deal with a font face at index 0 as Regular for +Subject: [PATCH 04/11] qtbase: deal with a font face at index 0 as Regular for Variable fonts Reference: https://bugreports.qt.io/browse/QTBUG-111994 diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0004-qtbase-fix-locating-tzdir-on-NixOS.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0004-qtbase-fix-locating-tzdir-on-NixOS.patch deleted file mode 100644 index 5ccc9346d6d9..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0004-qtbase-fix-locating-tzdir-on-NixOS.patch +++ /dev/null @@ -1,60 +0,0 @@ -From b1533ac42718835499ec633ffb3b1bed0d040719 Mon Sep 17 00:00:00 2001 -From: Nick Cao <nickcao@nichi.co> -Date: Fri, 14 Apr 2023 09:35:25 +0800 -Subject: [PATCH 04/11] qtbase: fix locating tzdir on NixOS - ---- - src/corelib/time/qtimezoneprivate_tz.cpp | 27 +++++++++++++++--------- - 1 file changed, 17 insertions(+), 10 deletions(-) - -diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp -index e702a5d6b43..2ac88c1cd10 100644 ---- a/src/corelib/time/qtimezoneprivate_tz.cpp -+++ b/src/corelib/time/qtimezoneprivate_tz.cpp -@@ -56,7 +56,11 @@ static bool isTzFile(const QString &name); - // zone1970.tab). - static QTzTimeZoneHash loadTzTimeZones() - { -- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); -+ // Try TZDIR first, in case we're running on NixOS. -+ QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab"); -+ // Fallback to traditional paths in case we are not on NixOS. -+ if (!QFile::exists(path)) -+ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); - if (!QFile::exists(path)) - path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); - -@@ -773,18 +777,21 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId) - if (!tzif.open(QIODevice::ReadOnly)) - return ret; - } else { -- // Open named tz, try modern path first, if fails try legacy path -- tzif.setFileName("/usr/share/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId)); -+ // Try TZDIR first, in case we're running on NixOS -+ tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId)); - if (!tzif.open(QIODevice::ReadOnly)) { -- tzif.setFileName("/usr/lib/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId)); -+ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); - if (!tzif.open(QIODevice::ReadOnly)) { -- // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ -- auto check = validatePosixRule(ianaId); -- if (check.isValid) { -- ret.m_hasDst = check.hasDst; -- ret.m_posixRule = ianaId; -+ tzif.setFileName("/usr/lib/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId)); -+ if (!tzif.open(QIODevice::ReadOnly)) { -+ // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ -+ auto check = validatePosixRule(ianaId); -+ if (check.isValid) { -+ ret.m_hasDst = check.hasDst; -+ ret.m_posixRule = ianaId; -+ } -+ return ret; - } -- return ret; - } - } - } --- -2.42.0 - diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0005-qtbase-qt-cmake-always-use-cmake-from-path.patch index bab52a38c00c..ad30ebc71413 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0005-qtbase-qt-cmake-always-use-cmake-from-path.patch @@ -1,7 +1,7 @@ -From 7f573f00fb850a08017d9f1e3c73b4d7efeb84f2 Mon Sep 17 00:00:00 2001 +From b480022b364b262d5ff63738c02318da925f5c79 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Wed, 12 Apr 2023 10:13:50 +0800 -Subject: [PATCH 06/11] qtbase: qt-cmake: always use cmake from path +Subject: [PATCH 05/11] qtbase: qt-cmake: always use cmake from path The generated qt-cmake scripts embeds the absolute path of cmake used during the build of qtbase, bloating the runtime closure of qtbase. diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0007-qtbase-find-tools-in-PATH.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0006-qtbase-find-tools-in-PATH.patch index fc2f55c9b4ae..1d60684e0700 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0007-qtbase-find-tools-in-PATH.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0006-qtbase-find-tools-in-PATH.patch @@ -1,7 +1,7 @@ -From 95b6bc2a414d381fdeab0899a3b02499c43695e7 Mon Sep 17 00:00:00 2001 +From a8b9fae710a2bd5e743f5e16364eaa8c38dbd784 Mon Sep 17 00:00:00 2001 From: rewine <luhongxu@deepin.org> Date: Wed, 29 Mar 2023 11:51:33 +0800 -Subject: [PATCH 07/11] qtbase-find-tools-in-PATH +Subject: [PATCH 06/11] qtbase-find-tools-in-PATH 1. find qt's tools in `QTTOOLSPATH` env qt assumes that all components use the same install prefix diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0007-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch index d1139e0aecd1..7bf2193bc208 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0007-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch @@ -1,17 +1,17 @@ -From a5cbfb30fc53b3290578af4a87fe4c0463df4247 Mon Sep 17 00:00:00 2001 +From d7a9a3b0ecdbb1b5829f25954d763d767f1c8794 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Tue, 10 Oct 2023 10:12:56 -0400 -Subject: [PATCH 08/11] qtbase: pass to qmlimportscanner the QML2_IMPORT_PATH +Subject: [PATCH 07/11] qtbase: pass to qmlimportscanner the QML2_IMPORT_PATH --- src/tools/macdeployqt/shared/shared.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp -index f637416cf22..77749506ccb 100644 +index 2ae4f998944..ba10ae02bcd 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp -@@ -1293,6 +1293,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf +@@ -1297,6 +1297,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf argumentList.append( "-importPath"); argumentList.append(qmlImportsPath); diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0009-qtbase-allow-translations-outside-prefix.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch index ee2e35f813fa..40812599bb99 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0009-qtbase-allow-translations-outside-prefix.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch @@ -1,7 +1,7 @@ -From 28220453d157c0825669145c94ab86e9603265fa Mon Sep 17 00:00:00 2001 +From 79da6bb6ff075e8cf972be8a462630f1ec86bf0a Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Tue, 10 Oct 2023 10:14:40 -0400 -Subject: [PATCH 09/11] qtbase: allow translations outside prefix +Subject: [PATCH 08/11] qtbase: allow translations outside prefix --- cmake/QtBuild.cmake | 2 +- diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0010-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0009-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch index fbb74a055d4a..fb17a539f053 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0010-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0009-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch @@ -1,7 +1,7 @@ -From bbd9cf61b686f68d5e5eb78fb0b96a74a8921cef Mon Sep 17 00:00:00 2001 +From d503be89320f0b89b80acb19769971e855be6ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Pedro=20Bol=C3=ADvar=20Puente?= <raskolnikov@gnu.org> Date: Wed, 9 Aug 2023 16:16:21 +0200 -Subject: [PATCH 10/11] qtbase: find qmlimportscanner in macdeployqt via +Subject: [PATCH 09/11] qtbase: find qmlimportscanner in macdeployqt via environment The qmlimportscanner tool is provided by qtdeclarative. Because of the @@ -17,10 +17,10 @@ a workaround for users. 1 file changed, 4 insertions(+) diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp -index 77749506ccb..48979195f40 100644 +index ba10ae02bcd..320095a972d 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp -@@ -1273,6 +1273,10 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf +@@ -1277,6 +1277,10 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf if (!QFile::exists(qmlImportScannerPath)) qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner"; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0011-qtbase-check-in-the-QML-folder-of-this-library-does-.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0010-qtbase-check-in-the-QML-folder-of-this-library-does-.patch index ab3354d62b8c..ed749cb238a5 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0011-qtbase-check-in-the-QML-folder-of-this-library-does-.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0010-qtbase-check-in-the-QML-folder-of-this-library-does-.patch @@ -1,7 +1,7 @@ -From 617d27ee91aaa59c59c4f3a2cca7bab8167d9f5f Mon Sep 17 00:00:00 2001 +From c00e310092d9aeb48adf21dd22f1ee4dbdbf5ebb Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Tue, 10 Oct 2023 10:17:00 -0400 -Subject: [PATCH 11/11] qtbase: check in the QML folder of this library does +Subject: [PATCH 10/11] qtbase: check in the QML folder of this library does actually exist In a modularized installation, this folder will be the location where @@ -12,10 +12,10 @@ code, and `qmlimportscanner` will complain that it does not exist. 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp -index 48979195f40..8415680ecda 100644 +index 320095a972d..87ba0d4e24b 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp -@@ -1293,9 +1293,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf +@@ -1297,9 +1297,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf } for (const QString &importPath : qmlImportPaths) argumentList << "-importPath" << importPath; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch new file mode 100644 index 000000000000..22530f453536 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch @@ -0,0 +1,33 @@ +From f0c4d3860b75cb064d066045907622d536044096 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc> +Date: Sun, 10 May 2020 12:47:28 +0200 +Subject: [PATCH 11/11] qtbase: derive plugin load path from PATH + +--- + src/corelib/kernel/qcoreapplication.cpp | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp +index a80efbb5622..8cf9e85da43 100644 +--- a/src/corelib/kernel/qcoreapplication.cpp ++++ b/src/corelib/kernel/qcoreapplication.cpp +@@ -2991,6 +2991,16 @@ QStringList QCoreApplication::libraryPathsLocked() + QStringList *app_libpaths = new QStringList; + coreappdata()->app_libpaths.reset(app_libpaths); + ++ // Add library paths derived from PATH ++ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(QStringLiteral(":")); ++ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); ++ for (const QString &path: paths) { ++ if (!path.isEmpty()) { ++ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); ++ } ++ } ++ ++ + auto setPathsFromEnv = [&](QString libPathEnv) { + if (!libPathEnv.isEmpty()) { + QStringList paths = libPathEnv.split(QDir::listSeparator(), Qt::SkipEmptyParts); +-- +2.42.0 + diff --git a/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix b/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix index 5c7cd6d48b14..61b73c649dfa 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix @@ -4,315 +4,315 @@ { qt3d = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qt3d-everywhere-src-6.6.0.tar.xz"; - sha256 = "0apwq6cqxn1xszhaawrz14yyy9akbmh6i5yys3v74kbz4537ma0d"; - name = "qt3d-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qt3d-everywhere-src-6.6.1.tar.xz"; + sha256 = "0a9j8k1561hgsigpf3k5h9p788pab7lb38q7yrl1r9ql9zbsx17k"; + name = "qt3d-everywhere-src-6.6.1.tar.xz"; }; }; qt5compat = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qt5compat-everywhere-src-6.6.0.tar.xz"; - sha256 = "1jlg3b3jn7m2gih892vcsv36rm430g86rz6bdlk15xr6c6vfv19x"; - name = "qt5compat-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qt5compat-everywhere-src-6.6.1.tar.xz"; + sha256 = "1wn13filgwz9lh0jj7w8i9ma53vw4mbxj2c1421j65x4xnv1a78f"; + name = "qt5compat-everywhere-src-6.6.1.tar.xz"; }; }; qtactiveqt = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtactiveqt-everywhere-src-6.6.0.tar.xz"; - sha256 = "17ks2sggvx7p7hmg128w494n06nzyf7r5i04nykhmhqlx71wnm6j"; - name = "qtactiveqt-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtactiveqt-everywhere-src-6.6.1.tar.xz"; + sha256 = "1v6g0hg5qfbvbvr9k5sn02l556c5mnnnak0bm1yrgqyw85qg2l4r"; + name = "qtactiveqt-everywhere-src-6.6.1.tar.xz"; }; }; qtbase = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtbase-everywhere-src-6.6.0.tar.xz"; - sha256 = "03lysc6lp17hyjrwvp0znw02bdysrff8rlsb0nlrfn6b58qm7783"; - name = "qtbase-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtbase-everywhere-src-6.6.1.tar.xz"; + sha256 = "1xq2kpawq1f9qa3dzjcl1bl6h039807pykcm0znl1zmjfx35n325"; + name = "qtbase-everywhere-src-6.6.1.tar.xz"; }; }; qtcharts = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtcharts-everywhere-src-6.6.0.tar.xz"; - sha256 = "1x9c55j8yscb6q18haspqnnvbc6pcgdv5ljrhj0ijxqcqz6spgp6"; - name = "qtcharts-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtcharts-everywhere-src-6.6.1.tar.xz"; + sha256 = "1dii5amdzpm65mq1yz7w1aql95yi0dshm06s62yf3dr68nlwlmhi"; + name = "qtcharts-everywhere-src-6.6.1.tar.xz"; }; }; qtconnectivity = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtconnectivity-everywhere-src-6.6.0.tar.xz"; - sha256 = "04203igj3fnmw1i7k291j3p987qssss3hz58kjdz33n28xic4a8w"; - name = "qtconnectivity-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtconnectivity-everywhere-src-6.6.1.tar.xz"; + sha256 = "0i86iqjx8z6qymbmilrmr2d67piinwlr2pkcfj1zjks69538sijv"; + name = "qtconnectivity-everywhere-src-6.6.1.tar.xz"; }; }; qtdatavis3d = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtdatavis3d-everywhere-src-6.6.0.tar.xz"; - sha256 = "17jrs6mh741vfgj8bgkahfzj2xaa7agw9s6q2xcv9s8bkxnryj60"; - name = "qtdatavis3d-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtdatavis3d-everywhere-src-6.6.1.tar.xz"; + sha256 = "18hvlz8l55jzhpp1ph1slj472l65pk3qdhmhib6gybi2iv6kpp5r"; + name = "qtdatavis3d-everywhere-src-6.6.1.tar.xz"; }; }; qtdeclarative = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtdeclarative-everywhere-src-6.6.0.tar.xz"; - sha256 = "0cd3gxyklhscq2zymhmv6j4pzgrl0gpx8yyhgwqg1j0qm6q9nlqv"; - name = "qtdeclarative-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtdeclarative-everywhere-src-6.6.1.tar.xz"; + sha256 = "0p4r12v9ih1l9cnbw0am878kjfpr3f6whkamx564cn36iqrxgzvy"; + name = "qtdeclarative-everywhere-src-6.6.1.tar.xz"; }; }; qtdoc = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtdoc-everywhere-src-6.6.0.tar.xz"; - sha256 = "07i6fxczbpma344jgmpcb1y24jlm136y7b698b57ipcvgbc38xnk"; - name = "qtdoc-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtdoc-everywhere-src-6.6.1.tar.xz"; + sha256 = "0ndh1if6886m9z9kc2aa02q135ar0rmy4vgln4rkr3lyx4jaajwl"; + name = "qtdoc-everywhere-src-6.6.1.tar.xz"; }; }; qtgraphs = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtgraphs-everywhere-src-6.6.0.tar.xz"; - sha256 = "0zsyw5w15xzmaap0r396jpsz7synq5q2knl75807f6q3i7y4gqan"; - name = "qtgraphs-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtgraphs-everywhere-src-6.6.1.tar.xz"; + sha256 = "0xv4alb93rdqzbhhvvhg2miwjyax81pf9n4p5irlcg2xrw1qv5n8"; + name = "qtgraphs-everywhere-src-6.6.1.tar.xz"; }; }; qtgrpc = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtgrpc-everywhere-src-6.6.0.tar.xz"; - sha256 = "14pdqwv0yw8dgr5nr04aw73fwkljwrg3yhkflfndwnf7mmgvkffs"; - name = "qtgrpc-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtgrpc-everywhere-src-6.6.1.tar.xz"; + sha256 = "1k7hv2f1s628rfls2klxvd0b2rb304pysbcvvqfrwkkv4ys4akhw"; + name = "qtgrpc-everywhere-src-6.6.1.tar.xz"; }; }; qthttpserver = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qthttpserver-everywhere-src-6.6.0.tar.xz"; - sha256 = "0r9wwf239r3q7i633lld2mbmn98d7jqna1fgfxakri68x7bixbpm"; - name = "qthttpserver-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qthttpserver-everywhere-src-6.6.1.tar.xz"; + sha256 = "0k0jhgxfqq0l3jhrf5qyd38achvvv8x4zvx4jw0jl00m5zsv7zhv"; + name = "qthttpserver-everywhere-src-6.6.1.tar.xz"; }; }; qtimageformats = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtimageformats-everywhere-src-6.6.0.tar.xz"; - sha256 = "11736il80bdcajz01l836z38g1f0k2am9ilmk203gqkn06sjqm71"; - name = "qtimageformats-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtimageformats-everywhere-src-6.6.1.tar.xz"; + sha256 = "13qqj8251l9885mcaafg6plxcza4vd7sdkv2wrdkfbh7a24x0kmc"; + name = "qtimageformats-everywhere-src-6.6.1.tar.xz"; }; }; qtlanguageserver = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtlanguageserver-everywhere-src-6.6.0.tar.xz"; - sha256 = "03j9kbmv80sj84lbz90692ckg7nd60i6mrbg41lkgxibhqck1jdf"; - name = "qtlanguageserver-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtlanguageserver-everywhere-src-6.6.1.tar.xz"; + sha256 = "0vrywwjg5d2fx2kpjxmi6cm8vffpf0zg63zi3n9dz2d90db1yxmh"; + name = "qtlanguageserver-everywhere-src-6.6.1.tar.xz"; }; }; qtlocation = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtlocation-everywhere-src-6.6.0.tar.xz"; - sha256 = "1507syiar3dv53km0hl2rf29518arwkk0h2b6fpj5gq8c7kqp5pm"; - name = "qtlocation-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtlocation-everywhere-src-6.6.1.tar.xz"; + sha256 = "0acwkwcr5dixhwhd102kmh5yq4y3wk1kddfdb8ychy3jwdi2pgld"; + name = "qtlocation-everywhere-src-6.6.1.tar.xz"; }; }; qtlottie = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtlottie-everywhere-src-6.6.0.tar.xz"; - sha256 = "0kzq739ziyy8xhzdj57q220sdnjcwnwkgb67gcrsdfd40x8v960x"; - name = "qtlottie-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtlottie-everywhere-src-6.6.1.tar.xz"; + sha256 = "1j4zl2yz9pybh21wscfr56pahfrn4fnkvxdhkz03d2gpcj9hbjs9"; + name = "qtlottie-everywhere-src-6.6.1.tar.xz"; }; }; qtmultimedia = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtmultimedia-everywhere-src-6.6.0.tar.xz"; - sha256 = "10l7sc8c7gwz47z77acvxz5wba14grwqgfpmnx0qh4gcldn26jxs"; - name = "qtmultimedia-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtmultimedia-everywhere-src-6.6.1.tar.xz"; + sha256 = "0jnvc09msjqr2zbyjj7fgilf7zg3sdldbppnj8b9c52pdwly5r3y"; + name = "qtmultimedia-everywhere-src-6.6.1.tar.xz"; }; }; qtnetworkauth = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtnetworkauth-everywhere-src-6.6.0.tar.xz"; - sha256 = "0c48rk35qh4q9drs53jijgnhxk8adllnk63wy4rk7sq0disc1m90"; - name = "qtnetworkauth-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtnetworkauth-everywhere-src-6.6.1.tar.xz"; + sha256 = "0j8dq10wq6y02cz4lkqw60nqi600qr9ssb36n74mywr2bfa12gk9"; + name = "qtnetworkauth-everywhere-src-6.6.1.tar.xz"; }; }; qtpositioning = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtpositioning-everywhere-src-6.6.0.tar.xz"; - sha256 = "0fd51wgxcir8b5n6ljcfhagrkv77w6kimjx7mqzd77km7kx20rcd"; - name = "qtpositioning-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtpositioning-everywhere-src-6.6.1.tar.xz"; + sha256 = "1f0n721k4w6jiva8hhgpd29im2h5vsd2ypfbk1j53f0j7czwgnix"; + name = "qtpositioning-everywhere-src-6.6.1.tar.xz"; }; }; qtquick3d = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtquick3d-everywhere-src-6.6.0.tar.xz"; - sha256 = "1fkshfd0abnxd5ir8wsf57zms99cg1zhrnn40cmnr7g4jjrkxarp"; - name = "qtquick3d-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtquick3d-everywhere-src-6.6.1.tar.xz"; + sha256 = "08l4rsw7v0xvdmpm80wpxy74798j70r37853hdgipmi34bp0058m"; + name = "qtquick3d-everywhere-src-6.6.1.tar.xz"; }; }; qtquick3dphysics = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtquick3dphysics-everywhere-src-6.6.0.tar.xz"; - sha256 = "00vwzp5qwccjl65dda8s3lyf3dz1pgwhyls15qqgl338dxl5nfbl"; - name = "qtquick3dphysics-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtquick3dphysics-everywhere-src-6.6.1.tar.xz"; + sha256 = "0np14lkvc3y0y896m9f754pfi83k5jnmg5i76kgfc7bvipsvbiic"; + name = "qtquick3dphysics-everywhere-src-6.6.1.tar.xz"; }; }; qtquickeffectmaker = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtquickeffectmaker-everywhere-src-6.6.0.tar.xz"; - sha256 = "0zzps7wmjmnbkm37j60xc11jppk4g3nnh7qcn91q68mdqygkgjyp"; - name = "qtquickeffectmaker-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtquickeffectmaker-everywhere-src-6.6.1.tar.xz"; + sha256 = "0lr6vms6vrmaki4ssmclsxi8xp3qnysgygqgn83vg727qx9hj65c"; + name = "qtquickeffectmaker-everywhere-src-6.6.1.tar.xz"; }; }; qtquicktimeline = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtquicktimeline-everywhere-src-6.6.0.tar.xz"; - sha256 = "145mkgcacjf9ak1ydfkrqfk6371zkjgjd2v264krkv9aaza537h7"; - name = "qtquicktimeline-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtquicktimeline-everywhere-src-6.6.1.tar.xz"; + sha256 = "0s71zycq3l9px8hig8g229ln91h9czhxvvbj6zmmnhkx694gaq1q"; + name = "qtquicktimeline-everywhere-src-6.6.1.tar.xz"; }; }; qtremoteobjects = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtremoteobjects-everywhere-src-6.6.0.tar.xz"; - sha256 = "0szpy60xdmw2spqaczib7mx7k1lnaid8micmy0jh4hmrbgir8496"; - name = "qtremoteobjects-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtremoteobjects-everywhere-src-6.6.1.tar.xz"; + sha256 = "16cmzc3cssfvqhvhc7lphbha00mdb1qykk877shgrh4bzyc5i7mq"; + name = "qtremoteobjects-everywhere-src-6.6.1.tar.xz"; }; }; qtscxml = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtscxml-everywhere-src-6.6.0.tar.xz"; - sha256 = "0hqhi9z9cbnpbc9dx22ci3a08javb1hi9cn46h1ks1lbbpdx1v2p"; - name = "qtscxml-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtscxml-everywhere-src-6.6.1.tar.xz"; + sha256 = "15q8vlhd9yz33bdhm7md426a33px4dg8sa14ckirk4rryixcajw7"; + name = "qtscxml-everywhere-src-6.6.1.tar.xz"; }; }; qtsensors = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtsensors-everywhere-src-6.6.0.tar.xz"; - sha256 = "1624v0wwpdrcbz4x2jdrzb0r7qfh0qcac3k6pfikn45c9rfvxw18"; - name = "qtsensors-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtsensors-everywhere-src-6.6.1.tar.xz"; + sha256 = "1lwr6xw4flzcqvb017wl9g8p5yamf0z4zqx2wp4rmhrgbj0yw4xx"; + name = "qtsensors-everywhere-src-6.6.1.tar.xz"; }; }; qtserialbus = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtserialbus-everywhere-src-6.6.0.tar.xz"; - sha256 = "0k5r57fsdyplbcffq9lnl0bp1smsnqh93kpk3rn5r6gaa9qz1k0q"; - name = "qtserialbus-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtserialbus-everywhere-src-6.6.1.tar.xz"; + sha256 = "1b7pkvs131vqls4bahqkwgnbrnb8pcrnii47ww2c589h1dimw52w"; + name = "qtserialbus-everywhere-src-6.6.1.tar.xz"; }; }; qtserialport = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtserialport-everywhere-src-6.6.0.tar.xz"; - sha256 = "0ra0v8vc6y2s9y9irh30g1wnyhgd5xlgg6s0k9czyrvsqkqvpz7c"; - name = "qtserialport-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtserialport-everywhere-src-6.6.1.tar.xz"; + sha256 = "1n5fsb3ayn1xnf1s5l7f6j1nm2pcdjywy382qr451b5wbhyj7z4n"; + name = "qtserialport-everywhere-src-6.6.1.tar.xz"; }; }; qtshadertools = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtshadertools-everywhere-src-6.6.0.tar.xz"; - sha256 = "0xcqxwvkga11s150jha0b3iwnp4rvkvbfaxy0a0ln52hqmyk541n"; - name = "qtshadertools-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtshadertools-everywhere-src-6.6.1.tar.xz"; + sha256 = "1fvkbrw6gy8v2ql6qw1ra08wl6z64w34b9d886794m29ypj8ycq8"; + name = "qtshadertools-everywhere-src-6.6.1.tar.xz"; }; }; qtspeech = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtspeech-everywhere-src-6.6.0.tar.xz"; - sha256 = "174zpr582nfgj19qk7qdyf4l85q0gwsjx3qfv37z0238hbzxp6wn"; - name = "qtspeech-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtspeech-everywhere-src-6.6.1.tar.xz"; + sha256 = "16aqjaf8c64l6qg0kz5hla6q2r7k9lryad7jy8jwyi2ir5921352"; + name = "qtspeech-everywhere-src-6.6.1.tar.xz"; }; }; qtsvg = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtsvg-everywhere-src-6.6.0.tar.xz"; - sha256 = "1pkj7inw76klyld3sy24gcds785lgkjs6zjac9jga0hiypz2bnik"; - name = "qtsvg-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtsvg-everywhere-src-6.6.1.tar.xz"; + sha256 = "0a4jw02v50fzbnrqnldz9djzn37rric06lrg2vrkqikas9bfp394"; + name = "qtsvg-everywhere-src-6.6.1.tar.xz"; }; }; qttools = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qttools-everywhere-src-6.6.0.tar.xz"; - sha256 = "16ds0mclns7656hf4phv13pwhigc15z2ghqx7r2nxfrb2jyfx7sf"; - name = "qttools-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qttools-everywhere-src-6.6.1.tar.xz"; + sha256 = "0jliy2pz6czjw0ircd8h37a5prinm1a8dvnawwclxas5fdd10fa9"; + name = "qttools-everywhere-src-6.6.1.tar.xz"; }; }; qttranslations = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qttranslations-everywhere-src-6.6.0.tar.xz"; - sha256 = "13072ll3kwb9kvw3a6sjcdific12vf81xbp41zmi1f34dwirmn50"; - name = "qttranslations-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qttranslations-everywhere-src-6.6.1.tar.xz"; + sha256 = "127f40wjm1q9clp2dj7vgyvv7nazb5c23akwgsr50wdd4bl051v6"; + name = "qttranslations-everywhere-src-6.6.1.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtvirtualkeyboard-everywhere-src-6.6.0.tar.xz"; - sha256 = "0yvpz8mm3g1lj5m3fk95cqw5magfdl4y0y8frsid7gqlym1xp117"; - name = "qtvirtualkeyboard-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtvirtualkeyboard-everywhere-src-6.6.1.tar.xz"; + sha256 = "1akvip4h86r5j898w1yx0mnfgc78b1yqfygk8h25z613vqvdwg4r"; + name = "qtvirtualkeyboard-everywhere-src-6.6.1.tar.xz"; }; }; qtwayland = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtwayland-everywhere-src-6.6.0.tar.xz"; - sha256 = "1s5p0gfkw96nx4k2fp5s3v2rj8c05k8jc2kif0rwhl6hhlnxihrh"; - name = "qtwayland-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtwayland-everywhere-src-6.6.1.tar.xz"; + sha256 = "1cb8amr9kmr4gdnyi1mzriv34xf1nx47y91m9v6cczy05mijvk36"; + name = "qtwayland-everywhere-src-6.6.1.tar.xz"; }; }; qtwebchannel = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtwebchannel-everywhere-src-6.6.0.tar.xz"; - sha256 = "077mlg2zqr002z7z6yqzl3jqc05g5ahz2m06az3zjhsqdn7b7p7x"; - name = "qtwebchannel-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtwebchannel-everywhere-src-6.6.1.tar.xz"; + sha256 = "0hz5j6gpj4m74j74skj0lrjqmp30ns5s240gr6rrinisaz6qfq7i"; + name = "qtwebchannel-everywhere-src-6.6.1.tar.xz"; }; }; qtwebengine = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtwebengine-everywhere-src-6.6.0.tar.xz"; - sha256 = "105pag9a2q611ixn5bvc45kpylhrdz5wgw6bk6zssmrcbbq9zp6m"; - name = "qtwebengine-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtwebengine-everywhere-src-6.6.1.tar.xz"; + sha256 = "149nwwnarkiiz2vrgydz99agfc0z08lrnm4hr8ln1mjb44la4vks"; + name = "qtwebengine-everywhere-src-6.6.1.tar.xz"; }; }; qtwebsockets = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtwebsockets-everywhere-src-6.6.0.tar.xz"; - sha256 = "03pkgp854pb1rzjixhrbyz4ad174wfikjjisry2c90kf1ifb219f"; - name = "qtwebsockets-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtwebsockets-everywhere-src-6.6.1.tar.xz"; + sha256 = "0hq6gg67x84fb6asfgx5jclvv1nqhr4gdr84cl27xn3nk0s18xbq"; + name = "qtwebsockets-everywhere-src-6.6.1.tar.xz"; }; }; qtwebview = { - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtwebview-everywhere-src-6.6.0.tar.xz"; - sha256 = "14ikfl38ajgcv3611zjls7liscfyazf49y1plxk0pipsbndqv955"; - name = "qtwebview-everywhere-src-6.6.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtwebview-everywhere-src-6.6.1.tar.xz"; + sha256 = "0v1598ycj1rgphb00r3mwkij8yjw26g0d73w2ijf8fp97fiippnn"; + name = "qtwebview-everywhere-src-6.6.1.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix b/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix index 4d8f34f58c8c..fe94f5dce959 100644 --- a/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix +++ b/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + ]; + # Install the extras headers postInstall = '' cp -r $src/extras $out diff --git a/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix index 2f4a2ee6b1d9..8375d55e4056 100644 --- a/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidfuzz-cpp"; - version = "2.1.1"; + version = "2.2.3"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "rapidfuzz-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-OeGn3ks+vSHt4Kdzy6kqhpFOtjoHrbPZB1BrV6Ggzz4="; + hash = "sha256-yEDihPvTGGL5gsd4QMYNRyfLucKLItIQM4pm6W0i2W8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/readline/6.3.nix b/nixpkgs/pkgs/development/libraries/readline/6.3.nix index 853078b5561c..aff16c3e4184 100644 --- a/nixpkgs/pkgs/development/libraries/readline/6.3.nix +++ b/nixpkgs/pkgs/development/libraries/readline/6.3.nix @@ -34,6 +34,10 @@ stdenv.mkDerivation { in import ./readline-6.3-patches.nix patch); + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = with lib; { description = "Library for interactive line editing"; diff --git a/nixpkgs/pkgs/development/libraries/redis-plus-plus/0001-Fix-pkg-config-paths.patch b/nixpkgs/pkgs/development/libraries/redis-plus-plus/0001-Fix-pkg-config-paths.patch new file mode 100644 index 000000000000..ac6490c51873 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/redis-plus-plus/0001-Fix-pkg-config-paths.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/redis++.pc.in b/cmake/redis++.pc.in +index c98b990..46849b6 100644 +--- a/cmake/redis++.pc.in ++++ b/cmake/redis++.pc.in +@@ -1,7 +1,5 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=${prefix} +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/include ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: redis++ + Description: This is a Redis client, based on hiredis and written in C++11. It supports scritpting, pub/sub, pipeline, transaction, Redis Cluster, Redis Sentinel, connection pool, ACL, SSL and thread safety. diff --git a/nixpkgs/pkgs/development/libraries/redis-plus-plus/default.nix b/nixpkgs/pkgs/development/libraries/redis-plus-plus/default.nix index b064297afdd1..529bf73351ec 100644 --- a/nixpkgs/pkgs/development/libraries/redis-plus-plus/default.nix +++ b/nixpkgs/pkgs/development/libraries/redis-plus-plus/default.nix @@ -8,15 +8,19 @@ assert enableShared || enableStatic; stdenv.mkDerivation rec { pname = "redis-plus-plus"; - version = "1.3.7"; + version = "1.3.10"; src = fetchFromGitHub { owner = "sewenew"; repo = "redis-plus-plus"; rev = version; - sha256 = "sha256-QCNN85syxw2EGPdyTV3bL0txcHl7t2YhsKwK9lgnexY="; + sha256 = "sha256-lupS4WoJ4r0Vsh3sEGSuka0TtEBo2FPX2eks2blqRGk="; }; + patches = [ + ./0001-Fix-pkg-config-paths.patch + ]; + nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ hiredis ]; diff --git a/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index e48c812b3912..c25a349ba32d 100644 --- a/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -16,14 +16,14 @@ , sse42Support ? stdenv.hostPlatform.sse4_2Support }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocksdb"; version = "8.3.2"; src = fetchFromGitHub { owner = "facebook"; - repo = pname; - rev = "v${version}"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; hash = "sha256-mfIRQ8nkUbZ3Bugy3NAvOhcfzFY84J2kBUIUBcQ2/Qg="; }; @@ -48,6 +48,10 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-private-field" "-faligned-allocation" + ] ++ lib.optionals (lib.versionOlder finalAttrs.version "8") [ + "-Wno-error=unused-but-set-variable" + ] ++ lib.optionals (lib.versionOlder finalAttrs.version "7") [ + "-Wno-error=deprecated-copy" ]); cmakeFlags = [ @@ -77,7 +81,7 @@ stdenv.mkDerivation rec { mkdir -p $tools/bin cp tools/{ldb,sst_dump}${stdenv.hostPlatform.extensions.executable} $tools/bin/ '' + lib.optionalString stdenv.isDarwin '' - ls -1 $tools/bin/* | xargs -I{} install_name_tool -change "@rpath/librocksdb.${lib.versions.major version}.dylib" $out/lib/librocksdb.dylib {} + ls -1 $tools/bin/* | xargs -I{} install_name_tool -change "@rpath/librocksdb.${lib.versions.major finalAttrs.version}.dylib" $out/lib/librocksdb.dylib {} '' + lib.optionalString (stdenv.isLinux && enableShared) '' ls -1 $tools/bin/* | xargs -I{} patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib {} ''; @@ -93,9 +97,9 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://rocksdb.org"; description = "A library that provides an embeddable, persistent key-value store for fast storage"; - changelog = "https://github.com/facebook/rocksdb/raw/v${version}/HISTORY.md"; + changelog = "https://github.com/facebook/rocksdb/raw/v${finalAttrs.version}/HISTORY.md"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ adev magenbluten ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix index 426cbd3ff4ea..aa8c3f54e2fe 100644 --- a/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "cfitsio"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${finalAttrs.version}.tar.gz"; - hash = "sha256-/a3AHQnPn1QlOALF7IfrEN5RzkEwQRQVrojDCUBiG4s="; + hash = "sha256-R6fI7gVoe+Hh2O7rlPuI8GD7882KTfUsy4jV6w9QYr4="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/science/math/cudnn/releases.nix b/nixpkgs/pkgs/development/libraries/science/math/cudnn/releases.nix index b82dd78178c0..1cca4d9d015d 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/cudnn/releases.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/cudnn/releases.nix @@ -169,17 +169,17 @@ hash = "sha256-edd6dpx+cXWrx7XC7VxJQUjAYYqGQThyLIh/lcYjd3w="; } { - version = "8.9.1.23"; + version = "8.9.6.50"; minCudaVersion = "11.0"; maxCudaVersion = "11.8"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.1.23_cuda11-archive.tar.xz"; - hash = "sha256-ptmIcmfihZDJ25XOZcvpamaN8DUjOLfTN+BTLe0zSFw="; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.6.50_cuda11-archive.tar.xz"; + hash = "sha256-oOLvVemfTNZH99HaqlqkUE/6M1ujAYbVwyiPL0ffBX4="; } { - version = "8.9.1.23"; + version = "8.9.6.50"; minCudaVersion = "12.0"; - maxCudaVersion = "12.1"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.1.23_cuda12-archive.tar.xz"; - hash = "sha256-NRY8XFQr4MURc4sn4lI1GTy+7cXg4AbkSxzerxki6D4="; + maxCudaVersion = "12.2"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.6.50_cuda12-archive.tar.xz"; + hash = "sha256-FyIlnblSZbs4E0OKWhxuzZed6JrkU2YDkEBC4STTAtU="; } ] diff --git a/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix index 6b8588207dc3..1aaab46e1d1d 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix @@ -8,12 +8,7 @@ { blas , cmake , cudaPackages - # FIXME: cuda being unfree means ofborg won't eval "magma". - # respecting config.cudaSupport -> false by default - # -> ofborg eval -> throws "no GPU targets specified". - # Probably should delete everything but "magma-cuda" and "magma-hip" - # from all-packages.nix -, cudaSupport ? true +, cudaSupport ? config.cudaSupport , fetchurl , gfortran , cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities @@ -25,8 +20,10 @@ , magmaRelease , ninja , config -, rocmSupport ? config.rocmSupport -, static ? false + # At least one back-end has to be enabled, + # and we can't default to CUDA since it's unfree +, rocmSupport ? !cudaSupport +, static ? stdenv.hostPlatform.isStatic , stdenv , symlinkJoin }: @@ -133,6 +130,8 @@ stdenv.mkDerivation { cmakeFlags = [ "-DGPU_TARGET=${gpuTargetString}" + (lib.cmakeBool "MAGMA_ENABLE_CUDA" cudaSupport) + (lib.cmakeBool "MAGMA_ENABLE_HIP" rocmSupport) ] ++ lists.optionals static [ "-DBUILD_SHARED_LIBS=OFF" ] ++ lists.optionals cudaSupport [ @@ -140,11 +139,9 @@ stdenv.mkDerivation { "-DMIN_ARCH=${minArch}" # Disarms magma's asserts "-DCMAKE_C_COMPILER=${backendStdenv.cc}/bin/cc" "-DCMAKE_CXX_COMPILER=${backendStdenv.cc}/bin/c++" - "-DMAGMA_ENABLE_CUDA=ON" ] ++ lists.optionals rocmSupport [ "-DCMAKE_C_COMPILER=${rocmPackages.clr}/bin/hipcc" "-DCMAKE_CXX_COMPILER=${rocmPackages.clr}/bin/hipcc" - "-DMAGMA_ENABLE_HIP=ON" ]; buildFlags = [ @@ -155,7 +152,7 @@ stdenv.mkDerivation { doCheck = false; passthru = { - inherit cudaPackages cudaSupport; + inherit cudaPackages cudaSupport rocmSupport gpuTargets; }; meta = with lib; { @@ -164,7 +161,11 @@ stdenv.mkDerivation { homepage = "http://icl.cs.utk.edu/magma/index.html"; platforms = platforms.unix; maintainers = with maintainers; [ connorbaker ]; - # CUDA and ROCm are mutually exclusive - broken = cudaSupport && rocmSupport || cudaSupport && strings.versionOlder cudaVersion "9"; + + # Cf. https://bitbucket.org/icl/magma/src/fcfe5aa61c1a4c664b36a73ebabbdbab82765e9f/CMakeLists.txt#lines-20 + broken = + !(cudaSupport || rocmSupport) # At least one back-end enabled + || (cudaSupport && rocmSupport) # Mutually exclusive + || (cudaSupport && strings.versionOlder cudaVersion "9"); }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix index 585f4c3a14e3..f4b168b37fe2 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix @@ -34,32 +34,32 @@ let oneapi-mkl = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm"; - hash = "sha256-BeI5zB0rrE6C21dezNc7/WSKmTWpjsZbpg0/y0Y87VQ="; + hash = "sha256-PGLPNnR+11AmmaNxldeze/l2Kw/4+mfjB+RqsPhP6oM="; }; oneapi-mkl-common = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-${mklVersion}-${mklVersion}-${rel}.noarch.rpm"; - hash = "sha256-NjIqTeFppwjXFlPYHPHfZa/bWBiHJru3atC4fIMXN0w="; + hash = "sha256-wztTE2R/IdG6ujGf7KFocpRmXzlZSnEKopTBOlPPlBw="; }; oneapi-mkl-common-devel = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-devel-${mklVersion}-${mklVersion}-${rel}.noarch.rpm"; - hash = "sha256-GX19dlvBWRgwSOCmWcEOrnbmp4S2j0448fWpx+iPVWw="; + hash = "sha256-MWa8mpyFM4zgDLup+EzFRM+N2Oxf0o6FBBRM8mAanbI="; }; oneapi-mkl-devel = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-devel-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm"; - hash = "sha256-F4XxtSPAjNaShEL/l44jJK+JdOOkYI19X/njRB6FkNw="; + hash = "sha256-Arq5kXktI92031XqfV0pkzQCHaFsTRKX05iOA/fPNOs="; }; oneapi-openmp = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-openmp-${mklVersion}-${mklVersion}-${openmpRel}.x86_64.rpm"; - hash = "sha256-1SlkI01DxFvwGPBJ73phs86ka0SmCrniwiXQ9DJwIXw="; + hash = "sha256-cyBD3P4AEvyreP4pP3BE+yyDB+ptblOQ9GYI8ysGsIM="; }; oneapi-tbb = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-tbb-${tbbVersion}-${tbbVersion}-${tbbRel}.x86_64.rpm"; - hash = "sha256-wIktdf1p1SS1KrnUlc8LPkm0r9dhZE6cQNr4ZKTWI6A="; + hash = "sha256-pzJpQdiYVpcKDShePak2I0uEh7u08vJgX7OBF5p5yAM="; }; in stdenvNoCC.mkDerivation ({ diff --git a/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix b/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix index 6589fc0b9b64..c07250c660a3 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix @@ -6,11 +6,15 @@ , python3 , blas , lapack +, mpiSupport ? true , mpi # generic mpi dependency , openssh # required for openmpi tests -, petsc-withp4est ? true +, petsc-withp4est ? false , p4est , zlib # propagated by p4est but required by petsc +, petsc-optimized ? false +, petsc-scalar-type ? "real" +, petsc-precision ? "double" }: # This version of PETSc does not support a non-MPI p4est build @@ -18,14 +22,14 @@ assert petsc-withp4est -> p4est.mpiSupport; stdenv.mkDerivation rec { pname = "petsc"; - version = "3.19.2"; + version = "3.19.4"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "sha256-EU82P3ebsWg5slwOcPiwrg2UfVDnL3xs3csRsAEHmxY="; + sha256 = "sha256-fJQbcb5Sw7dkIU5JLfYBCdEvl/fYVMl6RN8MTZWLOQY="; }; - mpiSupport = !withp4est || p4est.mpiSupport; + inherit mpiSupport; withp4est = petsc-withp4est; strictDeps = true; @@ -49,7 +53,6 @@ stdenv.mkDerivation rec { patches = [ ./filter_mpi_warnings.patch ]; preConfigure = '' - export FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran" patchShebangs ./lib/petsc/bin configureFlagsArray=( $configureFlagsArray @@ -68,6 +71,14 @@ stdenv.mkDerivation rec { ''} "--with-blas=1" "--with-lapack=1" + "--with-scalar-type=${petsc-scalar-type}" + "--with-precision=${petsc-precision}" + ${lib.optionalString petsc-optimized '' + "--with-debugging=0" + COPTFLAGS='-g -O3' + FOPTFLAGS='-g -O3' + CXXOPTFLAGS='-g -O3' + ''} ) ''; diff --git a/nixpkgs/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch b/nixpkgs/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch index 590528446f61..6a3c7bee051e 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch +++ b/nixpkgs/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch @@ -6,7 +6,7 @@ index 168febb34b6..71068469066 100644 # these tests are used by the makefile in PETSC_DIR for basic tests of the install and should not be removed testex5f: ex5f.PETSc -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex5f -snes_rtol 1e-4 > ex5f_1.tmp 2>&1; \ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \ if (${DIFF} output/ex5f_1.testout ex5f_1.tmp > /dev/null 2>&1) then \ echo "Fortran example src/snes/tutorials/ex5f run successfully with 1 MPI process"; \ else \ @@ -14,7 +14,7 @@ index 168febb34b6..71068469066 100644 ${MAKE} PETSC_ARCH=${PETSC_ARCH} PETSC_DIR=${PETSC_DIR} ex5f.rm; testex19: ex19.PETSc -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with 1 MPI process"; \ else \ @@ -22,7 +22,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp; testex19_mpi: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with 2 MPI processes"; \ else \ @@ -30,7 +30,7 @@ index 168febb34b6..71068469066 100644 #use unpreconditioned norm because HYPRE device installations use different AMG parameters runex19_hypre: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre"; \ else \ @@ -38,7 +38,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_hypre_cuda: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type cuda -dm_mat_type aijcusparse -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre/cuda"; \ else \ @@ -46,7 +46,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_hypre_hip: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type hip -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre/hip"; \ else \ @@ -54,7 +54,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_cuda: -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -snes_monitor -dm_mat_type seqaijcusparse -dm_vec_type seqcuda -pc_type gamg -pc_gamg_esteig_ksp_max_it 10 -ksp_monitor -mg_levels_ksp_max_it 3 > ex19_1.tmp 2>&1; \ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_cuda_1.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with cuda"; \ else \ @@ -62,7 +62,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_ml: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type ml > ex19_1.tmp 2>&1; \ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_ml.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with ml"; \ else \ @@ -70,7 +70,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_fieldsplit_mumps: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -pc_type fieldsplit -pc_fieldsplit_block_size 4 -pc_fieldsplit_type SCHUR -pc_fieldsplit_0_fields 0,1,2 -pc_fieldsplit_1_fields 3 -fieldsplit_0_pc_type lu -fieldsplit_1_pc_type lu -snes_monitor_short -ksp_monitor_short -fieldsplit_0_pc_factor_mat_solver_type mumps -fieldsplit_1_pc_factor_mat_solver_type mumps > ex19_6.tmp 2>&1; \ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_6.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_6.tmp; \ if (${DIFF} output/ex19_fieldsplit_5.out ex19_6.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with mumps"; \ else \ @@ -78,7 +78,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_6.tmp runex19_superlu_dist: -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_grid_x 20 -da_grid_y 20 -pc_type lu -pc_factor_mat_solver_type superlu_dist > ex19.tmp 2>&1; \ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19.tmp; \ if (${DIFF} output/ex19_superlu.out ex19.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with superlu_dist"; \ else \ @@ -86,7 +86,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19.tmp runex19_suitesparse: -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type lu -pc_factor_mat_solver_type umfpack > ex19_1.tmp 2>&1; \ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_suitesparse.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with suitesparse"; \ else \ @@ -94,7 +94,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex3k_kokkos: ex3k.PETSc -@OMP_PROC_BIND=false ${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex3k -view_initial -dm_vec_type kokkos -dm_mat_type aijkokkos -use_gpu_aware_mpi 0 -snes_monitor > ex3k_1.tmp 2>&1 ;\ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \ if (${DIFF} output/ex3k_1.out ex3k_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex3k run successfully with kokkos-kernels"; \ else \ diff --git a/nixpkgs/pkgs/development/libraries/science/math/tensorrt/extension.nix b/nixpkgs/pkgs/development/libraries/science/math/tensorrt/extension.nix index c6596dbaacde..b4018c6cc284 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/tensorrt/extension.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/tensorrt/extension.nix @@ -38,13 +38,13 @@ final: prev: let + ".tar.gz"; tensorRTVersions = { - "8.6.0" = [ + "8.6.1" = [ rec { - fileVersionCuda = "11.8"; - fullVersion = "8.6.0.12"; - sha256 = "sha256-wXMqEJPFerefoLaH8GG+Np5EnJwXeStmDzZj7Nj6e2M="; + fileVersionCuda = "12.0"; + fullVersion = "8.6.1.6"; + sha256 = "sha256-D4FXpfxTKZQ7M4uJNZE3M1CvqQyoEjnNrddYDNHrolQ="; tarball = tarballURL { inherit fileVersionCuda fullVersion; }; - supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" "11.8" ]; + supportedCudaVersions = [ "12.0" "12.1" ]; } ]; "8.5.3" = [ @@ -133,6 +133,8 @@ final: prev: let "11.6" = "8.4.0"; "11.7" = "8.5.3"; "11.8" = "8.5.3"; + "12.0" = "8.6.1"; + "12.1" = "8.6.1"; }.${cudaVersion} or "8.4.0"; in tensorRTPackages diff --git a/nixpkgs/pkgs/development/libraries/sope/default.nix b/nixpkgs/pkgs/development/libraries/sope/default.nix index 0b61047377f3..fba7517ccca6 100644 --- a/nixpkgs/pkgs/development/libraries/sope/default.nix +++ b/nixpkgs/pkgs/development/libraries/sope/default.nix @@ -3,29 +3,23 @@ gnustep.stdenv.mkDerivation rec { pname = "sope"; - version = "5.8.0"; + version = "5.9.0"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOPE-${version}"; - hash = "sha256-sXIpKdJ5930+W+FsxQ8DZOq/49XWMM1zV8dIzbQdcbc="; + hash = "sha256-JZh8sC/w2MRy3UyWYGMvU47XtWKGnLuUlCsVyyxd7zg="; }; patches = [ - (fetchpatch { - name = "sope-no-unnecessary-vars.patch"; - url = "https://github.com/Alinto/sope/commit/0751a2f11961fd7de4e2728b6e34e9ba4ba5887e.patch"; - hash = "sha256-1txj8Qehg2N7ZsiYQA2FXI4peQAE3HUwDYkJEP9WnEk="; - }) - (fetchpatch { - name = "sope-fix-wformat.patch"; - url = "https://github.com/Alinto/sope/commit/6adfadd5dd2da4041657ad071892f2c9b1704d22.patch"; - hash = "sha256-zCbvVdbeBeNo3/cDVdYbyUUC2z8D6Q5ga0plUoMqr98="; + (fetchpatch { # https://github.com/Alinto/sope/pull/66 + name = "sope-fix-gnustep-1.29.0+.patch"; + url = "https://github.com/Alinto/sope/pull/66/commits/9ec2744cc851b11886c3ebb723138e4d672bd5c7.patch"; + hash = "sha256-JgYRwjmjlitgzYz9Jfei5XJRThP1TunPjI0g5M2wZPA="; }) ]; - hardeningDisable = [ "format" ]; nativeBuildInputs = [ gnustep.make ]; buildInputs = [ gnustep.base libxml2 openssl ] ++ lib.optional (openldap != null) openldap @@ -49,7 +43,10 @@ gnustep.stdenv.mkDerivation rec { ++ lib.optional (mariadb != null) "--enable-mysql" ++ lib.optional (postgresql != null) "--enable-postgresql"; - env.GNUSTEP_CONFIG_FILE = "/build/GNUstep.conf"; + env = { + GNUSTEP_CONFIG_FILE = "/build/GNUstep.conf"; + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; # Move over the makefiles (see comment over preConfigure) postInstall = '' diff --git a/nixpkgs/pkgs/development/libraries/spdk/0001-fix-setuptools-installation.patch b/nixpkgs/pkgs/development/libraries/spdk/0001-fix-setuptools-installation.patch new file mode 100644 index 000000000000..3c3fb50fc152 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/spdk/0001-fix-setuptools-installation.patch @@ -0,0 +1,29 @@ +From 3f718fc1873c9c138684ea019e9bd42c9b24506c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Tue, 28 Nov 2023 11:28:11 +0100 +Subject: [PATCH] fix setuptools installation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim <joerg@thalheim.io> +--- + python/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/python/Makefile b/python/Makefile +index f835daa..b41995a 100644 +--- a/python/Makefile ++++ b/python/Makefile +@@ -12,7 +12,7 @@ setup_cmd += --root $(DESTDIR) + endif + + ifneq ($(CONFIG_PYDIR),) +-setup_cmd += --install-purelib $(CONFIG_PYDIR) ++setup_cmd += --root / --prefix $(CONFIG_PYDIR) + purelibdir := $(CONFIG_PYDIR) + else + purelibdir := $(shell python3 -c "import sysconfig; print(sysconfig.get_paths()['purelib'])") +-- +2.42.0 + diff --git a/nixpkgs/pkgs/development/libraries/spdk/default.nix b/nixpkgs/pkgs/development/libraries/spdk/default.nix index c7b83db53489..c62f54b14091 100644 --- a/nixpkgs/pkgs/development/libraries/spdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/spdk/default.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { patches = [ # https://review.spdk.io/gerrit/c/spdk/spdk/+/20394 ./setuptools.patch + ./0001-fix-setuptools-installation.patch ]; postPatch = '' @@ -67,9 +68,13 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-dpdk=${dpdk}" - "--pydir=${placeholder "out"}/${python3.sitePackages}" + "--pydir=${placeholder "out"}" ]; + postCheck = '' + python3 -m spdk + ''; + env.NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. # otherwise does not find strncpy when compiling env.NIX_LDFLAGS = "-lbsd"; diff --git a/nixpkgs/pkgs/development/libraries/srt/default.nix b/nixpkgs/pkgs/development/libraries/srt/default.nix index 73bf5c25ae54..d25aab35da22 100644 --- a/nixpkgs/pkgs/development/libraries/srt/default.nix +++ b/nixpkgs/pkgs/development/libraries/srt/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssl +{ lib +, stdenv +, fetchFromGitHub +, cmake +, openssl +, windows }: stdenv.mkDerivation rec { @@ -14,7 +19,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ + windows.mingw_w64_pthreads + ]; + + patches = lib.optionals stdenv.hostPlatform.isMinGW [ + ./no-msvc-compat-headers.patch + ]; cmakeFlags = [ # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly @@ -29,9 +42,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Secure, Reliable, Transport"; - homepage = "https://github.com/Haivision/srt"; - license = licenses.mpl20; + homepage = "https://github.com/Haivision/srt"; + license = licenses.mpl20; maintainers = with maintainers; [ nh2 ]; - platforms = platforms.all; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/srt/no-msvc-compat-headers.patch b/nixpkgs/pkgs/development/libraries/srt/no-msvc-compat-headers.patch new file mode 100644 index 000000000000..ffededc7d54e --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/srt/no-msvc-compat-headers.patch @@ -0,0 +1,10 @@ +--- srt-1.3.2/common/filelist_win32.maf.orig 2018-06-15 21:44:11.000000000 +0200 ++++ srt-1.3.2/common/filelist_win32.maf 2018-09-25 20:26:36.903688700 +0200 +@@ -4,7 +4,6 @@ + # + # These are included by platform_sys.h header contained in ../srtcore/filelist.maf + # +-win/unistd.h + + SOURCES + win_time.cpp diff --git a/nixpkgs/pkgs/development/libraries/stb/default.nix b/nixpkgs/pkgs/development/libraries/stb/default.nix index 4406aa021848..f96bb0724bf2 100644 --- a/nixpkgs/pkgs/development/libraries/stb/default.nix +++ b/nixpkgs/pkgs/development/libraries/stb/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/nothings/stb"; license = licenses.publicDomain; platforms = platforms.all; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/tdlib/default.nix b/nixpkgs/pkgs/development/libraries/tdlib/default.nix index 118dc26f2f56..575aef5ba4f3 100644 --- a/nixpkgs/pkgs/development/libraries/tdlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/tdlib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "tdlib"; - version = "1.8.19"; + version = "1.8.21"; src = fetchFromGitHub { owner = "tdlib"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # The tdlib authors do not set tags for minor versions, but # external programs depending on tdlib constrain the minor # version, hence we set a specific commit with a known version. - rev = "2589c3fd46925f5d57e4ec79233cd1bd0f5d0c09"; - hash = "sha256-mbhxuJjrV3nC8Ja7N0WWF9ByHovJLmoLLuuzoU4khjU="; + rev = "3870c29b158b75ca5e48e0eebd6b5c3a7994a000"; + hash = "sha256-MCzgovcEZa34ZkwbbwfXHm2qitHwL2Tpr8p7+PxNhYk="; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/nixpkgs/pkgs/development/libraries/tiledb/FindMagic_EP.cmake.patch b/nixpkgs/pkgs/development/libraries/tiledb/FindMagic_EP.cmake.patch new file mode 100644 index 000000000000..7a5a01c54588 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/tiledb/FindMagic_EP.cmake.patch @@ -0,0 +1,14 @@ +diff --git a/FindMagic_EP.cmake b/FindMagic_EP.cmake +--- a/cmake/Modules/FindMagic_EP.cmake ++++ b/cmake/Modules/FindMagic_EP.cmake +@@ -126,9 +126,7 @@ if(NOT TILEDB_LIBMAGIC_EP_BUILT) + # that was modified by tiledb to also build with cmake for nix + ExternalProject_Add(ep_magic + PREFIX "externals" +- GIT_REPOSITORY "https://github.com/TileDB-Inc/file-windows.git" +- GIT_TAG "5.38.2.tiledb" +- GIT_SUBMODULES_RECURSE TRUE ++ DOWNLOAD_COMMAND true + UPDATE_COMMAND "" + CMAKE_ARGS + -DCMAKE_INSTALL_PREFIX=${TILEDB_EP_INSTALL_PREFIX} diff --git a/nixpkgs/pkgs/development/libraries/tiledb/default.nix b/nixpkgs/pkgs/development/libraries/tiledb/default.nix index ea41b8156f7f..ae182ff46136 100644 --- a/nixpkgs/pkgs/development/libraries/tiledb/default.nix +++ b/nixpkgs/pkgs/development/libraries/tiledb/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub + , cmake , zlib , lz4 @@ -12,7 +13,7 @@ , boost , libpqxx , clang-tools -, catch2 +, catch2_3 , python3 , gtest , doxygen @@ -20,24 +21,54 @@ , useAVX2 ? stdenv.hostPlatform.avx2Support }: +let + # pre-fetch ExternalProject from cmake/Modules/FindMagic_EP.cmake + ep-file-windows = fetchFromGitHub { + owner = "TileDB-Inc"; + repo = "file-windows"; + rev = "5.38.2.tiledb"; + hash = "sha256-TFn30VCuWZr252VN1T5NNCZe2VEN3xQSomS7XxxKGF8="; + fetchSubmodules = true; + }; + +in stdenv.mkDerivation rec { pname = "tiledb"; - version = "2.8.3"; + version = "2.18.0"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; rev = version; - hash = "sha256-HKMVwrPnk9/mukH3mJ2LEAvA9LBF4PcgBZjbbLhO9qU="; + hash = "sha256-y5/kXODzkNKmMn8P+WOOWGy9Htd0nhXbUxmfw/SqSYY="; }; + patches = [ + ./FindMagic_EP.cmake.patch + ]; + + postPatch = '' + # copy pre-fetched external project to directory where it is expected to be + mkdir -p build/externals/src + cp -a ${ep-file-windows} build/externals/src/ep_magic + chmod -R u+w build/externals/src/ep_magic + + # add openssl on path + sed -i '49i list(APPEND OPENSSL_PATHS "${openssl.dev}" "${openssl.out}")' \ + cmake/Modules/FindOpenSSL_EP.cmake + ''; + # (bundled) blosc headers have a warning on some archs that it will be using # unaccelerated routines. cmakeFlags = [ - "-DTILEDB_WERROR=0" + "-DTILEDB_VCPKG=OFF" + "-DTILEDB_WEBP=OFF" + "-DTILEDB_WERROR=OFF" ] ++ lib.optional (!useAVX2) "-DCOMPILER_SUPPORTS_AVX2=FALSE"; nativeBuildInputs = [ + ep-file-windows + catch2_3 clang-tools cmake python3 @@ -49,7 +80,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - catch2 zlib lz4 bzip2 @@ -61,13 +91,14 @@ stdenv.mkDerivation rec { libpqxx ]; - # emulate the process of pulling catch down - postPatch = '' - mkdir -p build/externals/src/ep_catch - ln -sf ${catch2}/include/catch2 build/externals/src/ep_catch/single_include - - sed -i '38i list(APPEND OPENSSL_PATHS "${openssl.dev}" "${openssl.out}")' \ - cmake/Modules/FindOpenSSL_EP.cmake + # test commands taken from + # https://github.com/TileDB-Inc/TileDB/blob/dev/.github/workflows/unit-test-runs.yml + checkPhase = '' + runHook preCheck + make -C tiledb tests -j$NIX_BUILD_CORES + make -C tiledb test ARGS="-R '^unit_'" -R "test_assert" + make -C tiledb test ARGS="-R 'test_ci_asserts'" + runHook postCheck ''; doCheck = true; @@ -85,5 +116,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ rakesh4g ]; }; - } diff --git a/nixpkgs/pkgs/development/libraries/tkrzw/default.nix b/nixpkgs/pkgs/development/libraries/tkrzw/default.nix index b3e8c8fbae28..694225d9e3ba 100644 --- a/nixpkgs/pkgs/development/libraries/tkrzw/default.nix +++ b/nixpkgs/pkgs/development/libraries/tkrzw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, nimPackages }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "tkrzw"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { doCheck = false; # memory intensive - passthru.tests.nim = nimPackages.tkrzw; meta = with lib; { description = "A set of implementations of DBM"; homepage = "https://dbmx.net/tkrzw/"; diff --git a/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix b/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix index 63a86ed55b52..3abd9bd24ba4 100644 --- a/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix +++ b/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , asciidoc , docbook-xsl-nons , docbook_xml_dtd_45 @@ -48,22 +47,13 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.5.3"; + version = "3.6.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-drjVB3EOiX6FPsN/Ju906XqVU3CLYLjEE0lF+bgWU8s="; + sha256 = "Ctci89Uywh11fPSI+UKWBnnqj0V5Je+pdlbtTJ6bpP8="; }; - patches = [ - # Use cc.has_header_symbol to check for BTRFS_IOC_INO_LOOKUP - # https://github.com/NixOS/nixpkgs/issues/228639 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/tracker-miners/-/commit/c08fbe0650d4a2ae915a21764f54c02eda9406d5.patch"; - sha256 = "U81+yfg2sUkKl4tKMeB7pXJRNSeIE+2loT3/bvnhoKM="; - }) - ]; - nativeBuildInputs = [ asciidoc docbook-xsl-nons diff --git a/nixpkgs/pkgs/development/libraries/tracker/default.nix b/nixpkgs/pkgs/development/libraries/tracker/default.nix index c8c220927fa4..c349379648db 100644 --- a/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , gettext , meson , mesonEmulatorHook @@ -33,25 +32,15 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "3.5.3"; + version = "3.6.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "FGbIsIl75dngVth+EK1YkntYgDPwGvLxplaokhw6KO4="; + sha256 = "Ulks/hm6/9FtvkdHW+fadQ29C2Mz/XrLYPqp2lvEDfI="; }; - patches = [ - # Backport sqlite-3.42.0 compatibility: - # https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/600 - (fetchpatch { - name = "sqlite-3.42.0.patch"; - url = "https://gitlab.gnome.org/GNOME/tracker/-/commit/4cbbd1773a7367492fa3b3e3804839654e18a12a.patch"; - hash = "sha256-w5D9I0P1DdyILhpjslh6ifojmlUiBoeFnxHPIr0rO3s="; - }) - ]; - strictDeps = true; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/ubus/default.nix b/nixpkgs/pkgs/development/libraries/ubus/default.nix index 37c8a1fa450b..bdfe4aa58552 100644 --- a/nixpkgs/pkgs/development/libraries/ubus/default.nix +++ b/nixpkgs/pkgs/development/libraries/ubus/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "ubus"; - version = "unstable-2023-06-05"; + version = "unstable-2023-11-14"; src = fetchgit { url = "https://git.openwrt.org/project/ubus.git"; - rev = "f787c97b34894a38b15599886cacbca01271684f"; - hash = "sha256-PGPFtNaRXS6ryC+MA/w2CtPQfJa+vG5OXf/NPFMoIzQ="; + rev = "b3e8c4ef07ebb6f0f34a5c1f0dc1539068363619"; + hash = "sha256-H/QrLMhdEC1LnSxHpp/90OdKbfHRqLVWUnzyQlsVO8c="; }; cmakeFlags = [ "-DBUILD_LUA=OFF" ]; @@ -19,6 +19,6 @@ stdenv.mkDerivation { homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary"; license = licenses.lgpl21Only; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ mkg20001 ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/uci/default.nix b/nixpkgs/pkgs/development/libraries/uci/default.nix index bbc4fcebdfc3..43e6cb9d697d 100644 --- a/nixpkgs/pkgs/development/libraries/uci/default.nix +++ b/nixpkgs/pkgs/development/libraries/uci/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { homepage = "https://git.openwrt.org/?p=project/uci.git;a=summary"; license = licenses.lgpl21Only; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ mkg20001 ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix b/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix index 76689da526d8..546e85fd96c7 100644 --- a/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { description = "ustream SSL wrapper"; homepage = "https://git.openwrt.org/?p=project/ustream-ssl.git;a=summary"; license = licenses.isc; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz mkg20001 ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/vte/default.nix b/nixpkgs/pkgs/development/libraries/vte/default.nix index e02d7973c6e9..7a998b409c2b 100644 --- a/nixpkgs/pkgs/development/libraries/vte/default.nix +++ b/nixpkgs/pkgs/development/libraries/vte/default.nix @@ -20,6 +20,7 @@ , gperf , pango , pcre2 +, cairo , fribidi , zlib , icu @@ -30,13 +31,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.72.2"; + version = "0.74.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-95Zv0YWmmB9TlkFitxz+9+YGSVFV1vWCe3KqDdZ0HJ4="; + sha256 = "sha256-IyjD8cmYNQoY4OUTNI6fxYHVfqTnuJrt8R4OPGUEK08="; }; patches = [ @@ -64,6 +65,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + cairo fribidi gnutls pcre2 @@ -82,11 +84,10 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddocs=true" + (lib.mesonBool "gtk3" (gtkVersion == "3")) + (lib.mesonBool "gtk4" (gtkVersion == "4")) ] ++ lib.optionals (!systemdSupport) [ "-D_systemd=false" - ] ++ lib.optionals (gtkVersion == "4") [ - "-Dgtk3=false" - "-Dgtk4=true" ] ++ lib.optionals stdenv.isDarwin [ # -Bsymbolic-functions is not supported on darwin "-D_b_symbolic_functions=false" diff --git a/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix index c79f599f5c65..41d1854692fd 100644 --- a/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix +++ b/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-utility-libraries"; - version = "1.3.270"; + version = "1.3.268"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Utility-Libraries"; rev = "v${finalAttrs.version}"; - hash = "sha256-P1v5UEAooTDGA10K4uck8lhcrbW2ccl44gWIGVnZ6uo="; + hash = "sha256-l6PiHCre/JQg8PSs1k/0Zzfwwv55AqVdZtBbjeKLS6E="; }; nativeBuildInputs = [ cmake python3 ]; @@ -19,6 +19,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/KhronosGroup/Vulkan-Utility-Libraries"; platforms = platforms.all; license = licenses.asl20; - maintainers = []; + maintainers = with maintainers; [ nickcao ]; }; }) diff --git a/nixpkgs/pkgs/development/libraries/whereami/default.nix b/nixpkgs/pkgs/development/libraries/whereami/default.nix index 26908d2b1084..f68895ca17d0 100644 --- a/nixpkgs/pkgs/development/libraries/whereami/default.nix +++ b/nixpkgs/pkgs/development/libraries/whereami/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=strict-prototypes"; + makeFlags = [ "-C_gnu-make" "build-library" diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix index 91a0b00670c9..bcd75412aab2 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -21,7 +21,7 @@ , compat30 ? true , unicode ? true , withMesa ? !stdenv.isDarwin -, withWebKit ? stdenv.isDarwin +, withWebKit ? true , webkitgtk , setfile , AGL diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix index c25bc2f512ba..1fd30139bc14 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gnome"; - version = "44.2"; + version = "45.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "UO0arCkDA+oLxchAqcEWWRhUarSnOiTFLcqicHK1/yE="; + sha256 = "lJWYhhyAAA/r8YzBKzchyVwbsdGTcfwhVtxPM971r/A="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index 903de4d9a232..e44ffe1ec1d2 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -1,9 +1,9 @@ { stdenv , lib , fetchFromGitHub -, autoreconfHook +, meson +, ninja , pkg-config -, libxml2 , xdg-desktop-portal , gtk3 , gnome @@ -14,51 +14,45 @@ , buildPortalsInGnome ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-gtk"; - version = "1.14.1"; + version = "1.15.1"; src = fetchFromGitHub { owner = "flatpak"; - repo = pname; - rev = version; - sha256 = "8eyWeoiJ3b/GlqGVfmkf2/uS7FnOpRNgbfxwWjclw8w="; + repo = "xdg-desktop-portal-gtk"; + rev = finalAttrs.version; + sha256 = "sha256-uXVjKsqoIjqJilJq8ERRzEqGKbkzc+Zl6y+37CAcYro="; }; nativeBuildInputs = [ - autoreconfHook - libxml2 + meson + ninja pkg-config wrapGAppsHook - xdg-desktop-portal ]; buildInputs = [ glib - gsettings-desktop-schemas # settings exposed by settings portal gtk3 + xdg-desktop-portal + ] ++ lib.optionals buildPortalsInGnome [ + gsettings-desktop-schemas # settings exposed by settings portal gnome-desktop - gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s) + gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s, just mouse and xsettings) ]; - configureFlags = if buildPortalsInGnome then [ - "--enable-wallpaper" - "--enable-screenshot" - "--enable-screencast" - "--enable-background" - "--enable-settings" - "--enable-appchooser" - ] else [ - # These are now enabled by default, even though we do not need them for GNOME. - # https://github.com/flatpak/xdg-desktop-portal-gtk/issues/355 - "--disable-settings" - "--disable-appchooser" + mesonFlags = lib.optionals (!buildPortalsInGnome) [ + "-Dwallpaper=disabled" + "-Dsettings=disabled" + "-Dappchooser=disabled" + "-Dlockdown=disabled" ]; meta = with lib; { description = "Desktop integration portals for sandboxed apps"; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; - license = licenses.lgpl2Plus; + license = licenses.lgpl21Plus; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix index ab9e00fe389a..8f5d5a3c0122 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, bash , fetchFromGitHub , makeWrapper , meson @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { ]; postInstall = '' - wrapProgram $out/libexec/xdg-desktop-portal-wlr --prefix PATH ":" ${lib.makeBinPath [ grim slurp ]} + wrapProgram $out/libexec/xdg-desktop-portal-wlr --prefix PATH ":" ${lib.makeBinPath [ bash grim slurp ]} ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix index 2cadab4a6742..e760151f216a 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,11 +1,12 @@ { lib -, acl -, autoreconfHook -, dbus , fetchFromGitHub , flatpak , fuse3 , bubblewrap +, docbook_xml_dtd_412 +, docbook_xml_dtd_43 +, docbook_xsl +, docutils , systemdMinimal , geoclue2 , glib @@ -13,6 +14,8 @@ , json-glib , libportal , libxml2 +, meson +, ninja , nixosTests , pipewire , gdk-pixbuf @@ -22,12 +25,13 @@ , stdenv , runCommand , wrapGAppsHook +, xmlto , enableGeoLocation ? true }: stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal"; - version = "1.16.0"; + version = "1.18.2"; outputs = [ "out" "installedTests" ]; @@ -35,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "flatpak"; repo = "xdg-desktop-portal"; rev = finalAttrs.version; - sha256 = "sha256-5VNauinTvZrSaQzyP/quL/3p2RPcTJUDLscEQMJpvYA="; + hash = "sha256-Pd5IKrVp/OOE10Ozy4R3XbubVc6iz0znG+YB0Uu+68E="; }; patches = [ @@ -46,18 +50,31 @@ stdenv.mkDerivation (finalAttrs: { substitute "${flatpak.icon-validator-patch}" "$out" \ --replace "/icon-validator/validate-icon.c" "/src/validate-icon.c" '') + + # Allow installing installed tests to a separate output. + ./installed-tests-path.patch + + # `XDG_DESKTOP_PORTAL_DIR` originally was used for upstream tests. But we are making use + # of this in the NixOS module, this actually blocks any configs from being loaded since + # configs are not expected to be placed in a portal implementation or even under the + # `share/xdg-desktop-portal/portals/` path. + ./separate-env-for-portal-config.patch ]; nativeBuildInputs = [ - autoreconfHook + docbook_xml_dtd_412 + docbook_xml_dtd_43 + docbook_xsl + docutils # for rst2man libxml2 + meson + ninja pkg-config wrapGAppsHook + xmlto ]; buildInputs = [ - acl - dbus flatpak fuse3 bubblewrap @@ -80,17 +97,28 @@ stdenv.mkDerivation (finalAttrs: { geoclue2 ]; - configureFlags = [ - "--enable-installed-tests" - ] ++ lib.optionals (!enableGeoLocation) [ - "--disable-geoclue" + nativeCheckInputs = [ + python3.pkgs.pytest + python3.pkgs.python-dbusmock + python3.pkgs.pygobject3 + python3.pkgs.dbus-python ]; - makeFlags = [ - "installed_testdir=${placeholder "installedTests"}/libexec/installed-tests/xdg-desktop-portal" - "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/xdg-desktop-portal" + mesonFlags = [ + "--sysconfdir=/etc" + "-Dinstalled-tests=true" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + ] ++ lib.optionals (!enableGeoLocation) [ + "-Dgeoclue=disabled" ]; + doCheck = true; + + preCheck = '' + # For test_trash_file + export HOME=$(mktemp -d) + ''; + passthru = { tests = { installedTests = nixosTests.installed-tests.xdg-desktop-portal; @@ -104,6 +132,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Desktop integration portals for sandboxed apps"; + homepage = "https://flatpak.github.io/xdg-desktop-portal/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/installed-tests-path.patch b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/installed-tests-path.patch new file mode 100644 index 000000000000..0a9547ba3628 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/installed-tests-path.patch @@ -0,0 +1,30 @@ +diff --git a/meson.build b/meson.build +index b25f9ef..7975f85 100644 +--- a/meson.build ++++ b/meson.build +@@ -40,8 +40,8 @@ if dataroot_dir == '' + dataroot_dir = datadir + endif + +-installed_tests_dir = prefix / libexecdir / 'installed-tests' / meson.project_name() +-installed_tests_data_dir = prefix / datadir / 'installed-tests' / meson.project_name() ++installed_tests_dir = get_option('installed_test_prefix') / 'libexec' / 'installed-tests' / meson.project_name() ++installed_tests_data_dir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / meson.project_name() + docs_dir = datadir / 'doc' / meson.project_name() + + summary({ +diff --git a/meson_options.txt b/meson_options.txt +index fccada3..ca87600 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -38,6 +38,10 @@ option('installed-tests', + type: 'boolean', + value: false, + description: 'Enable installation of some test cases') ++option('installed_test_prefix', ++ type: 'string', ++ value: '', ++ description: 'Prefix for installed tests') + option('pytest', + type: 'feature', + value: 'auto', diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/separate-env-for-portal-config.patch b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/separate-env-for-portal-config.patch new file mode 100644 index 000000000000..020d98c20700 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/separate-env-for-portal-config.patch @@ -0,0 +1,33 @@ +diff --git a/src/portal-impl.c b/src/portal-impl.c +index 0fa9682e..99f379dc 100644 +--- a/src/portal-impl.c ++++ b/src/portal-impl.c +@@ -433,8 +433,7 @@ load_portal_configuration (gboolean opt_verbose) + + desktops = get_current_lowercase_desktops (); + +- /* We need to override this in the tests */ +- portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_DIR"); ++ portal_dir = g_getenv ("NIXOS_XDG_DESKTOP_PORTAL_CONFIG_DIR_OVERRIDE"); + + if (portal_dir != NULL) + { +@@ -464,6 +463,18 @@ load_portal_configuration (gboolean opt_verbose) + if (load_config_directory (SYSCONFDIR "/" XDP_SUBDIR, desktops, opt_verbose)) + return; + ++ portal_dir = g_getenv ("NIXOS_XDG_DESKTOP_PORTAL_CONFIG_DIR"); ++ ++ if (portal_dir == NULL) ++ /* We need to override this in the tests */ ++ portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_DIR"); ++ ++ if (portal_dir != NULL) ++ { ++ if (load_config_directory (portal_dir, desktops, opt_verbose)) ++ return; ++ } ++ + /* $XDG_DATA_HOME/xdg-desktop-portal/(DESKTOP-)portals.conf + * (just for consistency with other XDG specifications) */ + g_clear_pointer (&user_portal_dir, g_free); diff --git a/nixpkgs/pkgs/development/libraries/xsimd/10.nix b/nixpkgs/pkgs/development/libraries/xsimd/10.nix deleted file mode 100644 index afea6b94ef37..000000000000 --- a/nixpkgs/pkgs/development/libraries/xsimd/10.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, doctest -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "xsimd"; - version = "10.0.0"; - - src = fetchFromGitHub { - owner = "xtensor-stack"; - repo = "xsimd"; - rev = finalAttrs.version; - sha256 = "sha256-+ewKbce+rjNWQ0nQzm6O4xSwgzizSPpDPidkQYuoSTU="; - }; - - nativeBuildInputs = [ - cmake - ]; - patches = lib.optionals stdenv.isDarwin [ - # https://github.com/xtensor-stack/xsimd/issues/807 - ./disable-test_error_gamma-test.patch - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - # https://github.com/xtensor-stack/xsimd/issues/798 - ./disable-polar-test.patch - ]; - - cmakeFlags = [ - "-DBUILD_TESTS=${if (finalAttrs.doCheck && stdenv.hostPlatform == stdenv.buildPlatform) then "ON" else "OFF"}" - ]; - - doCheck = true; - nativeCheckInputs = [ - doctest - ]; - checkTarget = "xtest"; - - meta = with lib; { - description = "C++ wrappers for SIMD intrinsics"; - homepage = "https://github.com/xtensor-stack/xsimd"; - license = licenses.bsd3; - maintainers = with maintainers; [ tobim ]; - platforms = platforms.all; - }; -}) diff --git a/nixpkgs/pkgs/development/libraries/xtensor/default.nix b/nixpkgs/pkgs/development/libraries/xtensor/default.nix index 7873da993fde..bb01b7f875ea 100644 --- a/nixpkgs/pkgs/development/libraries/xtensor/default.nix +++ b/nixpkgs/pkgs/development/libraries/xtensor/default.nix @@ -1,16 +1,14 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , doctest , enableAssertions ? false , enableBoundChecks ? false # Broadcasts don't pass bound checks , nlohmann_json , xtl -# Although this dependency is of the same GitHub organization, xtensor don't -# support xsimd 11 yet, see: -# https://github.com/xtensor-stack/xtensor/issues/2721 -, xsimd10 +, xsimd }: stdenv.mkDerivation (finalAttrs: { @@ -23,6 +21,16 @@ stdenv.mkDerivation (finalAttrs: { rev = finalAttrs.version; hash = "sha256-dVbpcBW+jK9nIl5efk5LdKdBm8CkaJWEZ0ZY7ZuApwk="; }; + patches = [ + # Support for xsimd 11 + (fetchpatch { + url = "https://github.com/xtensor-stack/xtensor/commit/77a650a8018e0be6fcc76bf66685ff352ae23ef1.patch"; + hash = "sha256-vOdUzzsSK+lYcA7fZXWOTVV202GZC0DhkMMjzggnmWE="; + }) + # A single test fails on Darwin, see: + # https://github.com/xtensor-stack/xtensor/issues/2718 + ./remove-failing-test_xinfo.patch + ]; nativeBuildInputs = [ cmake @@ -33,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!(stdenv.isAarch64 && stdenv.isLinux)) [ # xsimd support is broken on aarch64-linux, see: # https://github.com/xtensor-stack/xsimd/issues/945 - xsimd10 + xsimd ]; cmakeFlags = let diff --git a/nixpkgs/pkgs/development/libraries/xtensor/remove-failing-test_xinfo.patch b/nixpkgs/pkgs/development/libraries/xtensor/remove-failing-test_xinfo.patch new file mode 100644 index 000000000000..c3352c453c59 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/xtensor/remove-failing-test_xinfo.patch @@ -0,0 +1,12 @@ +diff --git i/test/CMakeLists.txt w/test/CMakeLists.txt +index 46127597..727b66bd 100644 +--- i/test/CMakeLists.txt ++++ w/test/CMakeLists.txt +@@ -189,7 +189,6 @@ set(XTENSOR_TESTS + test_xhistogram.cpp + test_xpad.cpp + test_xindex_view.cpp +- test_xinfo.cpp + test_xio.cpp + test_xlayout.cpp + test_xmanipulation.cpp diff --git a/nixpkgs/pkgs/development/libraries/yder/default.nix b/nixpkgs/pkgs/development/libraries/yder/default.nix index 286b34379dc2..70105872ba77 100644 --- a/nixpkgs/pkgs/development/libraries/yder/default.nix +++ b/nixpkgs/pkgs/development/libraries/yder/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "yder"; - version = "1.4.19"; + version = "1.4.20"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KP79i1yYJ6jrsdtS85fHOmJV+oAL/MNgc9On4RfOTwo="; + sha256 = "sha256-BaCF1r5mOYxj0zKc11uoKI9gVKuxWd8GaneGcV+qIFg="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix b/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix index 2d3ba583cfd5..6eaf9f84c6e8 100644 --- a/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix +++ b/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "zlib-ng"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "zlib-ng"; rev = version; - hash = "sha256-okNmobCVAC9y7tjZqFd0DBhOjs3WWRPK8jvK1j9G29k="; + hash = "sha256-EIAeRpmPFodbqQfMOFuGq7cZOnfR9xg8KN+5xa7e9J8="; }; outputs = [ "out" "dev" "bin" ]; |