Merge master into staging-nixos

This commit is contained in:
nixpkgs-ci[bot]
2026-04-13 06:46:48 +00:00
committed by GitHub
21 changed files with 52 additions and 80 deletions
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "urxvt-tabbedex";
version = "22.32";
version = "26.16.1";
src = fetchFromGitHub {
owner = "mina86";
repo = "urxvt-tabbedex";
rev = "v${version}";
sha256 = "sha256-4+4iPFoy1j5xjXRM5kBauhff44Y7/ik/+ZLZ1prc+Xo=";
sha256 = "sha256-e/t7AnP7nXkkazK6Oe6mw2Adf5wxR31/nFKeSaCpy/4";
};
nativeBuildInputs = [ perl ];
+4
View File
@@ -50,4 +50,8 @@ buildEnv {
}"
done
'';
meta = {
inherit (kodi.meta) mainProgram;
};
}
+3 -3
View File
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cargo-crev";
version = "0.26.5";
version = "0.27.1";
src = fetchFromGitHub {
owner = "crev-dev";
repo = "cargo-crev";
rev = "v${finalAttrs.version}";
sha256 = "sha256-P6i2RvosI36rrg52kUcdrb5y4Fg0ms/mH5hcOWNgSik=";
sha256 = "sha256-ezMpxYrJJ2zqEwCaDu2DFMwd6d/nfPVO6z2Lm4elIYE=";
};
cargoHash = "sha256-ZlcKnSVpMxQqstbr/VkR/iT1B0wR5qnh5VLpNpYsTRw=";
cargoHash = "sha256-CYvvwgDZ+yAr7kLGEVZLVx7+sZUc5vu85AT5xLJBSbQ=";
preCheck = ''
export HOME=$(mktemp -d)
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule (finalAttrs: {
pname = "feishu-cli";
version = "1.15.0";
version = "1.18.1";
src = fetchFromGitHub {
owner = "riba2534";
repo = "feishu-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-8GIEa2P3s3sF0o4SyAjLxgHNFi5+4F19T+EsJ1d1Oik=";
hash = "sha256-LYhBwXkkYtc9uNXOMn/lRiCInSSy0tCf0vGsuFDuJJI=";
};
vendorHash = "sha256-MZv772U+3+Fcanaiuhz+OCqfIsYyCG7B4iZOnEftbi8=";
@@ -1,29 +0,0 @@
From 7f4f7fcd97acef841e046191d98c900b61b78c17 Mon Sep 17 00:00:00 2001
From: Dan Yeaw <dan@yeaw.me>
Date: Sat, 4 Apr 2026 15:46:25 -0400
Subject: [PATCH] Fix dulwich porcelain API
---
gaphor/storage/tests/fixtures.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gaphor/storage/tests/fixtures.py b/gaphor/storage/tests/fixtures.py
index d071e4556f..4dd0c60bf1 100644
--- a/gaphor/storage/tests/fixtures.py
+++ b/gaphor/storage/tests/fixtures.py
@@ -16,11 +16,13 @@ def commit_all(message):
main_ref = commit_all("Initial commit")
porcelain.branch_create(repo, "branch")
- porcelain.checkout_branch(repo, "branch")
+ porcelain.switch(repo, "branch")
filename.write_text(their_text, encoding="utf-8")
branch_oid = commit_all("Branch commit")
- porcelain.checkout_branch(repo, main_ref)
+ # OID + detach=True: works when default branch is not "main" (e.g. older
+ # Dulwich uses "master"); "git merge" still runs on HEAD.
+ porcelain.switch(repo, main_ref, detach=True)
filename.write_text(our_text, encoding="utf-8")
commit_all("Second commit")
+2 -8
View File
@@ -13,22 +13,16 @@
}:
python3Packages.buildPythonApplication (finalAttrs: {
pname = "gaphor";
version = "3.2.0";
version = "3.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "gaphor";
repo = "gaphor";
tag = finalAttrs.version;
hash = "sha256-0Z0RFQrN2g0beV2konZBfMroeNtbT+sPRsWlRvQFYBk=";
hash = "sha256-bgcri0mgFKz4jtGJSWtlStS3f4FzYH+ZPE1BsK+S1DI=";
};
patches = [
# from https://github.com/gaphor/gaphor/pull/4236
# please remove after next update
./fix-dulwich-api.patch
];
pythonRelaxDeps = [
"pydot"
"pygobject"
+2 -2
View File
@@ -20,7 +20,7 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "iotas";
version = "2026.4";
version = "2026.5";
pyproject = false;
src = fetchFromGitLab {
@@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
owner = "World";
repo = "iotas";
tag = finalAttrs.version;
hash = "sha256-PLKKV6FNYvhvb1Kp2tYu7jXkzxfN/W0C618o5+/tenY=";
hash = "sha256-HTwhlbTc+s7eZVMLA/fYrhwwrmfDkdExARoJghLchls=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -4,7 +4,7 @@
}:
let
version = "2.0.3";
version = "2.1.1";
in
{
inherit version;
@@ -13,10 +13,10 @@ in
owner = "lima-vm";
repo = "lima";
tag = "v${version}";
hash = "sha256-NoHNmJ6z7eZTzjl8ps3wFY2e68FcoBsu5ZhE0NXt95g=";
hash = "sha256-U054xA3utBcSfpyvsZi4MvgJGNa7QyAYJf9usNXpgXg=";
};
vendorHash = "sha256-SeLYVQI+ZIbR9qVaNyF89VUvXdfv1M5iM+Cbas6e2E0=";
vendorHash = "sha256-C4YCuFVXkL5vS6lWZCGkEeZQgAkP55buPDGZ/wvMnAA=";
meta = {
homepage = "https://github.com/lima-vm/lima";
+3 -3
View File
@@ -78,7 +78,7 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "llama-cpp";
version = "8733";
version = "8770";
outputs = [
"out"
@@ -89,7 +89,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
owner = "ggml-org";
repo = "llama.cpp";
tag = "b${finalAttrs.version}";
hash = "sha256-hHySLday/Kz0jNPLxbDxZXL/1O2VOBPG7fNaBLkD6tc=";
hash = "sha256-f2LQzQkv5UymRzqtdbgmVTlA8gdpwXu7H7pRyKGzlzk=";
leaveDotGit = true;
postFetch = ''
git -C "$out" rev-parse --short HEAD > $out/COMMIT
@@ -121,7 +121,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
++ [ openssl ];
npmRoot = "tools/server/webui";
npmDepsHash = "sha256-eeftjKt0FuS0Dybez+Iz9VTVMA4/oQVh+3VoIqvhVMw=";
npmDepsHash = "sha256-RAFtsbBGBjteCt5yXhrmHL39rIDJMCFBETgzId2eRRk=";
npmDeps = fetchNpmDeps {
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
inherit (finalAttrs) src patches;
+3 -1
View File
@@ -40,7 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
fakeGit # https://github.com/icculus/mojoshader/blob/abdc80360c1d4560ab8f356035dcd53ae6e9b87f/CMakeLists.txt#L41-L68
];
NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-I${dxvk_2}/include/dxvk";
env = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
NIX_CFLAGS_COMPILE = "-I${dxvk_2}/include/dxvk";
};
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+2 -2
View File
@@ -72,12 +72,12 @@ let
});
in
stdenv.mkDerivation rec {
version = "1.27.0";
version = "1.27.2";
pname = "mupdf";
src = fetchurl {
url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
hash = "sha256-riRCQW3kmRgtN6UmxvorrMejvtWoiNETygSERITf58Y=";
hash = "sha256-VThnsTUwPcTCWrZ8XyNNjpAKDjbmboSE2ZrcBf4ehzc=";
};
patches = [
+5 -5
View File
@@ -14,7 +14,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "proton-pass-cli";
version = "1.9.0";
version = "1.10.0";
src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system};
@@ -46,19 +46,19 @@ stdenv.mkDerivation (finalAttrs: {
sources = {
"aarch64-darwin" = fetchurl {
url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-aarch64";
hash = "sha256-mLYtw8ON2B+RUXVkD10VyI03d3yrdwFFz8giDb/PiNg=";
hash = "sha256-tOHXJl4R27rtuXlsqAQ8XFpOJ7Pc1IEcnla85Myn7N0=";
};
"aarch64-linux" = fetchurl {
url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-aarch64";
hash = "sha256-dg7jNFrzuIeXKN3wV3nj92acwP1lqE3QHsuiosjrvLw=";
hash = "sha256-zJQfWhiNk/noQbrhnxgEqGHZwccsyV2FX3sEOpUGTYQ=";
};
"x86_64-darwin" = fetchurl {
url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-x86_64";
hash = "sha256-C9nWUikfaCfroVwz4C9K9dNMUpP6kbpHuuHMRTch5aU=";
hash = "sha256-usmOErL5BeZ2s4VrShr4fYcO5ibBBaBJuk3oPtjf884=";
};
"x86_64-linux" = fetchurl {
url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-x86_64";
hash = "sha256-m3HllX9YAmavVbkAyJ5h69QCcH2i4Ux+p17e0/VGovQ=";
hash = "sha256-lkB4I5Srj+r+pLvd2HEch/NPFfHvhVfgu6RC7yh/njY=";
};
};
updateScript = writeShellScript "update-proton-pass-cli" ''
+2 -2
View File
@@ -19,11 +19,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qownnotes";
appname = "QOwnNotes";
version = "26.4.4";
version = "26.4.11";
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
hash = "sha256-Sp1ICvsmTlq8cqF3mrkfyAx/tZwLLZIqmQqMQ1gt8uo=";
hash = "sha256-5V5fBxDlTjuj0RxxR4QcBlFmiSAWpRUxIZjpRzdDVJo=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "radicale";
version = "3.7.0";
version = "3.7.1";
pyproject = true;
src = fetchFromGitHub {
owner = "Kozea";
repo = "Radicale";
tag = "v${finalAttrs.version}";
hash = "sha256-9mcYyiBljH9iwO/YgavCnR7VbqSYFy4IP3YtYjFbCS8=";
hash = "sha256-Zwu0xRXSeHmAS9c4TCArBPcE/lMdxn/OxxnmcDvtU/Q=";
};
build-system = with python3.pkgs; [
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "serie";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
owner = "lusingander";
repo = "serie";
rev = "v${finalAttrs.version}";
hash = "sha256-tNMNbxPuWNXfBdQglq6PekJV93AdhO+zqAA+dyNqdcQ=";
hash = "sha256-/w/LKU2ObPjoO7RQ5HehCAqWv3Hfu7a+6Rk+rPx5MSM=";
};
cargoHash = "sha256-UWrnhczknl/F5gSA9S4W+Ub5zzB7XuQ358d7XVXRjjQ=";
cargoHash = "sha256-JeK2UIlG4MmOxGPxy2HbFTgpi14/zyibuFQyrQooItg=";
nativeCheckInputs = [ gitMinimal ];
+3 -3
View File
@@ -9,19 +9,19 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "tombi";
version = "0.9.13";
version = "0.9.16";
src = fetchFromGitHub {
owner = "tombi-toml";
repo = "tombi";
tag = "v${finalAttrs.version}";
hash = "sha256-UOojaKqBXFWkQ3ZzWBRt5Lz4mTEHP/0NWT0ezlEPScA=";
hash = "sha256-cnhxvzX456kQdywpl2VCWIAvqnZGz1WwNxPJQEMyouo=";
};
# Tests relies on the presence of network
doCheck = false;
cargoBuildFlags = [ "--package tombi-cli" ];
cargoHash = "sha256-dJL20p9Uz12EwfKTKwc3ScuwH7wP0jHcg2Nf8itqdFk=";
cargoHash = "sha256-lXN/tXYUJgQhSKyEgHswf91cUR9eH4T3/92gjI3yR1Y=";
postPatch = ''
substituteInPlace Cargo.toml \
+3 -3
View File
@@ -5,7 +5,7 @@
}:
let
version = "0.7.2";
version = "1.0.0";
in
buildGoModule {
pname = "vault-unseal";
@@ -15,10 +15,10 @@ buildGoModule {
owner = "lrstanley";
repo = "vault-unseal";
rev = "v${version}";
hash = "sha256-xv33wx/JjvpL9ryyWeZde+a6UPWqYXQcsAxOzmHFAyo=";
hash = "sha256-czfG7DsA6O2n8BlzEEvNtu0Dg277qBnLAdVUZLo6+8w=";
};
vendorHash = "sha256-hhTJB1g35vB5dLOEY7V7V5ma7Zzyq2bo9kk3gpEcEsY=";
vendorHash = "sha256-ma3xbnWH87b1X5fdOjigzsj5gEfhbjyTLoIDyp9eY80=";
meta = {
changelog = "https://github.com/lrstanley/vault-unseal/releases/tag/v${version}";
+3 -3
View File
@@ -28,9 +28,9 @@ let
"21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0=";
"22.1.2".officialRelease.sha256 = "sha256-z6YcxgDd3F3JwfU5Y/wMw5MK+ZPISI3KLwHwUaraTuw=";
"23.0.0-git".gitRelease = {
rev = "3e015b89e8bd9c71f6bb1cf38747d2862f5d5a3d";
rev-version = "23.0.0-unstable-2026-03-29";
sha256 = "sha256-sCyBinGy0kytpxK39OxiOrWMS3UPOHOxxwtm02vIIPk=";
rev = "26697f4d07eb921aebabdaa7d064c5165c70717e";
rev-version = "23.0.0-unstable-2026-04-05";
sha256 = "sha256-0TDdZRERXJzSGnKK74+L4taPs0EEKH1hsoRmrGy00Ks=";
};
}
// llvmVersions;
@@ -39,6 +39,7 @@ buildPythonPackage (finalAttrs: {
"ldap3"
"pycryptodome"
"pyopenssl"
"beautifulsoup4"
];
build-system = [ setuptools ];
@@ -14,14 +14,14 @@
buildPythonPackage (finalAttrs: {
pname = "elevenlabs";
version = "2.41.0";
version = "2.42.0";
pyproject = true;
src = fetchFromGitHub {
owner = "elevenlabs";
repo = "elevenlabs-python";
tag = "v${finalAttrs.version}";
hash = "sha256-Kykhwy2JxEKWxO/lRmMxB/P0jnaxBfmpJDz4+g1oBrQ=";
hash = "sha256-HLKaT+781V889MO471T1Hj+ED7k3SGPtwt9NIA/bmWQ=";
};
build-system = [ poetry-core ];
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "rocketchat-api";
version = "3.4.0";
version = "3.5.0";
pyproject = true;
src = fetchFromGitHub {
owner = "jadolg";
repo = "rocketchat_API";
tag = version;
hash = "sha256-DA4CBgtcg0TOLm5HrDxbyQK/qOfgwIFw86Yk1s4pBFM=";
hash = "sha256-IbynNQLRgVCY2I9rZ3S4annJ0ogiuRKLHJ2P9qvpj4o=";
};
build-system = [