diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix index 0b8b3e68b430..787ae0f892e9 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix @@ -16,19 +16,19 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-4yljDypIsx2bFKgCe0nL7Ljnzq6+efMRMBlpl1T6mU0="; + hash = "sha256-ZAw/n+JmsH/F8VwQzLfB3oPuofeiL6dtHXLiVMxxvCc="; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-heiercuubJUhzOiRNPRvcBQfvbOtM6albpWvOkHlgsI="; + hash = "sha256-qxytVpmDpHEc1bjEpKPrnINKbh/qNiG5vD3KdQ7vwGs="; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-U3VA9GjyP00bhZid3mdODLfmFW5WmtXmikPByDjELXA="; + hash = "sha256-/FK16O23iZgEc9bnvyquf0TcbCuraG9jVverlcWZymU="; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-uCOQnQ8x5OGPl/139jAZ12PdbWczS2KOQHLFxjEQnL4="; + hash = "sha256-1BQ0YXQNd8yjGxA6NLxsfZZemwYNqRzyGQCZln9ChJA="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}") @@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "csdevkit"; publisher = "ms-dotnettools"; - version = "1.50.51"; + version = "1.70.3"; inherit (extInfo) hash arch; }; sourceRoot = "extension"; # This has more than one folder. diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix index d7817a81488c..3351add4c03b 100644 --- a/pkgs/by-name/al/alpaca/package.nix +++ b/pkgs/by-name/al/alpaca/package.nix @@ -22,7 +22,14 @@ pipewire, }: -python3Packages.buildPythonApplication rec { +let + pythonPackages = python3Packages.overrideScope ( + self: super: { + bibtexparser = self.bibtexparser_2; + } + ); +in +pythonPackages.buildPythonApplication rec { pname = "alpaca"; version = "8.1.1"; pyproject = false; # Built with meson @@ -56,7 +63,7 @@ python3Packages.buildPythonApplication rec { ]; dependencies = - with python3Packages; + with pythonPackages; [ pygobject3 requests @@ -74,7 +81,7 @@ python3Packages.buildPythonApplication rec { ] ++ lib.flatten (builtins.attrValues optional-dependencies); - optional-dependencies = with python3Packages; { + optional-dependencies = with pythonPackages; { speech-to-text = [ openai-whisper pyaudio diff --git a/pkgs/by-name/dj/django-upgrade/package.nix b/pkgs/by-name/dj/django-upgrade/package.nix index 109d43977213..228db44bb066 100644 --- a/pkgs/by-name/dj/django-upgrade/package.nix +++ b/pkgs/by-name/dj/django-upgrade/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "django-upgrade"; - version = "1.29.0"; + version = "1.29.1"; pyproject = true; src = fetchFromGitHub { owner = "adamchainz"; repo = "django-upgrade"; tag = version; - hash = "sha256-ALAwOm+j0Gpx3ZiO8nyTDrJNqR9WaFSxLxAgTarNQeM="; + hash = "sha256-NnVFMItWiTL82LMxDKeGofaestRBfZFVjTKFjbJFmmU="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix index 235b4260282c..25858a8a4a05 100644 --- a/pkgs/by-name/fe/fex/package.nix +++ b/pkgs/by-name/fe/fex/package.nix @@ -26,6 +26,7 @@ xorg, withQt ? true, qt6, + fetchpatch, }: let @@ -95,13 +96,13 @@ let in llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "fex"; - version = "2509.1"; + version = "2510"; src = fetchFromGitHub { owner = "FEX-Emu"; repo = "FEX"; tag = "FEX-${finalAttrs.version}"; - hash = "sha256-eTm1ee8eS+OwzEUoklrrQDRIAJVX0FWBaWi2/TJrx48="; + hash = "sha256-C6Yeqo+KqA6OezxnpBAncTekOrPTgIq0vikQOmxaORA="; leaveDotGit = true; postFetch = '' @@ -127,6 +128,16 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { ''; }; + patches = [ + # Backported fix of unit test build with LLVM 21. + # TODO: drop after next release + (fetchpatch { + name = "unittests-thunklibs-fix-build-with-llvm-21.patch"; + url = "https://github.com/FEX-Emu/FEX/commit/5af2477d005bb0ab8b11633a678ed5f6121f81b6.patch"; + hash = "sha256-QdJaexzBSOVaKc3h2uwPbX4iysqvGBDmWH938ZeXcdE="; + }) + ]; + postPatch = '' substituteInPlace ThunkLibs/GuestLibs/CMakeLists.txt ThunkLibs/HostLibs/CMakeLists.txt \ --replace-fail "/usr/include/libdrm" "${devRootFS}/include/libdrm" \ diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix index 1a2a7f5880a0..5e3d2437af2f 100644 --- a/pkgs/by-name/gh/ghostfolio/package.nix +++ b/pkgs/by-name/gh/ghostfolio/package.nix @@ -11,13 +11,13 @@ buildNpmPackage rec { pname = "ghostfolio"; - version = "2.209.0"; + version = "2.211.0"; src = fetchFromGitHub { owner = "ghostfolio"; repo = "ghostfolio"; tag = version; - hash = "sha256-2tXapVGZ3p+Fq/CD8XOcUMHRwQUiIZdm+Rl+xQL5HBI="; + hash = "sha256-RoIOk0MIf1IAQLPO4MwemkXqQfJuDZtYYqn+OS6IUb0="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -27,7 +27,7 @@ buildNpmPackage rec { ''; }; - npmDepsHash = "sha256-WtvCSQzzokZ9tGMp7G7M1ZfoPxjQ5OiVNR4Wa4A7vTE="; + npmDepsHash = "sha256-Isy32xdxWlsGflqtcDJ6/lNaCA+IRbEOP8Z/BI0uV0s="; nativeBuildInputs = [ prisma diff --git a/pkgs/by-name/ha/hath-rust/package.nix b/pkgs/by-name/ha/hath-rust/package.nix index ff75eaa3a185..bb1918b01075 100644 --- a/pkgs/by-name/ha/hath-rust/package.nix +++ b/pkgs/by-name/ha/hath-rust/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hath-rust"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "james58899"; repo = "hath-rust"; tag = "v${finalAttrs.version}"; - hash = "sha256-81nt+epuZGWxmIEdTAsQJUxLOZjfMFl9SJNJILo9o+8="; + hash = "sha256-3fi18oarPXe9vUhn4MkyLWA4I2d6PtcbW+rpEYsq8/o="; }; - cargoHash = "sha256-7529DN55X6XbAxqXhTYSBL0c+/2fOKc4oyFnvMmEDeU="; + cargoHash = "sha256-/n4GwqK2i2YwH1q7U29PZh9JzDTuEbP3YRJktsknQeM="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/by-name/li/libitl/package.nix b/pkgs/by-name/li/libitl/package.nix index ce6c87b115ee..0a478041dfef 100644 --- a/pkgs/by-name/li/libitl/package.nix +++ b/pkgs/by-name/li/libitl/package.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-bhejnA7FfuopR27heliaE/vNd1Rqvnjj3n/vkjmimAw="; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "Islamic Tools and Libraries (ITL)"; longDescription = '' diff --git a/pkgs/by-name/li/libzra/package.nix b/pkgs/by-name/li/libzra/package.nix index 17669909a5ca..6f4dd78693e2 100644 --- a/pkgs/by-name/li/libzra/package.nix +++ b/pkgs/by-name/li/libzra/package.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation { # in submodule dev as of 1.4.7 postPatch = '' (cd submodule/zstd && patch -Np1 < ${./fix-pkg-config.patch}) + + substituteInPlace submodule/zstd/build/cmake/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" ''; meta = with lib; { diff --git a/pkgs/by-name/lo/loudgain/package.nix b/pkgs/by-name/lo/loudgain/package.nix index 653440a5f11b..730dcd266526 100644 --- a/pkgs/by-name/lo/loudgain/package.nix +++ b/pkgs/by-name/lo/loudgain/package.nix @@ -48,6 +48,11 @@ stdenv.mkDerivation rec { zlib ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" + ''; + postInstall = '' sed -e "1aPATH=$out/bin:\$PATH" -i "$out/bin/rgbpm" ''; diff --git a/pkgs/by-name/lw/lwan/package.nix b/pkgs/by-name/lw/lwan/package.nix index c564cff8490c..7f6a9e0b54a0 100644 --- a/pkgs/by-name/lw/lwan/package.nix +++ b/pkgs/by-name/lw/lwan/package.nix @@ -12,22 +12,15 @@ stdenv.mkDerivation rec { pname = "lwan"; - version = "0.5"; + version = "0.7"; src = fetchFromGitHub { owner = "lpereira"; repo = "lwan"; rev = "v${version}"; - sha256 = "sha256-otiPH+e+auMCyeOTq4LJYaBNv+I91kOCww7DCepQTAQ="; + sha256 = "sha256-kH4pZXLcVqGtiGF9IXsybWc+iG8bGASmxcaCKTAB40g="; }; - patches = [ - (fetchpatch { - url = "https://github.com/lpereira/lwan/commit/9b94ff5eecec1e925103b25a43dacc226a634878.patch"; - hash = "sha256-g1ZwmEodtF1fkbIBaLT4YvH8EG8DGafHydPSYJra+c0="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/ne/netcdfcxx4/package.nix b/pkgs/by-name/ne/netcdfcxx4/package.nix index b96c8f89f6ed..8f0a1c3b502f 100644 --- a/pkgs/by-name/ne/netcdfcxx4/package.nix +++ b/pkgs/by-name/ne/netcdfcxx4/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, netcdf, hdf5, curl, @@ -23,6 +24,11 @@ stdenv.mkDerivation rec { # This fix is included upstream, remove with next upgrade ./cmake-h5free.patch ./netcdf.patch + (fetchpatch { + name = "cmake-4.patch"; + url = "https://github.com/Unidata/netcdf-cxx4/commit/8455a69867a420cffa226978174bc0f99029bc8b.patch?full_index=1"; + hash = "sha256-AS2nQIXEW1iSR2LAzvTB04M+kyureJAn63+mPNoCq+0="; + }) ]; preConfigure = '' diff --git a/pkgs/by-name/ni/niimath/package.nix b/pkgs/by-name/ni/niimath/package.nix index d30a2680f2ca..5a85e292c038 100644 --- a/pkgs/by-name/ni/niimath/package.nix +++ b/pkgs/by-name/ni/niimath/package.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "niimath"; - version = "1.0.20240905"; + version = "1.0.20250804"; src = fetchFromGitHub { owner = "rordenlab"; repo = "niimath"; tag = "v${finalAttrs.version}"; - hash = "sha256-3XgB4q0HXLo9rEQBzC+2dxN81r9n8kkj2OC5d+WFmEs="; + hash = "sha256-lCs3yagFHQ9livH1ffwNhh7XCn4nEY48or6512yAl0k="; }; postPatch = '' diff --git a/pkgs/by-name/op/openlist/frontend.nix b/pkgs/by-name/op/openlist/frontend.nix index a366940e7d5c..4b3f85879b93 100644 --- a/pkgs/by-name/op/openlist/frontend.nix +++ b/pkgs/by-name/op/openlist/frontend.nix @@ -10,18 +10,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "openlist-frontend"; - version = "4.1.4"; + version = "4.1.5"; src = fetchFromGitHub { owner = "OpenListTeam"; repo = "OpenList-Frontend"; tag = "v${finalAttrs.version}"; - hash = "sha256-crQm74JxVhEDbFQKWJzE6T6qKVMaQbJilI9hoGIxUYU="; + hash = "sha256-J/6ZebKn7z5oagXF8in4PX9kMbdzBtqiwOgQdznYNzM="; }; i18n = fetchzip { url = "https://github.com/OpenListTeam/OpenList-Frontend/releases/download/v${finalAttrs.version}/i18n.tar.gz"; - hash = "sha256-4v+hNQl7tSm331CPpqYGMIJXEeOSB0QyQNeQCL5zeFg="; + hash = "sha256-rpLHflA5EHxmc2ST0AhDnFOXbI5aE4jdedHOEFZ9+RY="; stripRoot = false; }; @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-8wP57qIUGGccLX4oKkqQmibAoAHwnORhBFp80d+ltA4="; + hash = "sha256-Ge+uwFGvEtRgYf5zkwYbNfBONXoVxlw4pmu25nY4HTc="; }; buildPhase = '' diff --git a/pkgs/by-name/op/openlist/package.nix b/pkgs/by-name/op/openlist/package.nix index 0c316517fc24..eb6bb8ec2754 100644 --- a/pkgs/by-name/op/openlist/package.nix +++ b/pkgs/by-name/op/openlist/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "openlist"; - version = "4.1.4"; + version = "4.1.5"; src = fetchFromGitHub { owner = "OpenListTeam"; repo = "OpenList"; tag = "v${finalAttrs.version}"; - hash = "sha256-CNnDPA/zByhR6GOmzxOZRc8F/QqGIxTGSIKXOCwlwwg="; + hash = "sha256-x4cuymUzfMe49R9PRyD14f6piP4iR8AoYkvEfdRBKcE="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -33,7 +33,7 @@ buildGoModule (finalAttrs: { frontend = callPackage ./frontend.nix { }; proxyVendor = true; - vendorHash = "sha256-MHqQ/2FrqxufSa9OG3MWkm401qeIszK9rpgDR0jdCo4="; + vendorHash = "sha256-7LbJlattHOMYUKeqwg+E+X3NQO8p4mwqmtpd2I98JAI="; buildInputs = [ fuse ]; diff --git a/pkgs/by-name/op/openmw/0001-Do-not-implicitly-convert-QByteArray-to-const-char.patch b/pkgs/by-name/op/openmw/0001-Do-not-implicitly-convert-QByteArray-to-const-char.patch new file mode 100644 index 000000000000..f35c72c93b39 --- /dev/null +++ b/pkgs/by-name/op/openmw/0001-Do-not-implicitly-convert-QByteArray-to-const-char.patch @@ -0,0 +1,122 @@ +From 0de42e9a1640e74b2c94ce16ecaf7367ece5f4b0 Mon Sep 17 00:00:00 2001 +From: elsid +Date: Sun, 5 Oct 2025 23:40:17 +0200 +Subject: [PATCH] Do not implicitly convert QByteArray to const char* + +Operators supporting this conversion can be disabled via +QT_NO_CAST_FROM_BYTEARRAY breaking the build. For example: + +https://koschei.fedoraproject.org//package/openmw +https://kojipkgs.fedoraproject.org/work/tasks/5096/137735096/build.log + +Backported to OpenMW 0.49.x + +Co-authored-by: Sirius902 <10891979+Sirius902@users.noreply.github.com> +--- + apps/opencs/model/world/nestedtableproxymodel.cpp | 4 +++- + apps/opencs/view/world/util.cpp | 5 +++-- + components/files/qtconversion.cpp | 11 ++++++----- + components/vfs/qtconversion.cpp | 11 ++++++----- + 4 files changed, 18 insertions(+), 13 deletions(-) + +diff --git a/apps/opencs/model/world/nestedtableproxymodel.cpp b/apps/opencs/model/world/nestedtableproxymodel.cpp +index f542ce4def..5278710e4a 100644 +--- a/apps/opencs/model/world/nestedtableproxymodel.cpp ++++ b/apps/opencs/model/world/nestedtableproxymodel.cpp +@@ -13,7 +13,9 @@ CSMWorld::NestedTableProxyModel::NestedTableProxyModel( + { + const int parentRow = parent.row(); + +- mId = std::string(parentModel->index(parentRow, 0).data().toString().toUtf8()); ++ const QByteArray utf8 = parentModel->index(parentRow, 0).data().toString().toUtf8(); ++ ++ mId = std::string(utf8.constData(), utf8.size()); + + QAbstractProxyModel::setSourceModel(parentModel); + +diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp +index dfb587cd96..5fd32d78b4 100644 +--- a/apps/opencs/view/world/util.cpp ++++ b/apps/opencs/view/world/util.cpp +@@ -363,11 +363,12 @@ void CSVWorld::CommandDelegate::setEditorData(QWidget* editor, const QModelIndex + { + if (!variant.isValid()) + #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +- variant = QVariant(editor->property(n).metaType(), (const void*)nullptr); ++ variant = QVariant(editor->property(n.constData()).metaType(), (const void*)nullptr); ++ editor->setProperty(n.constData(), variant); + #else + variant = QVariant(editor->property(n).userType(), (const void*)nullptr); ++ editor->setProperty(n, variant); + #endif +- editor->setProperty(n, variant); + } + } + +diff --git a/components/files/qtconversion.cpp b/components/files/qtconversion.cpp +index d56832cb78..ac7ca6ec8b 100644 +--- a/components/files/qtconversion.cpp ++++ b/components/files/qtconversion.cpp +@@ -1,8 +1,9 @@ +- + #include "qtconversion.hpp" + + #include + ++#include ++ + QString Files::pathToQString(const std::filesystem::path& path) + { + const auto tmp = path.u8string(); +@@ -17,12 +18,12 @@ QString Files::pathToQString(std::filesystem::path&& path) + + std::filesystem::path Files::pathFromQString(QStringView path) + { +- const auto tmp = path.toUtf8(); +- return std::filesystem::path{ Misc::StringUtils::stringToU8String(tmp) }; ++ const QByteArray tmp = path.toUtf8(); ++ return std::filesystem::path(Misc::StringUtils::stringToU8String(std::string_view(tmp.constData(), tmp.size()))); + } + + std::filesystem::path Files::pathFromQString(QString&& path) + { +- const auto tmp = path.toUtf8(); +- return std::filesystem::path{ Misc::StringUtils::stringToU8String(tmp) }; ++ const QByteArray tmp = path.toUtf8(); ++ return std::filesystem::path(Misc::StringUtils::stringToU8String(std::string_view(tmp.constData(), tmp.size()))); + } +diff --git a/components/vfs/qtconversion.cpp b/components/vfs/qtconversion.cpp +index 472e3dd0b4..fc8a0fb78e 100644 +--- a/components/vfs/qtconversion.cpp ++++ b/components/vfs/qtconversion.cpp +@@ -1,8 +1,9 @@ +- + #include "qtconversion.hpp" + + #include + ++#include ++ + QString VFS::Path::normalizedToQString(NormalizedView path) + { + return QString::fromUtf8(path.value().data(), path.value().size()); +@@ -15,12 +16,12 @@ QString VFS::Path::normalizedToQString(Normalized&& path) + + VFS::Path::Normalized VFS::Path::normalizedFromQString(QStringView path) + { +- const auto tmp = path.toUtf8(); +- return Normalized{ tmp }; ++ const QByteArray tmp = path.toUtf8(); ++ return Normalized(std::string_view(tmp.constData(), tmp.size())); + } + + VFS::Path::Normalized VFS::Path::normalizedFromQString(QString&& path) + { +- const auto tmp = path.toUtf8(); +- return Normalized{ tmp }; ++ const QByteArray tmp = std::move(path).toUtf8(); ++ return Normalized(std::string_view(tmp.constData(), tmp.size())); + } +-- +2.51.0 + diff --git a/pkgs/by-name/op/openmw/package.nix b/pkgs/by-name/op/openmw/package.nix index 0720f976e1c7..35a9fa87bb99 100644 --- a/pkgs/by-name/op/openmw/package.nix +++ b/pkgs/by-name/op/openmw/package.nix @@ -85,6 +85,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Eyjn3jPpo0d7XENg0Ea/3MN60lZBSUAMkz1UtTiIP80="; }; + patches = [ + # https://gitlab.com/OpenMW/openmw/-/merge_requests/4941 + # FIXME: Remove after next release + ./0001-Do-not-implicitly-convert-QByteArray-to-const-char.patch + ]; + postPatch = '' sed '1i#include ' -i components/myguiplatform/myguidatamanager.cpp # gcc12 '' diff --git a/pkgs/by-name/ow/owl/package.nix b/pkgs/by-name/ow/owl/package.nix index 1b8ba893537b..90f13b54b42b 100644 --- a/pkgs/by-name/ow/owl/package.nix +++ b/pkgs/by-name/ow/owl/package.nix @@ -27,6 +27,13 @@ stdenv.mkDerivation { libpcap ]; + postPatch = '' + substituteInPlace googletest/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8.8)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace googletest/{googlemock,googletest}/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.6.4)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "Open Apple Wireless Direct Link (AWDL) implementation written in C"; homepage = "https://owlink.org/"; diff --git a/pkgs/by-name/pd/pdfslicer/package.nix b/pkgs/by-name/pd/pdfslicer/package.nix index 9af9f541b486..27ac7fb33c5d 100644 --- a/pkgs/by-name/pd/pdfslicer/package.nix +++ b/pkgs/by-name/pd/pdfslicer/package.nix @@ -29,6 +29,16 @@ stdenv.mkDerivation rec { # Don't build tests, vendored catch doesn't build with latest glibc. substituteInPlace CMakeLists.txt \ --replace "add_subdirectory (tests)" "" + + # Replace deprecated and now unsupported old cmake version + # https://github.com/NixOS/nixpkgs/issues/445447 + + substituteInPlace third-party/fmtlib/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.1.0)" \ + "cmake_minimum_required(VERSION 3.10)" + substituteInPlace third-party/GSL/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.1.3)" \ + "cmake_minimum_required(VERSION 3.10)" ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/ph/phonemizer/package.nix b/pkgs/by-name/ph/phonemizer/package.nix new file mode 100644 index 000000000000..1a49b263f00c --- /dev/null +++ b/pkgs/by-name/ph/phonemizer/package.nix @@ -0,0 +1,13 @@ +{ + python3Packages, +}: + +let + pythonPackages = python3Packages.overrideScope ( + self: super: { + bibtexparser = self.bibtexparser_2; + } + ); +in +with pythonPackages; +toPythonApplication phonemizer diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix index 9f19be05bf64..408bfe92a9c6 100644 --- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix +++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "roddhjav-apparmor-rules"; - version = "0-unstable-2025-10-14"; + version = "0-unstable-2025-10-25"; src = fetchFromGitHub { owner = "roddhjav"; repo = "apparmor.d"; - rev = "f85802feeaa5f414184398b38e9916cfd5a2e25c"; - hash = "sha256-JlG7TpLICeRrTl+4MVe9UUF4nezeHiKcE+C8pwsca4M="; + rev = "6aaa6e79183d489c84f9baad821354e72b322c46"; + hash = "sha256-fDjajIA06USViGWNKvnqg2V6dc1Hzqt/9q8PbKWvKxA="; }; dontConfigure = true; diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index f1d9a2a723f7..e5b3bf0d62a6 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -20,19 +20,23 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "stalwart-mail" + (lib.optionalString stalwartEnterprise "-enterprise"); - version = "0.13.4"; + version = "0.14.0"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "stalwart"; tag = "v${finalAttrs.version}"; - hash = "sha256-1WKmSgDZ3c6+fFKH9+kgrxFYthKQqE1455bFHlVCGhU="; + hash = "sha256-KH68lFF1eqYZiI5AjzDRX6Z21MQ9At4jH6x9jsQzejE="; }; - cargoHash = "sha256-i6AvyX4RObB9aa+TYvsOW8i9WTcYx8ddP/Jmyr8PWMY="; + cargoHash = "sha256-pjmAIC7g8SbMxZvTgaXH8GrRPhITDjC5psJpfT+vV6M="; + + depsBuildBuild = [ + pkg-config + zstd + ]; nativeBuildInputs = [ - pkg-config protobuf rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/st/stasis/package.nix b/pkgs/by-name/st/stasis/package.nix index 916cbb056f6e..54dbec552df9 100644 --- a/pkgs/by-name/st/stasis/package.nix +++ b/pkgs/by-name/st/stasis/package.nix @@ -14,16 +14,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "stasis"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "saltnpepper97"; repo = "stasis"; tag = "v${finalAttrs.version}"; - hash = "sha256-gJB/y6jSBJZjBTQB9sxbVpllSfF6jwKOEeLqlgIStMA="; + hash = "sha256-tRw5sHj3nEwcEviEKKcfSUyY16MjsFzLcmnb0/AtAME="; }; - cargoHash = "sha256-JX0imd+FuuBq8d3FAYEQ+LLZQV39f8Iu9ftLASs00Fc="; + cargoHash = "sha256-qfS/AR4XjFUeYpz7tNJ31B5fkVsxvXlwFpNe8U3J94o="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/tb/tbox/package.nix b/pkgs/by-name/tb/tbox/package.nix index 16f26e2d82d4..0077ef701cfd 100644 --- a/pkgs/by-name/tb/tbox/package.nix +++ b/pkgs/by-name/tb/tbox/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tbox"; - version = "1.7.7"; + version = "1.7.8"; src = fetchFromGitHub { owner = "tboox"; repo = "tbox"; rev = "v${version}"; - hash = "sha256-piPfPg3NAvP2zhWgtPlNvlAHoqIU77TE/kd1B/6GIuc="; + hash = "sha256-lAuazxlPOfZ7gWGS0pQ22Yk3PjgrB9wlxNkq1TTVEoM="; }; configureFlags = [ diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix index 3080fde6c372..6b3b676410b6 100644 --- a/pkgs/by-name/uw/uwsm/package.nix +++ b/pkgs/by-name/uw/uwsm/package.nix @@ -29,22 +29,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "uwsm"; - version = "0.23.3"; + version = "0.24.1"; src = fetchFromGitHub { owner = "Vladimir-csp"; repo = "uwsm"; tag = "v${finalAttrs.version}"; - hash = "sha256-UP9Ztps5oWl0bdXhSlE4SCxHFprUf74DWygJy6GvO4k="; + hash = "sha256-x8Nx0Y4pIOjcN0aYSfTi3WyjzF/wzzgLpNrjpI2s/O0="; }; - patches = [ - (fetchpatch { - url = "https://github.com/Vladimir-csp/uwsm/commit/bd4db0fd1880b9b798e8f67e2d4c5e4ca2a28aca.patch?full_index=1"; - hash = "sha256-GxGwy9BkpBKZGkG00+bVIh6iDNBgRG1f1f9GUKm3ERw="; - }) - ]; - nativeBuildInputs = [ makeBinaryWrapper meson diff --git a/pkgs/by-name/vm/vmime/package.nix b/pkgs/by-name/vm/vmime/package.nix index 7b82f03b1cfe..238e8bc41ee9 100644 --- a/pkgs/by-name/vm/vmime/package.nix +++ b/pkgs/by-name/vm/vmime/package.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation { pname = "vmime"; # XXX: using unstable rev for now to comply with the removal of # deprecated symbols in the latest release of gsasl - version = "unstable-2022-03-26"; + version = "0-unstable-2025-07-21"; src = fetchFromGitHub { owner = "kisli"; repo = "vmime"; - rev = "fc69321d5304c73be685c890f3b30528aadcfeaf"; - sha256 = "sha256-DUcGQcT7hp5Rs2Z5C8wo+3BYwWqED0KrF3h3vgLiiow="; + rev = "7046a4360bbeea21d1d8b5cfa4589bb4df7f980d"; + sha256 = "sha256-cwilSnybH5E0wq384lPnqAjPkQTLtlWS8NhmoFE/13k="; }; buildInputs = [ diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix index e5910918c62f..e8645badd14d 100644 --- a/pkgs/by-name/xe/xen/package.nix +++ b/pkgs/by-name/xe/xen/package.nix @@ -225,6 +225,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://xenbits.xen.org/xsa/xsa475-2.patch"; hash = "sha256-7MKtDAJpihpfcBK+hyBFGCP6gHWs2cdgTks8B439b2s="; }) + + # XSA 476 + (fetchpatch { + url = "https://xenbits.xen.org/xsa/xsa476-4.20.patch"; + hash = "sha256-nZUHcMr9RpQqrazG+RtTw+/s1gzqN1D565RuQjuALTQ="; + }) ]; outputs = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 89c4f06872b5..1fbd44a3e8ec 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "7.1.5"; + version = "7.1.6"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "files"; rev = version; - hash = "sha256-fS285BRTP/i50WE4oM+xgoj6cBgas+dQ6WdK9WebURQ="; + hash = "sha256-z6trjczB+ZLPvWO/R41PTSA1tSBIVD/kMF12TupwId4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix index 1dc7cc8de508..93e318059b08 100644 --- a/pkgs/development/python-modules/clldutils/default.nix +++ b/pkgs/development/python-modules/clldutils/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, colorlog, fetchFromGitHub, - bibtexparser_2, + bibtexparser, git, lxml, markdown, @@ -36,7 +36,7 @@ buildPythonPackage rec { dependencies = [ attrs - bibtexparser_2 + bibtexparser colorlog lxml markdown @@ -55,6 +55,7 @@ buildPythonPackage rec { ]; meta = { + broken = lib.versionOlder bibtexparser.version "2"; changelog = "https://github.com/clld/clldutils/blob/${src.tag}/CHANGES.md"; description = "Utilities for clld apps without the overhead of requiring pyramid, rdflib et al"; homepage = "https://github.com/clld/clldutils"; diff --git a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix index 7ec606f2aa9a..3d63444e20e5 100644 --- a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix +++ b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ha-mqtt-discoverable"; - version = "0.21.0"; + version = "0.22.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "unixorn"; repo = "ha-mqtt-discoverable"; tag = "v${version}"; - hash = "sha256-p9qzK2pQDDLB6UVGNWYMd8M5/NicNbM4bnffxen48hQ="; + hash = "sha256-6xUfR9LR8xphex6EVX3u9VKjtvHhTX1EkC8KGPFtJzk="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/py-stringmatching/default.nix b/pkgs/development/python-modules/py-stringmatching/default.nix index 4ec1fe9cfad0..e1b4f98718d7 100644 --- a/pkgs/development/python-modules/py-stringmatching/default.nix +++ b/pkgs/development/python-modules/py-stringmatching/default.nix @@ -8,7 +8,7 @@ setuptools, # dependencies - numpy_1, + numpy, six, # tests @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; dependencies = [ - numpy_1 + numpy six ]; @@ -47,6 +47,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "py_stringmatching" ]; meta = with lib; { + broken = lib.versionAtLeast numpy.version "2"; description = "Python string matching library including string tokenizers and string similarity measures"; homepage = "https://github.com/anhaidgroup/py_stringmatching"; changelog = "https://github.com/anhaidgroup/py_stringmatching/blob/v${version}/CHANGES.txt"; diff --git a/pkgs/development/python-modules/tlds/default.nix b/pkgs/development/python-modules/tlds/default.nix index c07b7d8d6a91..51e7cfc95063 100644 --- a/pkgs/development/python-modules/tlds/default.nix +++ b/pkgs/development/python-modules/tlds/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "tlds"; - version = "2025082700"; + version = "2025102200"; pyproject = true; src = fetchFromGitHub { owner = "kichik"; repo = "tlds"; tag = version; - hash = "sha256-sMK+jglwhF8FX8yLDHBtheudfg20MOJhk+zHznQ0hbk="; + hash = "sha256-rulYXgVjzPcb5cBi57u4uzR6KDCp+NUaUMzi1o/SrN4="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index 3061968e2b71..abd83ca195a5 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -23,12 +23,16 @@ stdenv.mkDerivation { hash = "sha256-RbxFqZegsCxnUaIIA5OfTzx1wflCPeF+enQt90VwMgA="; }; - postPatch = + postPatch = '' + substituteInPlace {clex,clang_delta,delta,unifdef,creduce,.}/CMakeLists.txt --replace-fail \ + "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)" + '' + + # On Linux, c-reduce's preferred way to reason about # the cpu architecture/topology is to use 'lscpu', # so let's make sure it knows where to find it: lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace creduce/creduce_utils.pm --replace \ + substituteInPlace creduce/creduce_utils.pm --replace-fail \ lscpu ${util-linux}/bin/lscpu ''; diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix index 5a27ddd671eb..96316e9241e5 100644 --- a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix +++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "wills106"; domain = "solax_modbus"; - version = "2025.10.4"; + version = "2025.10.6"; src = fetchFromGitHub { owner = "wills106"; repo = "homeassistant-solax-modbus"; tag = version; - hash = "sha256-ai9Dt68TM2qDbWhypct6KdMwsLbrnDocL6GIR7D0guw="; + hash = "sha256-BZ/UcBTZyaLAuJ34blC3KdFRIGRR4Qe1tkJqJAP21IA="; }; dependencies = [ pymodbus ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0667cce2eda9..404bbadf4bdf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13039,8 +13039,6 @@ with pkgs; cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { }; cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { }; - phonemizer = with python3Packages; toPythonApplication phonemizer; - ### GAMES inherit (callPackages ../games/fteqw { })