Merge master into staging-nixos

This commit is contained in:
nixpkgs-ci[bot]
2026-04-19 12:13:36 +00:00
committed by GitHub
26 changed files with 86 additions and 126 deletions
+4 -12
View File
@@ -455,19 +455,17 @@ rec {
(b == armv5tel && isCompatible a armv6l)
# ARMv6
(b == armv6l && isCompatible a armv6m)
(b == armv6m && isCompatible a armv7l)
(b == armv6m && isCompatible a armv6l)
(b == armv6l && isCompatible a armv7l)
# ARMv7
(b == armv7l && isCompatible a armv7a)
(b == armv7l && isCompatible a armv7r)
(b == armv7l && isCompatible a armv7m)
(b == armv7m && isCompatible a armv7a)
(b == armv7m && isCompatible a armv7r)
# ARMv8
(b == aarch64 && a == armv8a)
(b == armv8a && isCompatible a aarch64)
(b == armv8r && isCompatible a armv8a)
(b == armv8m && isCompatible a armv8a)
# PowerPC
(b == powerpc && isCompatible a powerpc64)
@@ -477,15 +475,9 @@ rec {
(b == mips && isCompatible a mips64)
(b == mipsel && isCompatible a mips64el)
# RISCV
(b == riscv32 && isCompatible a riscv64)
# SPARC
(b == sparc && isCompatible a sparc64)
# WASM
(b == wasm32 && isCompatible a wasm64)
# identity
(b == a)
];
+4 -4
View File
@@ -8,13 +8,13 @@
}:
buildGo126Module (finalAttrs: {
pname = "beszel";
version = "0.18.6";
version = "0.18.7";
src = fetchFromGitHub {
owner = "henrygd";
repo = "beszel";
tag = "v${finalAttrs.version}";
hash = "sha256-CRO0Y3o3hwdE55D027fo0tvt9o7vsA1ooEBFlXuw2So=";
hash = "sha256-pVZ1ru9++BypZ3EwoE8clqJowXj1/CMiJxKaC+UY9VE=";
};
webui = buildNpmPackage {
@@ -48,10 +48,10 @@ buildGo126Module (finalAttrs: {
sourceRoot = "${finalAttrs.src.name}/internal/site";
npmDepsHash = "sha256-509/n5OH4z6LZH+jlmDLl2DlqKrD7M5ajtalmF/4n1o=";
npmDepsHash = "sha256-mYAD8FrQwa+F/VgGxFpe8vqucfZaM0PmY+gJJqw1IKk=";
};
vendorHash = "sha256-g+UmoxBoCL3oGXNTY67Wz7y6FC/nkcS8020jhTq4JQE=";
vendorHash = "sha256-TVpZbK9V9/GqpVFcjF7QGD5XJJHzRgjVXZOImHQTR1k=";
tags = [ "testing" ];
+9 -18
View File
@@ -2,7 +2,7 @@
lib,
stdenv,
qt6,
libsForQt5,
qt6Packages,
fetchFromGitHub,
gst_all_1,
cmake,
@@ -11,18 +11,15 @@
ninja,
pkg-config,
}:
let
inherit (libsForQt5) qcoro;
in
stdenv.mkDerivation (finalAttrs: {
pname = "brickstore";
version = "2024.12.3";
version = "2026.3.2";
src = fetchFromGitHub {
owner = "rgriebl";
repo = "brickstore";
tag = "v${finalAttrs.version}";
hash = "sha256-4sxPplZ1t8sSfwTCeeBtfU4U0gcE9FROt6dKvkfyO6Q=";
hash = "sha256-UIVzvzsterKkL8/JPx5S0wly6mLxflAqX0gMFX3rOes=";
fetchSubmodules = true;
};
@@ -31,7 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
libglvnd
ninja
pkg-config
qcoro
qt6.qtdoc
qt6.qtdeclarative
qt6.qtimageformats
@@ -42,20 +38,15 @@ stdenv.mkDerivation (finalAttrs: {
qt6.qttools
qt6.qtwayland
qt6.wrapQtAppsHook
qt6Packages.qcoro
onetbb
];
patches = [
./qcoro-cmake.patch # Don't have CMake fetch qcoro from github, get it from nixpkgs
./qjsonvalue-include.patch # Add a required '#include <QtCore/QJsonValue>'
];
# Since we get qcoro from nixpkgs instead, change the CMake file to reflect the right directory
preConfigure = ''
substituteInPlace cmake/BuildQCoro.cmake \
--replace-fail \
'add_subdirectory(''${qcoro_SOURCE_DIR} ''${qcoro_BINARY_DIR} EXCLUDE_FROM_ALL)' \
'add_subdirectory(${qcoro.src} ${qcoro}bin/qcoro)'
# Use nix-provided qcoro instead of fetching from GitHub
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail 'include(BuildQCoro)' \
'find_package(QCoro6 CONFIG REQUIRED COMPONENTS Core Network Qml)'
'';
qtWrapperArgs = [
@@ -1,20 +0,0 @@
diff --git a/cmake/BuildQCoro.cmake b/cmake/BuildQCoro.cmake
index 941e813..41c88c6 100644
--- a/cmake/BuildQCoro.cmake
+++ b/cmake/BuildQCoro.cmake
@@ -14,14 +14,6 @@ if (BACKEND_ONLY)
set(QCORO_WITH_QML OFF)
endif()
-FetchContent_Declare(
- qcoro
- GIT_REPOSITORY https://github.com/danvratil/qcoro.git
- GIT_TAG v${QCORO_VERSION}
- SOURCE_SUBDIR "NeedManualAddSubDir" # make it possible to add_subdirectory below
-)
-
-FetchContent_MakeAvailable(qcoro)
set(mll ${CMAKE_MESSAGE_LOG_LEVEL})
if (NOT VERBOSE_FETCH)
@@ -1,12 +0,0 @@
diff --git a/src/bricklink/order.cpp b/src/bricklink/order.cpp
index 14426e5b..59856f0c 100755
--- a/src/bricklink/order.cpp
+++ b/src/bricklink/order.cpp
@@ -16,6 +16,7 @@
#include <QtSql/QSqlError>
#include <QtSql/QSqlQueryModel>
#include <QtCore/QLoggingCategory>
+#include <QtCore/QJsonValue>
#include "bricklink/core.h"
#include "bricklink/io.h"
+6 -3
View File
@@ -12,14 +12,14 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "canaille";
version = "0.2.4";
version = "0.2.7";
pyproject = true;
src = fetchFromGitLab {
owner = "yaal";
repo = "canaille";
tag = version;
hash = "sha256-iCiQvB+wYpm/Cns63kjo2wVGnSbcQHWo3UJvi0xJf50=";
hash = "sha256-hreEjMrD6mRapgrSDPRWcmqfLxfsOpK7dC8lHJkAY7Y=";
};
build-system = with python.pkgs; [
@@ -107,7 +107,10 @@ python.pkgs.buildPythonApplication rec {
scim2-client
scim2-models
];
ldap = [ python-ldap ];
ldap = [
ldappool
python-ldap
];
sentry = [ sentry-sdk ];
postgresql = [
flask-alembic
+3 -3
View File
@@ -12,18 +12,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cloudflare-cli";
version = "5.1.2";
version = "5.1.4";
src = fetchFromGitHub {
owner = "danielpigott";
repo = "cloudflare-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-KDL9UGsBVH+BxeMwpcwqH0P0Y8QbFMSqNT5FrTZxDog=";
hash = "sha256-UGXouKsFA4GCFgjsf5smQ1xsibPFiBqkdsqNDLAy2GM=";
};
yarnOfflineCache = fetchYarnDeps {
yarnLock = finalAttrs.src + "/yarn.lock";
hash = "sha256-30zvP1sYENfTh8o/RiSrYPZR3to3GF2m036q/+mrcSU=";
hash = "sha256-2NgmL04czIj/uj/KzdEDc4PdzUVVRty3MSZ9IwqRMOk=";
};
nativeBuildInputs = [
+4
View File
@@ -9,6 +9,7 @@
freetype,
glib,
glslang,
gst_all_1,
gtk4-layer-shell,
harfbuzz,
libadwaita,
@@ -75,6 +76,9 @@ stdenv.mkDerivation (finalAttrs: {
libadwaita
libx11
gtk4-layer-shell
gst_all_1.gstreamer # Used for playing audio, e.g. audible bells
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-base
# OpenGL renderer
glslang
+2 -2
View File
@@ -55,7 +55,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "ostree";
version = "2025.7";
version = "2026.1";
outputs = [
"out"
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://github.com/ostreedev/ostree/releases/download/v${finalAttrs.version}/libostree-${finalAttrs.version}.tar.xz";
hash = "sha256-r40IC5WF5/0fq6jwIpZ+HCaK5i4g7PMu57NkweMHVws=";
hash = "sha256-jnfChd1vpexfsGMTA5CXe+cn/hEQczXth3ikA4UGnpU=";
};
patches = [
+5 -5
View File
@@ -8,7 +8,7 @@
let
pname = "postman";
version = "11.89.0";
version = "11.93.0";
src =
let
@@ -27,10 +27,10 @@ let
name = "postman-${version}.${if stdenvNoCC.hostPlatform.isLinux then "tar.gz" else "zip"}";
url = "https://dl.pstmn.io/download/version/${version}/${system}";
hash = selectSystem {
aarch64-darwin = "sha256-NGiQPg4oVr2zin0NT8/2Y5HTrBZeA7Oboue2zYPHJWc=";
aarch64-linux = "sha256-dGV1JzNsHo8lKZplBX5sp1BRgGovVY+UM+6BumXLK2E=";
x86_64-darwin = "sha256-kpl5x+uCR76dSwG+5xk4aA0lLiKXWOhJTtco2+S5c5g=";
x86_64-linux = "sha256-9hRBh1zUIL5JctHhdtAeWgR8/QqftRNqAGghI7BgdsI=";
aarch64-darwin = "sha256-P7MF0Hg1n/0Wsdg9YEJTHRy8NGjDkDrCCFMbu3uovho=";
aarch64-linux = "sha256-OOJAdywyGZaFMpi/IKub53NfJ2IEu3E+bkmYeDT/xjc=";
x86_64-darwin = "sha256-xBY8Nqtax8e/5k/pAOCRSdHiOETR1RS1A/anVwhWipw=";
x86_64-linux = "sha256-hsW/2Fs1uY+iUl9hzzr5lcVxoydSZn3p/B0AsqXwlww=";
};
};
+2 -2
View File
@@ -8,11 +8,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "quarkus-cli";
version = "3.32.4";
version = "3.34.3";
src = fetchurl {
url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz";
hash = "sha256-cfNgh2idBZxO4xKP4gShMHmVOyaX9JxEmwyMp6cXPj8=";
hash = "sha256-JMPETdr/c50EqHTF/PMH5AReMdLP+7HbCz/FhLJiMS0=";
};
nativeBuildInputs = [ makeWrapper ];
-1
View File
@@ -187,7 +187,6 @@ python3Packages.buildPythonApplication rec {
homepage = "http://www.davisr.me/projects/rcu/";
license = lib.licenses.agpl3Plus;
maintainers = with lib.maintainers; [
OPNA2608
m0streng0
];
hydraPlatforms = [ ]; # requireFile used as src
+2 -5
View File
@@ -16,6 +16,7 @@
makeWrapper,
docutils,
wayland-scanner,
wrapGAppsHook3,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -47,13 +48,9 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
makeWrapper
wayland-scanner
wrapGAppsHook3
];
postFixup = ''
wrapProgram $out/bin/sfwbar \
--suffix XDG_DATA_DIRS : $out/share
'';
meta = {
homepage = "https://github.com/LBCrion/sfwbar";
description = "Flexible taskbar application for wayland compositors, designed with a stacking layout in mind";
+3 -3
View File
@@ -10,14 +10,14 @@
stdenv.mkDerivation {
pname = "systemdgenie";
version = "0.99.0-unstable-2026-03-07";
version = "0.99.0-unstable-2026-04-16";
src = fetchFromGitLab {
domain = "invent.kde.org";
repo = "SystemdGenie";
owner = "system";
rev = "1905e25d93a2c5e9851fc9516f0f61dce1ac2812";
hash = "sha256-kkqJS1mqLgUlzW35SWQKTHJEcXz4SK0fL8rauwjFBd0=";
rev = "283973fcde1eeb457cd082af8004e099aa8b3b86";
hash = "sha256-QRbATmdJ78N2mGyt4XCVzQ3nKk0FlnTuYkoi3/XC9DY=";
};
strictDeps = true;
+3 -3
View File
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "termscp";
version = "0.19.1";
version = "1.0.0";
src = fetchFromGitHub {
owner = "veeso";
repo = "termscp";
tag = "v${finalAttrs.version}";
hash = "sha256-/smeK7qCw1EgADc7bgC1xUep3hPj7gOddanbaTjbGgs=";
hash = "sha256-WsTvKQg6TULOlKOAYhdE1wEyAegFKEZFN83QBSX0WdY=";
};
cargoHash = "sha256-zVkShePjUzagP8MAG5oq6hqm+lHxH++ufXkmetN+jvA=";
cargoHash = "sha256-Z39YCN2x7FM/rkcQ/DFnx5iLho0bWD/zaUxhAlN2T1k=";
nativeBuildInputs = [
pkg-config
+3 -3
View File
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "tpnote";
version = "1.25.20";
version = "1.26.0";
src = fetchFromGitHub {
owner = "getreu";
repo = "tp-note";
tag = "v${finalAttrs.version}";
hash = "sha256-GsdK3giYfFjiXphWMUXQ7s84j5BStA/HDiRzCLbN1DI=";
hash = "sha256-JjX/cD2VMpS0114Yu+3ZTqPFxv1Pl7cJH6JeURpv7MA=";
};
cargoHash = "sha256-Ke8JtCOaTLe7RQPrOFSs1nHSkkQqAiqnbA1wHzv6DU4=";
cargoHash = "sha256-n3v0ObH4W6H9nRgCSJprVHW1CRgZ9A+padNqJuQLFoE=";
nativeBuildInputs = [
cmake
+2 -2
View File
@@ -10,13 +10,13 @@
buildGoModule (finalAttrs: {
pname = "VictoriaLogs";
version = "1.49.0";
version = "1.50.0";
src = fetchFromGitHub {
owner = "VictoriaMetrics";
repo = "VictoriaLogs";
tag = "v${finalAttrs.version}";
hash = "sha256-7qpI9EjHh5XddXXx4QuGt+h5Rwcj6Me+mpZDbnCGbio=";
hash = "sha256-hlRHTTwGPXAMVscIeHxac7KCNWEdBy7WS/KbxwMTl7w=";
};
vendorHash = null;
+2 -2
View File
@@ -50,11 +50,11 @@ in
stdenv.mkDerivation (finalAttrs: {
inherit pname;
version = "4.6.3";
version = "4.7.0";
src = fetchurl {
url = "mirror://sourceforge/project/warzone2100/releases/${finalAttrs.version}/warzone2100_src.tar.xz";
hash = "sha256-Qx/iQ2z/loeOLtTtxtBzlFOtYpPWQwtYMt6bUi/wsTo=";
hash = "sha256-le5NW4hoDqGxzyMLZ+qEAo4IokWLhGBayff7nrl8Tjc=";
};
buildInputs = [
+3 -3
View File
@@ -8,16 +8,16 @@
buildNpmPackage (finalAttrs: {
pname = "yo";
version = "7.0.0";
version = "7.0.1";
src = fetchFromGitHub {
owner = "yeoman";
repo = "yo";
tag = "v${finalAttrs.version}";
hash = "sha256-tTT+KjJ8Fol2IjPzuWpkd3SymODe8Jmge9sreSxBU5M=";
hash = "sha256-Xj8rz7YQMbCW2Dzyojiz0r6fgEkNG8D7xsf3KqE2tX4=";
};
npmDepsHash = "sha256-bBGGZ5O4Nkw+nMZ5VAz7wjm8tIrCCvtv6TaXTwUCLPk=";
npmDepsHash = "sha256-sBQLgiVEIrgKDgFdDfFqm8kRyiiPw2tOpHhA7ah5UVw=";
dontNpmBuild = true;
@@ -41,6 +41,12 @@ stdenv.mkDerivation rec {
sed -i '/gtest/d' third_party/CMakeLists.txt
rmdir test/spec/testsuite
ln -s ${testsuite} test/spec/testsuite
# scripts/test/lld.py checks `'64' in input_path` to enable the
# memory64/bigint flags; the full Nix build path leaks digits that
# can accidentally contain "64", wrongly triggering those flags for
# non-memory64 tests (e.g. duplicate_imports.wat). Match on basename.
substituteInPlace scripts/test/lld.py \
--replace-fail "'64' in input_path" "'64' in os.path.basename(input_path)"
else
cmakeFlagsArray=($cmakeFlagsArray -DBUILD_TESTS=0)
fi
@@ -351,10 +351,13 @@ stdenv.mkDerivation (
rm test/tools/llvm-objcopy/MachO/universal-object.test
''
+
# Seems to require certain floating point hardware (NEON?)
optionalString (stdenv.hostPlatform.system == "armv6l-linux") ''
rm test/ExecutionEngine/frem.ll
''
# Seems to require certain floating point hardware (NEON?). Tests were
# reorganized in LLVM 20.
optionalString
(stdenv.hostPlatform.system == "armv6l-linux" && lib.versionOlder release_version "20")
''
rm test/ExecutionEngine/frem.ll
''
+
# 1. TODO: Why does this test fail on FreeBSD?
# It seems to reference /usr/local/lib/libfile.a, which is clearly a problem.
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "hepunits";
version = "2.4.4";
version = "2.4.5";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-GEbnKfo+T7Nr/1me17i9LNxKvcApBoMPt1wgX9VJBes=";
hash = "sha256-iPpXyfNUWdam7iYYunPCFUxImjLiHVJbZ9qAYqIkLls=";
};
nativeBuildInputs = [
@@ -26,14 +26,14 @@
buildPythonPackage (finalAttrs: {
pname = "langgraph-cli";
version = "0.4.21";
version = "0.4.23";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langgraph";
tag = "cli==${finalAttrs.version}";
hash = "sha256-PwVJzg+LQ6gScd/lewBqN66rzADnucMeIA/4gmP4xPw=";
hash = "sha256-nF6w1SUEFECSv87TbvNpNGiv1wFbKsDlUy8MprTdG70=";
};
sourceRoot = "${finalAttrs.src.name}/libs/cli";
@@ -2,7 +2,6 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
# build-system
hatchling,
@@ -27,18 +26,16 @@
virtualenv,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "nox";
version = "2026.02.09";
version = "2026.04.10";
pyproject = true;
disabled = pythonOlder "3.12";
src = fetchFromGitHub {
owner = "wntrblm";
repo = "nox";
tag = version;
hash = "sha256-RaB0q9gCoYqKAI8IzNh5qUd0SrzsPeOa3C6IGxpcbwE=";
tag = finalAttrs.version;
hash = "sha256-ArSA9I86hTKM+fkTdzOeheYVxpdjweMs2I0mUwR14sQ=";
};
build-system = [ hatchling ];
@@ -65,7 +62,7 @@ buildPythonPackage rec {
pytestCheckHook
writableTmpDirAsHomeHook
]
++ lib.concatAttrValues optional-dependencies;
++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
pythonImportsCheck = [ "nox" ];
@@ -86,11 +83,11 @@ buildPythonPackage rec {
meta = {
description = "Flexible test automation for Python";
homepage = "https://nox.thea.codes/";
changelog = "https://github.com/wntrblm/nox/blob/${src.tag}/CHANGELOG.md";
changelog = "https://github.com/wntrblm/nox/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
doronbehar
fab
];
};
}
})
@@ -18,7 +18,7 @@ in
buildLinux (
args
// rec {
version = "6.19.11";
version = "6.19.12";
pname = "linux-zen";
modDirVersion = lib.versions.pad 3 "${version}-${suffix}";
isZen = true;
@@ -27,7 +27,7 @@ buildLinux (
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
sha256 = "15ja0f4dvlnvibajvyfvv1x2w5spy0dfyfzrzz3hp3dm0k87cfi4";
sha256 = "062qr3j5c3v4khv20q7g8lmrrvvg8708wwy02z3vygany43k3rgb";
};
# This is based on the following source:
+3 -3
View File
@@ -12,16 +12,16 @@ let
}:
rustPlatform.buildRustPackage rec {
pname = name;
version = "0.96.0";
version = "0.98.0";
src = fetchFromGitHub {
owner = "n0-computer";
repo = "iroh";
rev = "v${version}";
hash = "sha256-J7FiKIBFUnTUJJwzwzfyk7+CK0UKlAPNFjVDDGlHMqM=";
hash = "sha256-s6+XobcFGw7JquIuUQinmHggxmxQ1iKMpDVe49LpSbI=";
};
cargoHash = "sha256-W8PVysQffGuxBIDpcZ77ujOQ5KBED6svwEXPeZpQmTc=";
cargoHash = "sha256-GoBG4bI5hufklEC3uoVFE+NURTEHhb4ZtXFYd9nsCls=";
buildFeatures = cargoFeatures;
cargoBuildFlags = [