diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6d764c542901..a3f086b02c65 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -606,6 +606,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + accent-vim = buildVimPlugin { + pname = "accent.vim"; + version = "2025-01-29"; + src = fetchFromGitHub { + owner = "Alligator"; + repo = "accent.vim"; + rev = "54e0b255cb2c93555014197c8adc59d631c25696"; + sha256 = "0mpap9348rmnnr3gma85xk5py84ax8gc54aj3n0w075yla5x0m0d"; + }; + meta.homepage = "https://github.com/Alligator/accent.vim/"; + meta.hydraPlatforms = [ ]; + }; + ack-vim = buildVimPlugin { pname = "ack.vim"; version = "2018-02-27"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 4ae5286aa82a..3d0c63bfeb8f 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -45,6 +45,7 @@ https://github.com/svban/YankAssassin.vim/,HEAD, https://github.com/vim-scripts/YankRing.vim/,, https://github.com/ycm-core/YouCompleteMe/,, https://github.com/vim-scripts/a.vim/,, +https://github.com/Alligator/accent.vim/,HEAD, https://github.com/mileszs/ack.vim/,, https://github.com/eikenb/acp/,, https://github.com/aznhe21/actions-preview.nvim/,, diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 4c8a52d5e7f3..f888d63a4c06 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -624,13 +624,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-gHHJiFLVmgx+689hzGVRQZB2wcATJ41bqpcWFDV7HyI=", + "hash": "sha256-+Ux/Xp598uRpRgBfVucrl8GYkpaKcmZ5h67ExdBEchY=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.83.1", + "rev": "v1.83.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-UL+1OcRKvyyCNL7czv+Zc/arkX3gy+AoqxlgZpmINhE=" + "vendorHash": "sha256-G6kqcQMpNKioBEWNDGIYCJaoYv6EPAbu2Nh/8EkQGAA=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -894,11 +894,11 @@ "vendorHash": "sha256-ByB1ztK2/1pTFeO34eXVyQSSbe35qqoCeWe6MPZN7vY=" }, "oci": { - "hash": "sha256-fEvo5R7HutlOmZ6DMvYKQiE0amwk/YPi1T2a55w70hQ=", + "hash": "sha256-LnR1bXTr+j7tKALZll/dwUI+o9TepPGS0mAHGxYK7g0=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v7.21.0", + "rev": "v7.22.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1128,13 +1128,13 @@ "vendorHash": "sha256-at8i4gCFrJxE9fVIL5uI7iSFex0gLXu1SnlPKlZAmrY=" }, "scaleway": { - "hash": "sha256-KEQT0PScUTtTVgsinC9kZlNwAuSCHKXtswM6qDwApTo=", + "hash": "sha256-FT9V0qAs6NSULqOMsW9uolc1WgueUnU4vfL4rntMA1A=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.60.3", + "rev": "v2.60.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-rcidk22c7Pk3k8ZhJyBXo1y2KYRu1yzBVCVGA3GcGKM=" + "vendorHash": "sha256-OcKCtH4ciGrKwidTQC+yTWMyMfShJMsTnsKOyBxwLDg=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1146,13 +1146,13 @@ "vendorHash": null }, "selectel": { - "hash": "sha256-4tU/S+YSOkQJSh1p/Fjx00i7RJYFv3OuicDvjTOGGPk=", + "hash": "sha256-J0hz5qtT3bBKqoZ9SkZn0oxix1fIQRmwv7feME7CljM=", "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", "repo": "terraform-provider-selectel", - "rev": "v6.6.0", + "rev": "v6.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-uMZIze8sng80sCb6f9CsWHVMmUGMaaOD4Ezx9B2fAJ4=" + "vendorHash": "sha256-TQXj2Em665zhCqXiT2BG1xxvVCo0/G2SaQKUbqGwcQM=" }, "sentry": { "hash": "sha256-b5a0++mu6roN6VuJaBZEczfqA6Stt+a7fTOLGLvqPeQ=", diff --git a/pkgs/by-name/ch/chatbox/package.nix b/pkgs/by-name/ch/chatbox/package.nix index 3b6e1c3ce330..e80f64164f39 100644 --- a/pkgs/by-name/ch/chatbox/package.nix +++ b/pkgs/by-name/ch/chatbox/package.nix @@ -6,11 +6,11 @@ }: let pname = "chatbox"; - version = "1.16.3"; + version = "1.16.4"; src = fetchurl { url = "https://download.chatboxai.app/releases/Chatbox-${version}-x86_64.AppImage"; - hash = "sha256-Vits1RCDAsaTglbFo1y2YeiNBGou9m6BScV+rMGp3Rw="; + hash = "sha256-hLYOiSIOOTjBH0bxWeji7IzH9F38+e10MCXm88YgYdQ="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/op/openrgb-plugin-effects/package.nix b/pkgs/by-name/op/openrgb-plugin-effects/package.nix index 70f96877ad79..ce0c60f496d3 100644 --- a/pkgs/by-name/op/openrgb-plugin-effects/package.nix +++ b/pkgs/by-name/op/openrgb-plugin-effects/package.nix @@ -2,11 +2,12 @@ lib, stdenv, fetchFromGitLab, - libsForQt5, openrgb, glib, openal, pkg-config, + kdePackages, + fetchpatch, }: stdenv.mkDerivation (finalAttrs: { @@ -21,20 +22,30 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + patches = [ + # Fix Qt6 issues in OpenRGBPluginsFont.cpp + (fetchpatch { + url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin/-/commit/e952b0ed390045d4f4adec8e74b3126c2f8abcab.patch"; + hash = "sha256-xMsnVyrn/Cv2x2xQtAnPb5HJc+WolNx4v7h0TkTj9DU="; + }) + ./qt5compat.patch + ]; + postPatch = '' # Use the source of openrgb from nixpkgs instead of the submodule rm -r OpenRGB ln -s ${openrgb.src} OpenRGB ''; - nativeBuildInputs = with libsForQt5; [ - qmake + nativeBuildInputs = [ pkg-config - wrapQtAppsHook + kdePackages.wrapQtAppsHook + kdePackages.qmake ]; - buildInputs = with libsForQt5; [ - qtbase + buildInputs = [ + kdePackages.qtbase + kdePackages.qt5compat glib openal ]; diff --git a/pkgs/by-name/op/openrgb-plugin-effects/qt5compat.patch b/pkgs/by-name/op/openrgb-plugin-effects/qt5compat.patch new file mode 100644 index 000000000000..926c34945419 --- /dev/null +++ b/pkgs/by-name/op/openrgb-plugin-effects/qt5compat.patch @@ -0,0 +1,114 @@ +Commit ID: 20f227f4ef942e2ead5a3a684248c2da48c979bc +Change ID: rwlwzspvylkypuqoornwzvuvpuzorvso +Author : Alexey Sokolov (2025-07-21 22:34:37) +Committer: Marie Ramlow (2025-10-12 12:05:01) + + Fix build with Qt6 using core5compat + + Updated to add Qt5 backwards compatibility by Adam Honse + +diff --git a/Effects/Ambient/RectangleSelector.cpp b/Effects/Ambient/RectangleSelector.cpp +index 8f28ddcbcc..d8b4f56a1d 100644 +--- a/Effects/Ambient/RectangleSelector.cpp ++++ b/Effects/Ambient/RectangleSelector.cpp +@@ -1,6 +1,5 @@ + #include "RectangleSelector.h" + #include +-#include + #include + + RectangleSelector::RectangleSelector(QWidget* parent) +@@ -57,7 +56,7 @@ + + QPainter painter(this); + +- texture.setDevicePixelRatio(devicePixelRatioF() / qApp->desktop()->devicePixelRatioF()); ++ texture.setDevicePixelRatio(devicePixelRatioF() / qApp->primaryScreen()->devicePixelRatio()); + + painter.setPen(QColor(0, 0, 0, 128)); + painter.setBrush(Qt::NoBrush); +@@ -69,7 +68,7 @@ + for(QScreen *screen : QApplication::screens()) + { + QRect geometry = screen->geometry(); +- qreal ratio = screen->devicePixelRatio() / qApp->desktop()->devicePixelRatioF(); ++ qreal ratio = screen->devicePixelRatio() / qApp->primaryScreen()->devicePixelRatio(); + QRect physical_geometry(geometry.x(), geometry.y(), std::lrint((qreal) geometry.width() * ratio), lrint((qreal) geometry.height() * ratio)); + + if(physical_geometry.contains(rect.center())) +@@ -92,7 +91,7 @@ + for(QScreen *screen : QApplication::screens()) + { + QRect geometry = screen->geometry(); +- qreal ratio = screen->devicePixelRatio() / qApp->desktop()->devicePixelRatioF(); ++ qreal ratio = screen->devicePixelRatio() / qApp->primaryScreen()->devicePixelRatio(); + + screen_geometries.emplace_back(geometry.x(), geometry.y(), + std::lrint((qreal) geometry.width() * ratio), +diff --git a/Effects/Shaders/GLSLHighlighter.h b/Effects/Shaders/GLSLHighlighter.h +index 7e9f21423b..ca9bf42c3c 100644 +--- a/Effects/Shaders/GLSLHighlighter.h ++++ b/Effects/Shaders/GLSLHighlighter.h +@@ -2,6 +2,7 @@ + #define GLSLHIGHLIGHTER_H + + #include ++#include + + class GLSLHighlighter : public QSyntaxHighlighter + { +diff --git a/OpenRGBEffectPage.cpp b/OpenRGBEffectPage.cpp +index 0d6e4ab0fb..4b756cf63c 100644 +--- a/OpenRGBEffectPage.cpp ++++ b/OpenRGBEffectPage.cpp +@@ -38,7 +38,7 @@ + | Extra options and custom widgets | + \*-----------------------------------------------*/ + ui->ExtraOptions->addWidget(effect); +- ui->ExtraOptions->setMargin(0); ++ ui->ExtraOptions->setContentsMargins(0, 0, 0, 0); + effect->setParent(ui->extra_settings); + + InitUi(); +diff --git a/OpenRGBEffectsPlugin.pro b/OpenRGBEffectsPlugin.pro +index 3e53316519..fec852f88c 100644 +--- a/OpenRGBEffectsPlugin.pro ++++ b/OpenRGBEffectsPlugin.pro +@@ -1,4 +1,10 @@ +-QT += gui widgets core ++QT += gui widgets core opengl ++ ++if(greaterThan(QT_MAJOR_VERSION, 5)) { ++QT += \ ++ core5compat \ ++} ++ + DEFINES += OPEN_RGB_EFFECTS_PLUGIN_LIBRARY + TEMPLATE = lib + +diff --git a/SaveProfilePopup.cpp b/SaveProfilePopup.cpp +index 7297dad8b7..4fa837235f 100644 +--- a/SaveProfilePopup.cpp ++++ b/SaveProfilePopup.cpp +@@ -2,8 +2,8 @@ + #include "ui_SaveProfilePopup.h" + #include "OpenRGBEffectSettings.h" + +-#include +-#include ++#include ++#include + + SaveProfilePopup::SaveProfilePopup(QWidget *parent) : + QWidget(parent), +@@ -12,8 +12,8 @@ + ui->setupUi(this); + + // only letters or numbers, - _ and . +- QRegExp re("^[\\w\\-_.]+$"); +- QRegExpValidator *validator = new QRegExpValidator(re, this); ++ QRegularExpression re("^[\\w\\-_.]+$"); ++ QRegularExpressionValidator *validator = new QRegularExpressionValidator(re, this); + ui->filename->setValidator(validator); + + std::vector filenames = OpenRGBEffectSettings::ListProfiles(); diff --git a/pkgs/by-name/op/openrgb-plugin-hardwaresync/package.nix b/pkgs/by-name/op/openrgb-plugin-hardwaresync/package.nix index 970c0d38a059..433eb4fc8bdc 100644 --- a/pkgs/by-name/op/openrgb-plugin-hardwaresync/package.nix +++ b/pkgs/by-name/op/openrgb-plugin-hardwaresync/package.nix @@ -2,12 +2,13 @@ lib, stdenv, fetchFromGitLab, - libsForQt5, openrgb, glib, libgtop, lm_sensors, pkg-config, + kdePackages, + fetchpatch, }: stdenv.mkDerivation (finalAttrs: { @@ -21,6 +22,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-3sQFiqmXhuavce/6v3XBpp6PAduY7t440nXfbfCX9a0="; }; + patches = [ + # Fix Qt 6 build + (fetchpatch { + url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin/-/commit/62707c260953fb5ac2bb782595c18791bf54ff97.patch"; + hash = "sha256-xMsnVyrn/Cv2x2xQtAnPb5HJc+WolNx4v7h0TkTj9DU="; + }) + ]; + postPatch = '' # Use the source of openrgb from nixpkgs instead of the submodule rmdir OpenRGB @@ -29,17 +38,17 @@ stdenv.mkDerivation (finalAttrs: { rm -r dependencies/lhwm-cpp-wrapper ''; - buildInputs = with libsForQt5; [ - qtbase + buildInputs = [ + kdePackages.qtbase glib libgtop lm_sensors ]; - nativeBuildInputs = with libsForQt5; [ - qmake + nativeBuildInputs = [ pkg-config - wrapQtAppsHook + kdePackages.qmake + kdePackages.wrapQtAppsHook ]; meta = with lib; { diff --git a/pkgs/by-name/op/openrgb/package.nix b/pkgs/by-name/op/openrgb/package.nix index 48bacfdf5f7f..ce3a74baa29f 100644 --- a/pkgs/by-name/op/openrgb/package.nix +++ b/pkgs/by-name/op/openrgb/package.nix @@ -2,13 +2,13 @@ lib, stdenv, fetchFromGitLab, - libsForQt5, libusb1, hidapi, pkg-config, coreutils, - mbedtls_2, + mbedtls, symlinkJoin, + kdePackages, }: stdenv.mkDerivation (finalAttrs: { @@ -22,21 +22,24 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-XBLj4EfupyeVHRc0pVI7hrXFoCNJ7ak2yO0QSfhBsGU="; }; + patches = [ + ./qlist-include.patch + ]; + nativeBuildInputs = [ pkg-config ] - ++ (with libsForQt5; [ + ++ (with kdePackages; [ qmake wrapQtAppsHook ]); buildInputs = [ - libusb1 hidapi - mbedtls_2 + mbedtls ] - ++ (with libsForQt5; [ + ++ (with kdePackages; [ qtbase qttools qtwayland @@ -57,6 +60,10 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstallCheck ''; + qmakeFlags = [ + "QT_TOOL.lrelease.binary=${lib.getDev kdePackages.qttools}/bin/lrelease" + ]; + passthru.withPlugins = plugins: let diff --git a/pkgs/by-name/op/openrgb/qlist-include.patch b/pkgs/by-name/op/openrgb/qlist-include.patch new file mode 100644 index 000000000000..52fb6772cf71 --- /dev/null +++ b/pkgs/by-name/op/openrgb/qlist-include.patch @@ -0,0 +1,16 @@ +Commit ID: 2fa7aa0ec87d9878293033db0e86bb62cddc47df +Change ID: mvrytuwvnokxyvmuworxptmtqpqpppxq +Author : Marie Ramlow (2025-10-11 12:10:21) +Committer: Marie Ramlow (2025-10-11 12:17:20) + + OpenRGBFont: add QList include + +diff --git a/qt/OpenRGBFont.cpp b/qt/OpenRGBFont.cpp +index 628bd35281..db1ab5fb76 100644 +--- a/qt/OpenRGBFont.cpp ++++ b/qt/OpenRGBFont.cpp +@@ -1,3 +1,4 @@ ++#include + #include "OpenRGBFont.h" + #include + diff --git a/pkgs/by-name/pa/pamixer/package.nix b/pkgs/by-name/pa/pamixer/package.nix index cab4a6e0d8af..f629e7d5cd35 100644 --- a/pkgs/by-name/pa/pamixer/package.nix +++ b/pkgs/by-name/pa/pamixer/package.nix @@ -21,6 +21,12 @@ stdenv.mkDerivation rec { hash = "sha256-LbRhsW2MiTYWSH6X9Pz9XdJdH9Na0QCO8CFmlzZmDjQ="; }; + postPatch = '' + # icu76 headers (included via cxxopts) require c++17 features + substituteInPlace meson.build \ + --replace-fail 'cpp_std=c++11' 'cpp_std=c++17' + ''; + nativeBuildInputs = [ pkg-config meson diff --git a/pkgs/by-name/to/tor/package.nix b/pkgs/by-name/to/tor/package.nix index 73747fe0663c..599224c65d89 100644 --- a/pkgs/by-name/to/tor/package.nix +++ b/pkgs/by-name/to/tor/package.nix @@ -46,11 +46,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "tor"; - version = "0.4.8.18"; + version = "0.4.8.19"; src = fetchurl { url = "https://dist.torproject.org/tor-${finalAttrs.version}.tar.gz"; - hash = "sha256-SupsEJ1O/06iuvuQWn5rCpZdFP6FYhSwL82QRrTZOvg="; + hash = "sha256-PLZJodM7pqZfEJ0iRTTpOq8KbehKWxy0sFS/oGu3T1o="; }; outputs = [ diff --git a/pkgs/by-name/ve/velocity/deps.json b/pkgs/by-name/ve/velocity/deps.json index ea0c77471f86..e1b3449497ea 100644 --- a/pkgs/by-name/ve/velocity/deps.json +++ b/pkgs/by-name/ve/velocity/deps.json @@ -787,24 +787,24 @@ "jar": "sha256-Yq4oGH7SsGKBPaap1We/7nM8NBWCaZti3ZgCMHKaAxM=", "pom": "sha256-NYRJ1sc1OFhFCN2K5s/eVrr0o0t2e3HZzEZE8PH0IRo=" }, - "net/kyori#adventure-api/4.24.0": { - "jar": "sha256-2MHWbbD7rwhOgXmz8lQdn/ZEAqeIEHCnHos8JsJtOE4=", - "module": "sha256-c06XRjLjZiH+7Ze3ThrLSXl+pzw3EUR8p+LGBLmLEFU=", - "pom": "sha256-eG4PXAYZB2RwjAVpqFTsfjHG/gcZO0Rfg4l1Uorbt30=" + "net/kyori#adventure-api/4.25.0": { + "jar": "sha256-jigb8TV/+Rr5eDpsJCdrSD2BVKezyrWwTpCea/XnLJ0=", + "module": "sha256-BjX3/6StwHdpvwspz563yZXxKZujomtzPCTdf3Oor5M=", + "pom": "sha256-b3Z3Bs6f0+j5f8LKtz2lWlr+f10Z1ajK1tObp2Flgcg=" }, - "net/kyori#adventure-bom/4.24.0": { - "module": "sha256-ElMB4ouFj88PjnGC2uoUXQqOHXy/zPTEOXsjHUpQYkw=", - "pom": "sha256-1+utxlvrCvSg9UpTNWc7z/YwqRH1QKD0TH/38CxPOIU=" + "net/kyori#adventure-bom/4.25.0": { + "module": "sha256-ZXB+cllrTsIQtPlc51rMzGiTygCpTCxGutBZTRNMnac=", + "pom": "sha256-ehLL6JgsuuaSAmmusLzSwPb3JqMq4O5WpiHxpGINDxM=" }, - "net/kyori#adventure-key/4.24.0": { - "jar": "sha256-1PIfQoHonas0WpAEVnZoeUgZ+cxIPq/4v9ZMV0lKkVA=", - "module": "sha256-0gI7+Of0qK+PCK5DpIPMOk8261sVrG8l0Nh0HZa6EvA=", - "pom": "sha256-SIhAxvEcX0+ObfLgYWcusVi4dJNUGz5hipSKoRXZ0TE=" + "net/kyori#adventure-key/4.25.0": { + "jar": "sha256-zsjwq/ZC3w5ie/Wp//bxfLtiDqb+BfIWK5bK0VZNiFc=", + "module": "sha256-x3iPHqcXJE05SOzGhubp3Be62mnVmqN1ZtNtjHv72eo=", + "pom": "sha256-oD8SgnVBVxGKPVppORHZIzZdCDMaghHg3MEwvQgrWOY=" }, - "net/kyori#adventure-nbt/4.24.0": { - "jar": "sha256-j//4nbx/DB5MzfMzf5ASDpoPz/NsxGl9Hndp/0vVaFM=", - "module": "sha256-MP2lzkSXyclV00dsiIVysTvXKWsz3NDqy1V/mUvutvI=", - "pom": "sha256-nzBN7cX6Asa2avbR+8MpCYop3DlTLMHMQlp8dnezHXA=" + "net/kyori#adventure-nbt/4.25.0": { + "jar": "sha256-jubaYh9JbxbGGd5uxcC5wUDOrJuJwqWzN3k429VaFi4=", + "module": "sha256-Bb/MN2LBUR22GDlRju2vhWf524kFO/jTuHOU19R1nFU=", + "pom": "sha256-6sqxf2Nongrb9IHs3/bgPiOmRHC6XSGWb/BimmC0fj0=" }, "net/kyori#adventure-platform-api/4.3.4": { "jar": "sha256-7GBGKMK3wWXqdMH8s6LQ8DNZwsd6FJYOOgvC43lnCsI=", @@ -816,50 +816,50 @@ "module": "sha256-VYXzbUzK6MaYbW4tmAjZs5ywl28CLK8sANPP5v1HTQQ=", "pom": "sha256-wP6w6syf5B8iL5iXsS4lrDw0Ub3VYWwUhclppgBO2eE=" }, - "net/kyori#adventure-text-logger-slf4j/4.24.0": { - "jar": "sha256-IuMKbpKnDgpELrZMkGUkp3bzwwPiheGDzyt8Q1+QqBw=", - "module": "sha256-wqz29Ezc3OpasWJUoi5oR8ctmKUQW1ivXfWDh59oKws=", - "pom": "sha256-d0TIFm0AFD3jVhhoFrSERT0vxrS8uaDZQ0HyqIOknMw=" + "net/kyori#adventure-text-logger-slf4j/4.25.0": { + "jar": "sha256-ux6XEd+J/JTRJyzJfdytnBEISk3tBBqObJ72rioaFcw=", + "module": "sha256-fs6A5RPgpK1nv+LU6v361yzT1wrhdCZCUmxXoG7/SDY=", + "pom": "sha256-zBsHR4P9abfyqFUTcuMfDjR0+DlsWPFIKuoAgO+oObE=" }, - "net/kyori#adventure-text-minimessage/4.24.0": { - "jar": "sha256-en9E3Dt4N5uRj5Hc44v/JqCWO/4wOj/hbJHTClxeI+U=", - "module": "sha256-avCNo6rbj+hz4Q+qUVc1ybN6LWWCbLGJhzWm4ZeJPXY=", - "pom": "sha256-4BPr7EgImiEaIx5RluvxFNWw5lOBK94GO2RPX89ETqQ=" + "net/kyori#adventure-text-minimessage/4.25.0": { + "jar": "sha256-GY8nxvkeXjJxZAZQhp/v3WgW17MQtIz6UptfWOSpKaQ=", + "module": "sha256-dhPZ10ZYM1pj2mYRH2vf30w4dX/GIwR50N4fxT1bhRs=", + "pom": "sha256-cyzIAKcimO4b575KW9UWQBJhezWI0UF7UuQkbUdoly4=" }, - "net/kyori#adventure-text-serializer-ansi/4.24.0": { - "jar": "sha256-UVBc8RPZd0RNePNKC3FnwcbMl2A1TwbQi0W/evdr7B4=", - "module": "sha256-Qc860iafJsWIDQPY5ifYusvAWo5AW2TOOLgieLrrCEQ=", - "pom": "sha256-wUCpODx3U1wRy1kDQGLNQyW4/BSpIVQNymJnO2BQEB0=" + "net/kyori#adventure-text-serializer-ansi/4.25.0": { + "jar": "sha256-ocrnCOKiZdJbHto/4wLG1ibeX4O66PdmQTzb3661E+Y=", + "module": "sha256-h99JBH9Uv1QGhdHA57zzVukn4V0rHu8CkXt7om3NDoI=", + "pom": "sha256-9Cm5DCEnJB02hmpUq5bDUun5UXVoXklAsQNCs172+eU=" }, - "net/kyori#adventure-text-serializer-commons/4.24.0": { - "jar": "sha256-EBAgLHMSTT4Hid/auyd4pfuM+thybXCvm+tcV1nUzP0=", - "module": "sha256-ZluaH9IrMPGnKJGFuOk8zs7ZrWjdU1V5ObQHXdMJxx0=", - "pom": "sha256-ktKTr+2UmcMulX470ff9xFHVt59JBDDSJ1dL46VmEVo=" + "net/kyori#adventure-text-serializer-commons/4.25.0": { + "jar": "sha256-DMytf1Tbmh3cgWSygsG0xJwunHb2gsviyWVBYdya05U=", + "module": "sha256-3sAWk3vnQQ97iY58kB+jXQWDQTrRE7QOm7i/egSU8xs=", + "pom": "sha256-EiVWRe5+egaTN4jJvo7OFetflVHj4nQgUYbSVXvOhaY=" }, - "net/kyori#adventure-text-serializer-gson/4.24.0": { - "jar": "sha256-JBTDzl/+G34x3oaWjr0+nypQ41STmydliO0s1kxDGCE=", - "module": "sha256-LIxWNeQnjlirNfFCQD61u1+sBXiDYpB8VTpa9p8DNN0=", - "pom": "sha256-TUCD1oj9+/RoW6QHPZouJPlqCdImOd+mMTQ34V2Rejk=" + "net/kyori#adventure-text-serializer-gson/4.25.0": { + "jar": "sha256-kx9nlZ1G4P5Vtkq5Fk4xtXi3kjV4f2nUcrYoZfl7ckU=", + "module": "sha256-mShJEiK1WIC26DkBj8EFrpwiZNMgiQMjS7o9rtVgX0w=", + "pom": "sha256-iakLX3YZMvXNCptIL2Rut7TsF8dIlnv/k5i591juAyA=" }, - "net/kyori#adventure-text-serializer-json-legacy-impl/4.24.0": { - "jar": "sha256-HeO71Wx6B++HNNXQiYKNZUIDofwZiz78odK7asDDdsQ=", - "module": "sha256-5KAg8wQ2jA3hvhcEZv/DBdSfW0j9OdGbGcMQgiBHQpE=", - "pom": "sha256-TP64sxOpOubU71EEYqI/z+LO4idiPhJ/iDXHHC1wAB4=" + "net/kyori#adventure-text-serializer-json-legacy-impl/4.25.0": { + "jar": "sha256-OCfqC0HsbDc/kT2CTmAnYS5QFLlJf775jEsaFVmw/Ds=", + "module": "sha256-7DKxMynoAJk6SRpo1aFGBYtTGiU6mPqY7OTzQbvaT9M=", + "pom": "sha256-m+mk7xIrHn5rNeL8BjBmSV3uCvwPmqChHzvDBT54/2w=" }, - "net/kyori#adventure-text-serializer-json/4.24.0": { - "jar": "sha256-/2qANEy/FNanUZR8r525Zp3QdArqyMxVXJuGSP9XcbI=", - "module": "sha256-aqvU2ZfRWJl/Uf2Phue7b1+iKNcB+gkRAITn9d9OZ7k=", - "pom": "sha256-SxTq6y0vN6TfeA/1YgxLM2arJeexk7qYvkgLxz1XgxQ=" + "net/kyori#adventure-text-serializer-json/4.25.0": { + "jar": "sha256-SCtKohjXyHn89X5dD5zATbS01LVnnrmbcn9hBO1/uYI=", + "module": "sha256-guKd0oBJaMnF/pspbxDsUrpFT6AsKytFwSgUXqPXfAY=", + "pom": "sha256-p9M2cSIfPqHWpJry4f49Vw6OCEMPYt8VCHyTm9IjhZE=" }, - "net/kyori#adventure-text-serializer-legacy/4.24.0": { - "jar": "sha256-QO1Tr+Kn1mi4FK3WneFaz0vajp+VHE5dTiJNd3BUaF4=", - "module": "sha256-uwBv4g+J/qOEZM/dz/SCvDXAGhI5wt8DEP6NBgHNGU4=", - "pom": "sha256-WLFnVzl0ZXM+9deg6toSxPG1e+28BZqGv9+JgECwxjc=" + "net/kyori#adventure-text-serializer-legacy/4.25.0": { + "jar": "sha256-BvFSXr8X+080w08bUmKt5nJwXBFj9qSLaKTgMU36ahM=", + "module": "sha256-AVec+FDUBBQ3GCV9cym3/KODgXBEP8oWnowgPwMnMU4=", + "pom": "sha256-NXbSfnn4+yAZfpr0oo9b/YrI6BQJlnlMArI1rd37YxM=" }, - "net/kyori#adventure-text-serializer-plain/4.24.0": { - "jar": "sha256-flKpjlkNCI/we+H4sOdZhkcXRm/TXbGGL7tuu0GyRds=", - "module": "sha256-3ir7UDVDHLvHI6WgSBYGB99yHeiHLTgeG7mICCRocfg=", - "pom": "sha256-/pRYAmrIQoPR20OQFZd8wI2yGZ4j/zJqtyBFsgCjcrU=" + "net/kyori#adventure-text-serializer-plain/4.25.0": { + "jar": "sha256-lFN1egpsDdnktfzSVOgqfqhn9MvkA3cWf0QMQexgUu4=", + "module": "sha256-mVude/RMSiHELTPFr3eK9X7rJH40fRUy5HtwmsVBsfg=", + "pom": "sha256-FaJA8MaaBORkMop+Wa+LK28hhWL63+2fIFa7t+G1gR4=" }, "net/kyori#ansi/1.1.1": { "jar": "sha256-tsVp4aCSW57rNJ4S2zXiI3VWEH4zNmV+Cy694mHYr9c=", @@ -1160,10 +1160,10 @@ "module": "sha256-x/njSbNN+LIRRw4imGJEnDzBPLweeMebKXo3Ryey5gU=", "pom": "sha256-kEBuKDkHRCqz88ZftqO25RdILNb4Ywgep70sggENrFc=" }, - "org/jetbrains#annotations/26.0.2": { + "org/jetbrains#annotations/26.0.2-1": { "jar": "sha256-IDe+N4mA07qTM+l5VfOyzeOSqhJNBMpzzi7uZlcZkpc=", - "module": "sha256-vvC4NSst/Uy3FV7MKjkie/FqPghme6vsZQx2sau/zss=", - "pom": "sha256-fr7Oreja2nyxfv8+AUkiw5Ai0qN44+LSRh8o8Bb/x/c=" + "module": "sha256-n+hq62S4YyPo5XlQOxGgOKFAaUwTtoBDQ/ik3Jo6RrE=", + "pom": "sha256-mn4e3huQFzBSwebtck+w8OvMiP9oLQI/DJs0PhN3p/8=" }, "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", diff --git a/pkgs/by-name/ve/velocity/package.nix b/pkgs/by-name/ve/velocity/package.nix index 1552a26a1d9a..f75c40a88885 100644 --- a/pkgs/by-name/ve/velocity/package.nix +++ b/pkgs/by-name/ve/velocity/package.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "velocity"; - version = "3.4.0-unstable-2025-09-29"; + version = "3.4.0-unstable-2025-10-11"; src = fetchFromGitHub { owner = "PaperMC"; repo = "Velocity"; - rev = "c8c27af7c3da99987e4f5be18ffe5830eaf98538"; - hash = "sha256-zotVbXvuMDDykkWSkXrIV+2UgUhhwX6KeF+zMRBeb8E="; + rev = "806b386cdb8da23051a9679682ed6a76370b9818"; + hash = "sha256-2Wy9mnIvGab/vgH6fVK+HJcpOUwPMkgncXOGcZPnDhg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 9446a4254825..74906ea972a5 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-H8XaO1HKN8L4yKuLd75mMIBm1TWe1guJPOkmg62YLKo=", - "version": "0.2025.10.01.08.12.stable_02" + "hash": "sha256-faZ4/CdCxxpx2mVtLvMvzlcdokk/bkaGgLynQnqiBBI=", + "version": "0.2025.10.08.08.12.stable_03" }, "linux_x86_64": { - "hash": "sha256-19QnAg/ZQuPTEzkCaPb9FdBDnZ3tC06ppfoxr+O4q58=", - "version": "0.2025.10.01.08.12.stable_02" + "hash": "sha256-PfHWgzQYbz+JX+5DNkyjnfzycZZFZtW1plWYtcFiIks=", + "version": "0.2025.10.08.08.12.stable_03" }, "linux_aarch64": { - "hash": "sha256-aw+8SVk6Vp9vFKuf5YRZ4Y0mAn69oXhLffzztRAc9XM=", - "version": "0.2025.10.01.08.12.stable_02" + "hash": "sha256-OfI+sm7/wpFSEoRSGr4XLO1WhY7nXoN1oLDJHNE7cws=", + "version": "0.2025.10.08.08.12.stable_03" } } diff --git a/pkgs/by-name/wo/worker-build/package.nix b/pkgs/by-name/wo/worker-build/package.nix index b0e433533ec2..e4ddce998e36 100644 --- a/pkgs/by-name/wo/worker-build/package.nix +++ b/pkgs/by-name/wo/worker-build/package.nix @@ -6,16 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "worker-build"; - version = "0.6.1"; + version = "0.6.6"; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-rs"; tag = "v${version}"; - hash = "sha256-eP54+M6eXp251QHF9YX5f19yL7gC+zsZfbphac363Wo="; + hash = "sha256-Ia921UNb++9Y1NoEd7nNdJaEEqRxQLAzZ8yYaxPrWYc="; + fetchSubmodules = true; }; - cargoHash = "sha256-1KVpcghdGG6gcDz5rvydYLXXh/5Yiq1Z2Rtbc66DWrM="; + cargoHash = "sha256-sIxsGeORhWpL3lWzXas7fK4QVuB03UT7rAN8uEzOdr0="; buildAndTestSubdir = "worker-build"; diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix index 327f2b5855d8..22708d27ec80 100644 --- a/pkgs/development/python-modules/coiled/default.nix +++ b/pkgs/development/python-modules/coiled/default.nix @@ -39,12 +39,12 @@ buildPythonPackage rec { pname = "coiled"; - version = "1.124.0"; + version = "1.126.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-g+LN+QMjsIO7aSSyM1+rX0M2md1c8t8xxxkRfVTjvt4="; + hash = "sha256-iS6PSxh2yV8QYsKqnxH0cWNkW/U7cxXFI48fWs/1fjU="; }; build-system = [ diff --git a/pkgs/development/python-modules/paddlepaddle/default.nix b/pkgs/development/python-modules/paddlepaddle/default.nix index f807bf7aca52..a4f5d7b09515 100644 --- a/pkgs/development/python-modules/paddlepaddle/default.nix +++ b/pkgs/development/python-modules/paddlepaddle/default.nix @@ -123,5 +123,6 @@ buildPythonPackage { "x86_64-darwin" "aarch64-darwin" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/development/python-modules/slapd/default.nix b/pkgs/development/python-modules/slapd/default.nix index 789ecbb24e58..f8793338bb9d 100644 --- a/pkgs/development/python-modules/slapd/default.nix +++ b/pkgs/development/python-modules/slapd/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - poetry-core, + hatchling, openldap, pytestCheckHook, }: @@ -23,7 +23,7 @@ buildPythonPackage rec { hash = "sha256-xXIKC8xDJ3Q6yV1BL5Io0PkLqVbFRbbkB0QSXQGHMNg="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix b/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix index 25bf18f46f4e..4119266bff5b 100644 --- a/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix +++ b/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "BottlecapDave"; domain = "octopus_energy"; - version = "16.3.1"; + version = "17.0.0"; src = fetchFromGitHub { inherit owner; repo = "HomeAssistant-OctopusEnergy"; tag = "v${version}"; - hash = "sha256-rn8wCGUYisLgr61Cd2qaQGfSiAtjKMo2wG/AotEXknE="; + hash = "sha256-6+uDv3tLm5Lcq0D2rYwEH9ggvAK6y0O+l5IRHafHsyQ="; }; dependencies = [ pydantic ]; diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 788089601e5e..d43385cc5e8d 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -8,13 +8,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "plpgsql-check"; - version = "2.8.2"; + version = "2.8.3"; src = fetchFromGitHub { owner = "okbob"; repo = "plpgsql_check"; tag = "v${finalAttrs.version}"; - hash = "sha256-NjqnXbQ+wyKVFFdffOQpxrCWT9vrzgh8lk2G3L9i6G8="; + hash = "sha256-eGD6DwXx6hUd0hngjbaSZOb2gDYEk820R8YuZDs6UUw="; }; passthru.tests.extension = postgresqlTestExtension {