Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot] 2025-10-12 12:07:06 +00:00 committed by GitHub
commit 6ff2233f5e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 286 additions and 107 deletions

View file

@ -606,6 +606,19 @@ final: prev: {
meta.hydraPlatforms = [ ]; 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 { ack-vim = buildVimPlugin {
pname = "ack.vim"; pname = "ack.vim";
version = "2018-02-27"; version = "2018-02-27";

View file

@ -45,6 +45,7 @@ https://github.com/svban/YankAssassin.vim/,HEAD,
https://github.com/vim-scripts/YankRing.vim/,, https://github.com/vim-scripts/YankRing.vim/,,
https://github.com/ycm-core/YouCompleteMe/,, https://github.com/ycm-core/YouCompleteMe/,,
https://github.com/vim-scripts/a.vim/,, https://github.com/vim-scripts/a.vim/,,
https://github.com/Alligator/accent.vim/,HEAD,
https://github.com/mileszs/ack.vim/,, https://github.com/mileszs/ack.vim/,,
https://github.com/eikenb/acp/,, https://github.com/eikenb/acp/,,
https://github.com/aznhe21/actions-preview.nvim/,, https://github.com/aznhe21/actions-preview.nvim/,,

View file

@ -624,13 +624,13 @@
"vendorHash": null "vendorHash": null
}, },
"ibm": { "ibm": {
"hash": "sha256-gHHJiFLVmgx+689hzGVRQZB2wcATJ41bqpcWFDV7HyI=", "hash": "sha256-+Ux/Xp598uRpRgBfVucrl8GYkpaKcmZ5h67ExdBEchY=",
"homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
"owner": "IBM-Cloud", "owner": "IBM-Cloud",
"repo": "terraform-provider-ibm", "repo": "terraform-provider-ibm",
"rev": "v1.83.1", "rev": "v1.83.3",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": "sha256-UL+1OcRKvyyCNL7czv+Zc/arkX3gy+AoqxlgZpmINhE=" "vendorHash": "sha256-G6kqcQMpNKioBEWNDGIYCJaoYv6EPAbu2Nh/8EkQGAA="
}, },
"icinga2": { "icinga2": {
"hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
@ -894,11 +894,11 @@
"vendorHash": "sha256-ByB1ztK2/1pTFeO34eXVyQSSbe35qqoCeWe6MPZN7vY=" "vendorHash": "sha256-ByB1ztK2/1pTFeO34eXVyQSSbe35qqoCeWe6MPZN7vY="
}, },
"oci": { "oci": {
"hash": "sha256-fEvo5R7HutlOmZ6DMvYKQiE0amwk/YPi1T2a55w70hQ=", "hash": "sha256-LnR1bXTr+j7tKALZll/dwUI+o9TepPGS0mAHGxYK7g0=",
"homepage": "https://registry.terraform.io/providers/oracle/oci", "homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle", "owner": "oracle",
"repo": "terraform-provider-oci", "repo": "terraform-provider-oci",
"rev": "v7.21.0", "rev": "v7.22.0",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": null "vendorHash": null
}, },
@ -1128,13 +1128,13 @@
"vendorHash": "sha256-at8i4gCFrJxE9fVIL5uI7iSFex0gLXu1SnlPKlZAmrY=" "vendorHash": "sha256-at8i4gCFrJxE9fVIL5uI7iSFex0gLXu1SnlPKlZAmrY="
}, },
"scaleway": { "scaleway": {
"hash": "sha256-KEQT0PScUTtTVgsinC9kZlNwAuSCHKXtswM6qDwApTo=", "hash": "sha256-FT9V0qAs6NSULqOMsW9uolc1WgueUnU4vfL4rntMA1A=",
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
"owner": "scaleway", "owner": "scaleway",
"repo": "terraform-provider-scaleway", "repo": "terraform-provider-scaleway",
"rev": "v2.60.3", "rev": "v2.60.4",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": "sha256-rcidk22c7Pk3k8ZhJyBXo1y2KYRu1yzBVCVGA3GcGKM=" "vendorHash": "sha256-OcKCtH4ciGrKwidTQC+yTWMyMfShJMsTnsKOyBxwLDg="
}, },
"secret": { "secret": {
"hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
@ -1146,13 +1146,13 @@
"vendorHash": null "vendorHash": null
}, },
"selectel": { "selectel": {
"hash": "sha256-4tU/S+YSOkQJSh1p/Fjx00i7RJYFv3OuicDvjTOGGPk=", "hash": "sha256-J0hz5qtT3bBKqoZ9SkZn0oxix1fIQRmwv7feME7CljM=",
"homepage": "https://registry.terraform.io/providers/selectel/selectel", "homepage": "https://registry.terraform.io/providers/selectel/selectel",
"owner": "selectel", "owner": "selectel",
"repo": "terraform-provider-selectel", "repo": "terraform-provider-selectel",
"rev": "v6.6.0", "rev": "v6.8.0",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": "sha256-uMZIze8sng80sCb6f9CsWHVMmUGMaaOD4Ezx9B2fAJ4=" "vendorHash": "sha256-TQXj2Em665zhCqXiT2BG1xxvVCo0/G2SaQKUbqGwcQM="
}, },
"sentry": { "sentry": {
"hash": "sha256-b5a0++mu6roN6VuJaBZEczfqA6Stt+a7fTOLGLvqPeQ=", "hash": "sha256-b5a0++mu6roN6VuJaBZEczfqA6Stt+a7fTOLGLvqPeQ=",

View file

@ -6,11 +6,11 @@
}: }:
let let
pname = "chatbox"; pname = "chatbox";
version = "1.16.3"; version = "1.16.4";
src = fetchurl { src = fetchurl {
url = "https://download.chatboxai.app/releases/Chatbox-${version}-x86_64.AppImage"; 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; }; appimageContents = appimageTools.extract { inherit pname version src; };

View file

@ -2,11 +2,12 @@
lib, lib,
stdenv, stdenv,
fetchFromGitLab, fetchFromGitLab,
libsForQt5,
openrgb, openrgb,
glib, glib,
openal, openal,
pkg-config, pkg-config,
kdePackages,
fetchpatch,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -21,20 +22,30 @@ stdenv.mkDerivation (finalAttrs: {
fetchSubmodules = true; 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 = '' postPatch = ''
# Use the source of openrgb from nixpkgs instead of the submodule # Use the source of openrgb from nixpkgs instead of the submodule
rm -r OpenRGB rm -r OpenRGB
ln -s ${openrgb.src} OpenRGB ln -s ${openrgb.src} OpenRGB
''; '';
nativeBuildInputs = with libsForQt5; [ nativeBuildInputs = [
qmake
pkg-config pkg-config
wrapQtAppsHook kdePackages.wrapQtAppsHook
kdePackages.qmake
]; ];
buildInputs = with libsForQt5; [ buildInputs = [
qtbase kdePackages.qtbase
kdePackages.qt5compat
glib glib
openal openal
]; ];

View file

@ -0,0 +1,114 @@
Commit ID: 20f227f4ef942e2ead5a3a684248c2da48c979bc
Change ID: rwlwzspvylkypuqoornwzvuvpuzorvso
Author : Alexey Sokolov <alexey+github@asokolov.org> (2025-07-21 22:34:37)
Committer: Marie Ramlow <me@nycode.dev> (2025-10-12 12:05:01)
Fix build with Qt6 using core5compat
Updated to add Qt5 backwards compatibility by Adam Honse <calcprogrammer1@gmail.com>
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 <math.h>
-#include <QDesktopWidget>
#include <QBrush>
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 <QSyntaxHighlighter>
+#include <QRegExp>
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 <QRegExp>
-#include <QRegExpValidator>
+#include <QRegularExpression>
+#include <QRegularExpressionValidator>
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<std::string> filenames = OpenRGBEffectSettings::ListProfiles();

View file

@ -2,12 +2,13 @@
lib, lib,
stdenv, stdenv,
fetchFromGitLab, fetchFromGitLab,
libsForQt5,
openrgb, openrgb,
glib, glib,
libgtop, libgtop,
lm_sensors, lm_sensors,
pkg-config, pkg-config,
kdePackages,
fetchpatch,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -21,6 +22,14 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-3sQFiqmXhuavce/6v3XBpp6PAduY7t440nXfbfCX9a0="; 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 = '' postPatch = ''
# Use the source of openrgb from nixpkgs instead of the submodule # Use the source of openrgb from nixpkgs instead of the submodule
rmdir OpenRGB rmdir OpenRGB
@ -29,17 +38,17 @@ stdenv.mkDerivation (finalAttrs: {
rm -r dependencies/lhwm-cpp-wrapper rm -r dependencies/lhwm-cpp-wrapper
''; '';
buildInputs = with libsForQt5; [ buildInputs = [
qtbase kdePackages.qtbase
glib glib
libgtop libgtop
lm_sensors lm_sensors
]; ];
nativeBuildInputs = with libsForQt5; [ nativeBuildInputs = [
qmake
pkg-config pkg-config
wrapQtAppsHook kdePackages.qmake
kdePackages.wrapQtAppsHook
]; ];
meta = with lib; { meta = with lib; {

View file

@ -2,13 +2,13 @@
lib, lib,
stdenv, stdenv,
fetchFromGitLab, fetchFromGitLab,
libsForQt5,
libusb1, libusb1,
hidapi, hidapi,
pkg-config, pkg-config,
coreutils, coreutils,
mbedtls_2, mbedtls,
symlinkJoin, symlinkJoin,
kdePackages,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -22,21 +22,24 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-XBLj4EfupyeVHRc0pVI7hrXFoCNJ7ak2yO0QSfhBsGU="; hash = "sha256-XBLj4EfupyeVHRc0pVI7hrXFoCNJ7ak2yO0QSfhBsGU=";
}; };
patches = [
./qlist-include.patch
];
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
] ]
++ (with libsForQt5; [ ++ (with kdePackages; [
qmake qmake
wrapQtAppsHook wrapQtAppsHook
]); ]);
buildInputs = [ buildInputs = [
libusb1 libusb1
hidapi hidapi
mbedtls_2 mbedtls
] ]
++ (with libsForQt5; [ ++ (with kdePackages; [
qtbase qtbase
qttools qttools
qtwayland qtwayland
@ -57,6 +60,10 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstallCheck runHook postInstallCheck
''; '';
qmakeFlags = [
"QT_TOOL.lrelease.binary=${lib.getDev kdePackages.qttools}/bin/lrelease"
];
passthru.withPlugins = passthru.withPlugins =
plugins: plugins:
let let

View file

@ -0,0 +1,16 @@
Commit ID: 2fa7aa0ec87d9878293033db0e86bb62cddc47df
Change ID: mvrytuwvnokxyvmuworxptmtqpqpppxq
Author : Marie Ramlow <me@nycode.dev> (2025-10-11 12:10:21)
Committer: Marie Ramlow <me@nycode.dev> (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 <QStringList>
#include "OpenRGBFont.h"
#include <QFontDatabase>

View file

@ -21,6 +21,12 @@ stdenv.mkDerivation rec {
hash = "sha256-LbRhsW2MiTYWSH6X9Pz9XdJdH9Na0QCO8CFmlzZmDjQ="; 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 = [ nativeBuildInputs = [
pkg-config pkg-config
meson meson

View file

@ -46,11 +46,11 @@ in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "tor"; pname = "tor";
version = "0.4.8.18"; version = "0.4.8.19";
src = fetchurl { src = fetchurl {
url = "https://dist.torproject.org/tor-${finalAttrs.version}.tar.gz"; url = "https://dist.torproject.org/tor-${finalAttrs.version}.tar.gz";
hash = "sha256-SupsEJ1O/06iuvuQWn5rCpZdFP6FYhSwL82QRrTZOvg="; hash = "sha256-PLZJodM7pqZfEJ0iRTTpOq8KbehKWxy0sFS/oGu3T1o=";
}; };
outputs = [ outputs = [

View file

@ -787,24 +787,24 @@
"jar": "sha256-Yq4oGH7SsGKBPaap1We/7nM8NBWCaZti3ZgCMHKaAxM=", "jar": "sha256-Yq4oGH7SsGKBPaap1We/7nM8NBWCaZti3ZgCMHKaAxM=",
"pom": "sha256-NYRJ1sc1OFhFCN2K5s/eVrr0o0t2e3HZzEZE8PH0IRo=" "pom": "sha256-NYRJ1sc1OFhFCN2K5s/eVrr0o0t2e3HZzEZE8PH0IRo="
}, },
"net/kyori#adventure-api/4.24.0": { "net/kyori#adventure-api/4.25.0": {
"jar": "sha256-2MHWbbD7rwhOgXmz8lQdn/ZEAqeIEHCnHos8JsJtOE4=", "jar": "sha256-jigb8TV/+Rr5eDpsJCdrSD2BVKezyrWwTpCea/XnLJ0=",
"module": "sha256-c06XRjLjZiH+7Ze3ThrLSXl+pzw3EUR8p+LGBLmLEFU=", "module": "sha256-BjX3/6StwHdpvwspz563yZXxKZujomtzPCTdf3Oor5M=",
"pom": "sha256-eG4PXAYZB2RwjAVpqFTsfjHG/gcZO0Rfg4l1Uorbt30=" "pom": "sha256-b3Z3Bs6f0+j5f8LKtz2lWlr+f10Z1ajK1tObp2Flgcg="
}, },
"net/kyori#adventure-bom/4.24.0": { "net/kyori#adventure-bom/4.25.0": {
"module": "sha256-ElMB4ouFj88PjnGC2uoUXQqOHXy/zPTEOXsjHUpQYkw=", "module": "sha256-ZXB+cllrTsIQtPlc51rMzGiTygCpTCxGutBZTRNMnac=",
"pom": "sha256-1+utxlvrCvSg9UpTNWc7z/YwqRH1QKD0TH/38CxPOIU=" "pom": "sha256-ehLL6JgsuuaSAmmusLzSwPb3JqMq4O5WpiHxpGINDxM="
}, },
"net/kyori#adventure-key/4.24.0": { "net/kyori#adventure-key/4.25.0": {
"jar": "sha256-1PIfQoHonas0WpAEVnZoeUgZ+cxIPq/4v9ZMV0lKkVA=", "jar": "sha256-zsjwq/ZC3w5ie/Wp//bxfLtiDqb+BfIWK5bK0VZNiFc=",
"module": "sha256-0gI7+Of0qK+PCK5DpIPMOk8261sVrG8l0Nh0HZa6EvA=", "module": "sha256-x3iPHqcXJE05SOzGhubp3Be62mnVmqN1ZtNtjHv72eo=",
"pom": "sha256-SIhAxvEcX0+ObfLgYWcusVi4dJNUGz5hipSKoRXZ0TE=" "pom": "sha256-oD8SgnVBVxGKPVppORHZIzZdCDMaghHg3MEwvQgrWOY="
}, },
"net/kyori#adventure-nbt/4.24.0": { "net/kyori#adventure-nbt/4.25.0": {
"jar": "sha256-j//4nbx/DB5MzfMzf5ASDpoPz/NsxGl9Hndp/0vVaFM=", "jar": "sha256-jubaYh9JbxbGGd5uxcC5wUDOrJuJwqWzN3k429VaFi4=",
"module": "sha256-MP2lzkSXyclV00dsiIVysTvXKWsz3NDqy1V/mUvutvI=", "module": "sha256-Bb/MN2LBUR22GDlRju2vhWf524kFO/jTuHOU19R1nFU=",
"pom": "sha256-nzBN7cX6Asa2avbR+8MpCYop3DlTLMHMQlp8dnezHXA=" "pom": "sha256-6sqxf2Nongrb9IHs3/bgPiOmRHC6XSGWb/BimmC0fj0="
}, },
"net/kyori#adventure-platform-api/4.3.4": { "net/kyori#adventure-platform-api/4.3.4": {
"jar": "sha256-7GBGKMK3wWXqdMH8s6LQ8DNZwsd6FJYOOgvC43lnCsI=", "jar": "sha256-7GBGKMK3wWXqdMH8s6LQ8DNZwsd6FJYOOgvC43lnCsI=",
@ -816,50 +816,50 @@
"module": "sha256-VYXzbUzK6MaYbW4tmAjZs5ywl28CLK8sANPP5v1HTQQ=", "module": "sha256-VYXzbUzK6MaYbW4tmAjZs5ywl28CLK8sANPP5v1HTQQ=",
"pom": "sha256-wP6w6syf5B8iL5iXsS4lrDw0Ub3VYWwUhclppgBO2eE=" "pom": "sha256-wP6w6syf5B8iL5iXsS4lrDw0Ub3VYWwUhclppgBO2eE="
}, },
"net/kyori#adventure-text-logger-slf4j/4.24.0": { "net/kyori#adventure-text-logger-slf4j/4.25.0": {
"jar": "sha256-IuMKbpKnDgpELrZMkGUkp3bzwwPiheGDzyt8Q1+QqBw=", "jar": "sha256-ux6XEd+J/JTRJyzJfdytnBEISk3tBBqObJ72rioaFcw=",
"module": "sha256-wqz29Ezc3OpasWJUoi5oR8ctmKUQW1ivXfWDh59oKws=", "module": "sha256-fs6A5RPgpK1nv+LU6v361yzT1wrhdCZCUmxXoG7/SDY=",
"pom": "sha256-d0TIFm0AFD3jVhhoFrSERT0vxrS8uaDZQ0HyqIOknMw=" "pom": "sha256-zBsHR4P9abfyqFUTcuMfDjR0+DlsWPFIKuoAgO+oObE="
}, },
"net/kyori#adventure-text-minimessage/4.24.0": { "net/kyori#adventure-text-minimessage/4.25.0": {
"jar": "sha256-en9E3Dt4N5uRj5Hc44v/JqCWO/4wOj/hbJHTClxeI+U=", "jar": "sha256-GY8nxvkeXjJxZAZQhp/v3WgW17MQtIz6UptfWOSpKaQ=",
"module": "sha256-avCNo6rbj+hz4Q+qUVc1ybN6LWWCbLGJhzWm4ZeJPXY=", "module": "sha256-dhPZ10ZYM1pj2mYRH2vf30w4dX/GIwR50N4fxT1bhRs=",
"pom": "sha256-4BPr7EgImiEaIx5RluvxFNWw5lOBK94GO2RPX89ETqQ=" "pom": "sha256-cyzIAKcimO4b575KW9UWQBJhezWI0UF7UuQkbUdoly4="
}, },
"net/kyori#adventure-text-serializer-ansi/4.24.0": { "net/kyori#adventure-text-serializer-ansi/4.25.0": {
"jar": "sha256-UVBc8RPZd0RNePNKC3FnwcbMl2A1TwbQi0W/evdr7B4=", "jar": "sha256-ocrnCOKiZdJbHto/4wLG1ibeX4O66PdmQTzb3661E+Y=",
"module": "sha256-Qc860iafJsWIDQPY5ifYusvAWo5AW2TOOLgieLrrCEQ=", "module": "sha256-h99JBH9Uv1QGhdHA57zzVukn4V0rHu8CkXt7om3NDoI=",
"pom": "sha256-wUCpODx3U1wRy1kDQGLNQyW4/BSpIVQNymJnO2BQEB0=" "pom": "sha256-9Cm5DCEnJB02hmpUq5bDUun5UXVoXklAsQNCs172+eU="
}, },
"net/kyori#adventure-text-serializer-commons/4.24.0": { "net/kyori#adventure-text-serializer-commons/4.25.0": {
"jar": "sha256-EBAgLHMSTT4Hid/auyd4pfuM+thybXCvm+tcV1nUzP0=", "jar": "sha256-DMytf1Tbmh3cgWSygsG0xJwunHb2gsviyWVBYdya05U=",
"module": "sha256-ZluaH9IrMPGnKJGFuOk8zs7ZrWjdU1V5ObQHXdMJxx0=", "module": "sha256-3sAWk3vnQQ97iY58kB+jXQWDQTrRE7QOm7i/egSU8xs=",
"pom": "sha256-ktKTr+2UmcMulX470ff9xFHVt59JBDDSJ1dL46VmEVo=" "pom": "sha256-EiVWRe5+egaTN4jJvo7OFetflVHj4nQgUYbSVXvOhaY="
}, },
"net/kyori#adventure-text-serializer-gson/4.24.0": { "net/kyori#adventure-text-serializer-gson/4.25.0": {
"jar": "sha256-JBTDzl/+G34x3oaWjr0+nypQ41STmydliO0s1kxDGCE=", "jar": "sha256-kx9nlZ1G4P5Vtkq5Fk4xtXi3kjV4f2nUcrYoZfl7ckU=",
"module": "sha256-LIxWNeQnjlirNfFCQD61u1+sBXiDYpB8VTpa9p8DNN0=", "module": "sha256-mShJEiK1WIC26DkBj8EFrpwiZNMgiQMjS7o9rtVgX0w=",
"pom": "sha256-TUCD1oj9+/RoW6QHPZouJPlqCdImOd+mMTQ34V2Rejk=" "pom": "sha256-iakLX3YZMvXNCptIL2Rut7TsF8dIlnv/k5i591juAyA="
}, },
"net/kyori#adventure-text-serializer-json-legacy-impl/4.24.0": { "net/kyori#adventure-text-serializer-json-legacy-impl/4.25.0": {
"jar": "sha256-HeO71Wx6B++HNNXQiYKNZUIDofwZiz78odK7asDDdsQ=", "jar": "sha256-OCfqC0HsbDc/kT2CTmAnYS5QFLlJf775jEsaFVmw/Ds=",
"module": "sha256-5KAg8wQ2jA3hvhcEZv/DBdSfW0j9OdGbGcMQgiBHQpE=", "module": "sha256-7DKxMynoAJk6SRpo1aFGBYtTGiU6mPqY7OTzQbvaT9M=",
"pom": "sha256-TP64sxOpOubU71EEYqI/z+LO4idiPhJ/iDXHHC1wAB4=" "pom": "sha256-m+mk7xIrHn5rNeL8BjBmSV3uCvwPmqChHzvDBT54/2w="
}, },
"net/kyori#adventure-text-serializer-json/4.24.0": { "net/kyori#adventure-text-serializer-json/4.25.0": {
"jar": "sha256-/2qANEy/FNanUZR8r525Zp3QdArqyMxVXJuGSP9XcbI=", "jar": "sha256-SCtKohjXyHn89X5dD5zATbS01LVnnrmbcn9hBO1/uYI=",
"module": "sha256-aqvU2ZfRWJl/Uf2Phue7b1+iKNcB+gkRAITn9d9OZ7k=", "module": "sha256-guKd0oBJaMnF/pspbxDsUrpFT6AsKytFwSgUXqPXfAY=",
"pom": "sha256-SxTq6y0vN6TfeA/1YgxLM2arJeexk7qYvkgLxz1XgxQ=" "pom": "sha256-p9M2cSIfPqHWpJry4f49Vw6OCEMPYt8VCHyTm9IjhZE="
}, },
"net/kyori#adventure-text-serializer-legacy/4.24.0": { "net/kyori#adventure-text-serializer-legacy/4.25.0": {
"jar": "sha256-QO1Tr+Kn1mi4FK3WneFaz0vajp+VHE5dTiJNd3BUaF4=", "jar": "sha256-BvFSXr8X+080w08bUmKt5nJwXBFj9qSLaKTgMU36ahM=",
"module": "sha256-uwBv4g+J/qOEZM/dz/SCvDXAGhI5wt8DEP6NBgHNGU4=", "module": "sha256-AVec+FDUBBQ3GCV9cym3/KODgXBEP8oWnowgPwMnMU4=",
"pom": "sha256-WLFnVzl0ZXM+9deg6toSxPG1e+28BZqGv9+JgECwxjc=" "pom": "sha256-NXbSfnn4+yAZfpr0oo9b/YrI6BQJlnlMArI1rd37YxM="
}, },
"net/kyori#adventure-text-serializer-plain/4.24.0": { "net/kyori#adventure-text-serializer-plain/4.25.0": {
"jar": "sha256-flKpjlkNCI/we+H4sOdZhkcXRm/TXbGGL7tuu0GyRds=", "jar": "sha256-lFN1egpsDdnktfzSVOgqfqhn9MvkA3cWf0QMQexgUu4=",
"module": "sha256-3ir7UDVDHLvHI6WgSBYGB99yHeiHLTgeG7mICCRocfg=", "module": "sha256-mVude/RMSiHELTPFr3eK9X7rJH40fRUy5HtwmsVBsfg=",
"pom": "sha256-/pRYAmrIQoPR20OQFZd8wI2yGZ4j/zJqtyBFsgCjcrU=" "pom": "sha256-FaJA8MaaBORkMop+Wa+LK28hhWL63+2fIFa7t+G1gR4="
}, },
"net/kyori#ansi/1.1.1": { "net/kyori#ansi/1.1.1": {
"jar": "sha256-tsVp4aCSW57rNJ4S2zXiI3VWEH4zNmV+Cy694mHYr9c=", "jar": "sha256-tsVp4aCSW57rNJ4S2zXiI3VWEH4zNmV+Cy694mHYr9c=",
@ -1160,10 +1160,10 @@
"module": "sha256-x/njSbNN+LIRRw4imGJEnDzBPLweeMebKXo3Ryey5gU=", "module": "sha256-x/njSbNN+LIRRw4imGJEnDzBPLweeMebKXo3Ryey5gU=",
"pom": "sha256-kEBuKDkHRCqz88ZftqO25RdILNb4Ywgep70sggENrFc=" "pom": "sha256-kEBuKDkHRCqz88ZftqO25RdILNb4Ywgep70sggENrFc="
}, },
"org/jetbrains#annotations/26.0.2": { "org/jetbrains#annotations/26.0.2-1": {
"jar": "sha256-IDe+N4mA07qTM+l5VfOyzeOSqhJNBMpzzi7uZlcZkpc=", "jar": "sha256-IDe+N4mA07qTM+l5VfOyzeOSqhJNBMpzzi7uZlcZkpc=",
"module": "sha256-vvC4NSst/Uy3FV7MKjkie/FqPghme6vsZQx2sau/zss=", "module": "sha256-n+hq62S4YyPo5XlQOxGgOKFAaUwTtoBDQ/ik3Jo6RrE=",
"pom": "sha256-fr7Oreja2nyxfv8+AUkiw5Ai0qN44+LSRh8o8Bb/x/c=" "pom": "sha256-mn4e3huQFzBSwebtck+w8OvMiP9oLQI/DJs0PhN3p/8="
}, },
"org/jetbrains/intellij/deps#trove4j/1.0.20200330": { "org/jetbrains/intellij/deps#trove4j/1.0.20200330": {
"jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=",

View file

@ -35,13 +35,13 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "velocity"; pname = "velocity";
version = "3.4.0-unstable-2025-09-29"; version = "3.4.0-unstable-2025-10-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PaperMC"; owner = "PaperMC";
repo = "Velocity"; repo = "Velocity";
rev = "c8c27af7c3da99987e4f5be18ffe5830eaf98538"; rev = "806b386cdb8da23051a9679682ed6a76370b9818";
hash = "sha256-zotVbXvuMDDykkWSkXrIV+2UgUhhwX6KeF+zMRBeb8E="; hash = "sha256-2Wy9mnIvGab/vgH6fVK+HJcpOUwPMkgncXOGcZPnDhg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -1,14 +1,14 @@
{ {
"darwin": { "darwin": {
"hash": "sha256-H8XaO1HKN8L4yKuLd75mMIBm1TWe1guJPOkmg62YLKo=", "hash": "sha256-faZ4/CdCxxpx2mVtLvMvzlcdokk/bkaGgLynQnqiBBI=",
"version": "0.2025.10.01.08.12.stable_02" "version": "0.2025.10.08.08.12.stable_03"
}, },
"linux_x86_64": { "linux_x86_64": {
"hash": "sha256-19QnAg/ZQuPTEzkCaPb9FdBDnZ3tC06ppfoxr+O4q58=", "hash": "sha256-PfHWgzQYbz+JX+5DNkyjnfzycZZFZtW1plWYtcFiIks=",
"version": "0.2025.10.01.08.12.stable_02" "version": "0.2025.10.08.08.12.stable_03"
}, },
"linux_aarch64": { "linux_aarch64": {
"hash": "sha256-aw+8SVk6Vp9vFKuf5YRZ4Y0mAn69oXhLffzztRAc9XM=", "hash": "sha256-OfI+sm7/wpFSEoRSGr4XLO1WhY7nXoN1oLDJHNE7cws=",
"version": "0.2025.10.01.08.12.stable_02" "version": "0.2025.10.08.08.12.stable_03"
} }
} }

View file

@ -6,16 +6,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "worker-build"; pname = "worker-build";
version = "0.6.1"; version = "0.6.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cloudflare"; owner = "cloudflare";
repo = "workers-rs"; repo = "workers-rs";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-eP54+M6eXp251QHF9YX5f19yL7gC+zsZfbphac363Wo="; hash = "sha256-Ia921UNb++9Y1NoEd7nNdJaEEqRxQLAzZ8yYaxPrWYc=";
fetchSubmodules = true;
}; };
cargoHash = "sha256-1KVpcghdGG6gcDz5rvydYLXXh/5Yiq1Z2Rtbc66DWrM="; cargoHash = "sha256-sIxsGeORhWpL3lWzXas7fK4QVuB03UT7rAN8uEzOdr0=";
buildAndTestSubdir = "worker-build"; buildAndTestSubdir = "worker-build";

View file

@ -39,12 +39,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "coiled"; pname = "coiled";
version = "1.124.0"; version = "1.126.0";
pyproject = true; pyproject = true;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-g+LN+QMjsIO7aSSyM1+rX0M2md1c8t8xxxkRfVTjvt4="; hash = "sha256-iS6PSxh2yV8QYsKqnxH0cWNkW/U7cxXFI48fWs/1fjU=";
}; };
build-system = [ build-system = [

View file

@ -123,5 +123,6 @@ buildPythonPackage {
"x86_64-darwin" "x86_64-darwin"
"aarch64-darwin" "aarch64-darwin"
]; ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
}; };
} }

View file

@ -3,7 +3,7 @@
buildPythonPackage, buildPythonPackage,
pythonOlder, pythonOlder,
fetchFromGitHub, fetchFromGitHub,
poetry-core, hatchling,
openldap, openldap,
pytestCheckHook, pytestCheckHook,
}: }:
@ -23,7 +23,7 @@ buildPythonPackage rec {
hash = "sha256-xXIKC8xDJ3Q6yV1BL5Io0PkLqVbFRbbkB0QSXQGHMNg="; hash = "sha256-xXIKC8xDJ3Q6yV1BL5Io0PkLqVbFRbbkB0QSXQGHMNg=";
}; };
build-system = [ poetry-core ]; build-system = [ hatchling ];
nativeCheckInputs = [ pytestCheckHook ]; nativeCheckInputs = [ pytestCheckHook ];

View file

@ -11,13 +11,13 @@
buildHomeAssistantComponent rec { buildHomeAssistantComponent rec {
owner = "BottlecapDave"; owner = "BottlecapDave";
domain = "octopus_energy"; domain = "octopus_energy";
version = "16.3.1"; version = "17.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
inherit owner; inherit owner;
repo = "HomeAssistant-OctopusEnergy"; repo = "HomeAssistant-OctopusEnergy";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-rn8wCGUYisLgr61Cd2qaQGfSiAtjKMo2wG/AotEXknE="; hash = "sha256-6+uDv3tLm5Lcq0D2rYwEH9ggvAK6y0O+l5IRHafHsyQ=";
}; };
dependencies = [ pydantic ]; dependencies = [ pydantic ];

View file

@ -8,13 +8,13 @@
postgresqlBuildExtension (finalAttrs: { postgresqlBuildExtension (finalAttrs: {
pname = "plpgsql-check"; pname = "plpgsql-check";
version = "2.8.2"; version = "2.8.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "okbob"; owner = "okbob";
repo = "plpgsql_check"; repo = "plpgsql_check";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-NjqnXbQ+wyKVFFdffOQpxrCWT9vrzgh8lk2G3L9i6G8="; hash = "sha256-eGD6DwXx6hUd0hngjbaSZOb2gDYEk820R8YuZDs6UUw=";
}; };
passthru.tests.extension = postgresqlTestExtension { passthru.tests.extension = postgresqlTestExtension {