From e99b9048117a335b51fe152cb709a44bfbe5d139 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 13 Mar 2026 12:57:20 -0700
Subject: [PATCH 01/85] r2modman: rip out update banner component from build
---
pkgs/by-name/r2/r2modman/package.nix | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/pkgs/by-name/r2/r2modman/package.nix b/pkgs/by-name/r2/r2modman/package.nix
index 2ed0e41efcad..58cef2dfab9d 100644
--- a/pkgs/by-name/r2/r2modman/package.nix
+++ b/pkgs/by-name/r2/r2modman/package.nix
@@ -49,6 +49,11 @@ stdenv.mkDerivation (finalAttrs: {
ELECTRON_SKIP_BINARY_DOWNLOAD = true;
};
+ postPatch = ''
+ # Hide update banner
+ echo "" > src/components/banner/ManagerUpdateBanner.vue
+ '';
+
buildPhase = ''
runHook preBuild
From 2f7a6648414e95fb74834376f1a259181ac9571c Mon Sep 17 00:00:00 2001
From: Cathal Mullan
Date: Wed, 3 Jun 2026 14:53:38 +0100
Subject: [PATCH 02/85] cedar: 4.5.1 -> 4.11.0
---
pkgs/by-name/ce/cedar/package.nix | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/ce/cedar/package.nix b/pkgs/by-name/ce/cedar/package.nix
index 2f0b387a65a3..252f7c957ea6 100644
--- a/pkgs/by-name/ce/cedar/package.nix
+++ b/pkgs/by-name/ce/cedar/package.nix
@@ -9,16 +9,27 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cedar";
- version = "4.5.1";
+ version = "4.11.0";
src = fetchFromGitHub {
owner = "cedar-policy";
repo = "cedar";
tag = "v${finalAttrs.version}";
- hash = "sha256-f8d7KL1DzEfJqEJ5uwwOJCgePE/frOXIFcXuoybIp2U=";
+ hash = "sha256-9IJ/AMWOtkNAoBbzTKqUZI87MvHPihdhNBwsmn0qpDA=";
};
- cargoHash = "sha256-MK6Zcpf12mGzntEv632kQjH7YOx31QBCmSJHxjE3l1c=";
+ cargoHash = "sha256-sinfwdi3/ZFmdbxRiUbtmhsVGcJenn82HFu8mJz415I=";
+
+ cargoBuildFlags = [
+ "--bin"
+ "cedar"
+ ];
+
+ cargoTestFlags = finalAttrs.cargoBuildFlags;
+
+ preCheck = ''
+ export TMPDIR="/tmp"
+ '';
passthru = {
tests.version = testers.testVersion { package = cedar; };
From 79d37421dc62fb90ebaf87a53f551e21ad475542 Mon Sep 17 00:00:00 2001
From: wduo87391
Date: Tue, 2 Jun 2026 19:33:33 +0800
Subject: [PATCH 03/85] project-graph: 3.0.7 -> 3.0.8
---
pkgs/by-name/pr/project-graph/package.nix | 30 ++++++++++++++++++-----
1 file changed, 24 insertions(+), 6 deletions(-)
diff --git a/pkgs/by-name/pr/project-graph/package.nix b/pkgs/by-name/pr/project-graph/package.nix
index 46a74d44b707..b478e223bec3 100644
--- a/pkgs/by-name/pr/project-graph/package.nix
+++ b/pkgs/by-name/pr/project-graph/package.nix
@@ -16,11 +16,14 @@
jq,
versionCheckHook,
nix-update-script,
+ libGL,
+ gst_all_1,
+ qt6,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "project-graph";
- version = "3.0.7";
+ version = "3.0.8";
__structuredAttrs = true;
@@ -28,18 +31,25 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "graphif";
repo = "project-graph";
tag = "v${finalAttrs.version}";
- hash = "sha256-QC1YTcyH7q+TJiGLF7zjKTe1OcfFd74fSFr+23iYMyQ=";
+ hash = "sha256-VI2elNYYDPJVLE0LIaUJHLeemUHokqHob5oB7jgQOL4=";
};
- cargoHash = "sha256-bsRX+iVo2jInWZvrX1fVE2oAqM8L/5zNzjRwtoviQN0=";
+ cargoHash = "sha256-RFYDFZ3NKr/7OxwgApexGnxR8ZQn09DFYNzhnqVYEzE=";
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_10;
fetcherVersion = 3;
- hash = "sha256-sTThym++UWKpKFZqhQJCewRKtdYe1tKNcESrxyxpLmY=";
+ hash = "sha256-6s5mv6hcpZUz/N5QNqUC8NamGT/B5Wv7DfY4Jte9jiQ=";
};
+ preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
+ gappsWrapperArgs+=(
+ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}"
+ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+ )
+ '';
+
postPatch = ''
TAURI_CONFIG="app/src-tauri/tauri.conf.json"
if [ -f "$TAURI_CONFIG" ]; then
@@ -53,6 +63,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
'';
preBuild = ''
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags Qt6WebEngineWidgets)"
pnpm run build
'';
@@ -66,18 +77,25 @@ rustPlatform.buildRustPackage (finalAttrs: {
wrapGAppsHook4
];
+ dontWrapQtApps = true;
+
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
glib-networking
openssl
webkitgtk_4_1
+ libGL
+ gst_all_1.gst-plugins-base
+ gst_all_1.gst-plugins-good
+ qt6.qtbase
+ qt6.qtwebengine
];
cargoRoot = "app/src-tauri";
buildAndTestSubdir = finalAttrs.cargoRoot;
- docheck = true;
+ doInstallCheck = true;
- nativeCheckInputs = [ versionCheckHook ];
+ nativeInstallCheckInputs = [ versionCheckHook ];
passthru.updateScript = nix-update-script { };
From 01987f4191f7291f25786b814e96446abffa19aa Mon Sep 17 00:00:00 2001
From: poz
Date: Sun, 14 Jun 2026 19:16:26 +0200
Subject: [PATCH 04/85] everforest-gtk-theme: patch out invalid property in
gtk3 theme
---
.../gtk3-remove-border-spacing.patch | 12 ++++++++++++
pkgs/by-name/ev/everforest-gtk-theme/package.nix | 3 +++
2 files changed, 15 insertions(+)
create mode 100644 pkgs/by-name/ev/everforest-gtk-theme/gtk3-remove-border-spacing.patch
diff --git a/pkgs/by-name/ev/everforest-gtk-theme/gtk3-remove-border-spacing.patch b/pkgs/by-name/ev/everforest-gtk-theme/gtk3-remove-border-spacing.patch
new file mode 100644
index 000000000000..9efb115de101
--- /dev/null
+++ b/pkgs/by-name/ev/everforest-gtk-theme/gtk3-remove-border-spacing.patch
@@ -0,0 +1,12 @@
+diff --git a/themes/src/sass/gtk/_common-3.0.scss b/themes/src/sass/gtk/_common-3.0.scss
+index 4148a1b4..735905e9 100644
+--- a/themes/src/sass/gtk/_common-3.0.scss
++++ b/themes/src/sass/gtk/_common-3.0.scss
+@@ -1119,7 +1119,6 @@ dropdown {
+
+ > button > box {
+ border-radius: 0 $modal-radius $modal-radius 0;
+- border-spacing: $space-size;
+
+ > stack > row.activatable {
+ &:hover,
diff --git a/pkgs/by-name/ev/everforest-gtk-theme/package.nix b/pkgs/by-name/ev/everforest-gtk-theme/package.nix
index fb5e6f71769f..c2530ce49d5d 100644
--- a/pkgs/by-name/ev/everforest-gtk-theme/package.nix
+++ b/pkgs/by-name/ev/everforest-gtk-theme/package.nix
@@ -23,6 +23,9 @@ stdenvNoCC.mkDerivation {
# remove when merged
# https://github.com/Fausto-Korpsvart/Everforest-GTK-Theme/pull/34
./fix-install-script.patch
+ # remove when merged
+ # https://github.com/Fausto-Korpsvart/Everforest-GTK-Theme/pull/35
+ ./gtk3-remove-border-spacing.patch
];
propagatedUserEnvPkgs = [
From 8a661c3eb1e4bf4c7bdff7c980ff0bcd986ada21 Mon Sep 17 00:00:00 2001
From: hatch01 <42416805+hatch01@users.noreply.github.com>
Date: Mon, 15 Jun 2026 17:19:27 +0700
Subject: [PATCH 05/85] john: add olefile deps to fix office2john.py
---
pkgs/by-name/jo/john/package.nix | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pkgs/by-name/jo/john/package.nix b/pkgs/by-name/jo/john/package.nix
index ffb0d96558b1..7378febe2b92 100644
--- a/pkgs/by-name/jo/john/package.nix
+++ b/pkgs/by-name/jo/john/package.nix
@@ -95,6 +95,10 @@ stdenv.mkDerivation {
scapy
lxml
])
+ # For office2john.py
+ ++ (with python3Packages; [
+ olefile
+ ])
++ (with perlPackages; [
# For pass_gen.pl
DigestMD4
From 306f15149a68c96d28b4faaf13e6bc5d86f528ce Mon Sep 17 00:00:00 2001
From: Harinn
Date: Mon, 15 Jun 2026 21:33:15 +0700
Subject: [PATCH 06/85] python3Packages.xstatic-bootbox: migrate to pyproject
---
pkgs/development/python-modules/xstatic-bootbox/default.nix | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/xstatic-bootbox/default.nix b/pkgs/development/python-modules/xstatic-bootbox/default.nix
index 6f37fd300306..823cc84e3df4 100644
--- a/pkgs/development/python-modules/xstatic-bootbox/default.nix
+++ b/pkgs/development/python-modules/xstatic-bootbox/default.nix
@@ -2,12 +2,13 @@
buildPythonPackage,
lib,
fetchPypi,
+ setuptools,
}:
buildPythonPackage rec {
pname = "xstatic-bootbox";
version = "5.5.1.1";
- format = "setuptools";
+ pyproject = true;
src = fetchPypi {
pname = "XStatic-Bootbox";
@@ -15,6 +16,8 @@ buildPythonPackage rec {
sha256 = "4b2120bb33a1d8ada8f9e0532ad99987aa03879b17b08bfdc6b8326d6eb7c205";
};
+ build-system = [ setuptools ];
+
# no tests implemented
doCheck = false;
From 5f8a935b506d612f249692d28ee2487134a80301 Mon Sep 17 00:00:00 2001
From: Harinn
Date: Mon, 15 Jun 2026 21:34:19 +0700
Subject: [PATCH 07/85] python3Packages.xstatic-bootbox: modernize
---
.../python-modules/xstatic-bootbox/default.nix | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/python-modules/xstatic-bootbox/default.nix b/pkgs/development/python-modules/xstatic-bootbox/default.nix
index 823cc84e3df4..b5055ab08a7e 100644
--- a/pkgs/development/python-modules/xstatic-bootbox/default.nix
+++ b/pkgs/development/python-modules/xstatic-bootbox/default.nix
@@ -5,15 +5,17 @@
setuptools,
}:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
pname = "xstatic-bootbox";
version = "5.5.1.1";
pyproject = true;
+ __structuredAttrs = true;
+
src = fetchPypi {
pname = "XStatic-Bootbox";
- inherit version;
- sha256 = "4b2120bb33a1d8ada8f9e0532ad99987aa03879b17b08bfdc6b8326d6eb7c205";
+ inherit (finalAttrs) version;
+ hash = "sha256-SyEguzOh2K2o+eBTKtmZh6oDh5sXsIv9xrgybW63wgU=";
};
build-system = [ setuptools ];
@@ -21,10 +23,12 @@ buildPythonPackage rec {
# no tests implemented
doCheck = false;
+ pythonImportsCheck = [ "xstatic.pkg.bootbox" ];
+
meta = {
homepage = "https://bootboxjs.com";
description = "Bootboxjs packaged static files for python";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ makefu ];
};
-}
+})
From a244d9ae7f72f2a0ca5a49417102d8a702b59db0 Mon Sep 17 00:00:00 2001
From: Harinn
Date: Mon, 15 Jun 2026 21:44:48 +0700
Subject: [PATCH 08/85] python3Packages.xstatic-jquery: migrate to pyproject
---
pkgs/development/python-modules/xstatic-jquery/default.nix | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/xstatic-jquery/default.nix b/pkgs/development/python-modules/xstatic-jquery/default.nix
index d503a4b38e3a..68ba4b118430 100644
--- a/pkgs/development/python-modules/xstatic-jquery/default.nix
+++ b/pkgs/development/python-modules/xstatic-jquery/default.nix
@@ -2,12 +2,13 @@
buildPythonPackage,
lib,
fetchPypi,
+ setuptools,
}:
buildPythonPackage (finalAttrs: {
pname = "xstatic-jquery";
version = "3.5.1.1";
- format = "setuptools";
+ pyproject = true;
src = fetchPypi {
pname = "XStatic-jQuery";
@@ -15,6 +16,8 @@ buildPythonPackage (finalAttrs: {
sha256 = "e0ae8f8ec5bbd28045ba4bca06767a38bd5fc27cf9b71f434589f59370dcd323";
};
+ build-system = [ setuptools ];
+
# no tests implemented
doCheck = false;
From 0b54644fec117d1fcf27f91b5356752e6187b48f Mon Sep 17 00:00:00 2001
From: Harinn
Date: Mon, 15 Jun 2026 21:46:14 +0700
Subject: [PATCH 09/85] python3Packages.xstatic-jquery: modernize
---
pkgs/development/python-modules/xstatic-jquery/default.nix | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/xstatic-jquery/default.nix b/pkgs/development/python-modules/xstatic-jquery/default.nix
index 68ba4b118430..8cfdffcf72c5 100644
--- a/pkgs/development/python-modules/xstatic-jquery/default.nix
+++ b/pkgs/development/python-modules/xstatic-jquery/default.nix
@@ -10,10 +10,12 @@ buildPythonPackage (finalAttrs: {
version = "3.5.1.1";
pyproject = true;
+ __structuredAttrs = true;
+
src = fetchPypi {
pname = "XStatic-jQuery";
inherit (finalAttrs) version;
- sha256 = "e0ae8f8ec5bbd28045ba4bca06767a38bd5fc27cf9b71f434589f59370dcd323";
+ hash = "sha256-4K6PjsW70oBFukvKBnZ6OL1fwnz5tx9DRYn1k3Dc0yM=";
};
build-system = [ setuptools ];
@@ -21,6 +23,8 @@ buildPythonPackage (finalAttrs: {
# no tests implemented
doCheck = false;
+ pythonImportsCheck = [ "xstatic.pkg.jquery" ];
+
meta = {
homepage = "https://jquery.org";
description = "jquery packaged static files for python";
From bced4a03e7549a28e3ba3d20cc4957112ffe4bab Mon Sep 17 00:00:00 2001
From: Thomas Gebert
Date: Wed, 17 Jun 2026 18:05:33 -0400
Subject: [PATCH 10/85] lightworks: 2025.1 -> 2025.2
Add tombert to maintainers.
---
pkgs/by-name/li/lightworks/package.nix | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/pkgs/by-name/li/lightworks/package.nix b/pkgs/by-name/li/lightworks/package.nix
index 26d0fea55968..288e1b8be5bd 100644
--- a/pkgs/by-name/li/lightworks/package.nix
+++ b/pkgs/by-name/li/lightworks/package.nix
@@ -27,6 +27,7 @@
gmp,
libdrm,
libpulseaudio,
+ sndio,
}:
let
fullPath = lib.makeLibraryPath [
@@ -53,18 +54,19 @@ let
gmp
libdrm
libpulseaudio
+ sndio
];
lightworks = stdenv.mkDerivation rec {
- version = "2025.1";
- rev = "148287";
+ version = "2025.2";
+ rev = "56356";
pname = "lightworks";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
- url = "https://cdn.lwks.com/releases/${version}/lightworks_${version}_r${rev}.deb";
- sha256 = "sha256-opYbWzZYim5wqSaxDeGmc10XxFkkE521PDB8OULh7Jc=";
+ url = "https://cdn.lwks.com/releases/${version}/Lightworks-${version}-${rev}.deb";
+ sha256 = "sha256-MQsXl10I85qHiOosBEpdrLPq3iIiFlzumQv2R2sXNn8=";
}
else
throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
@@ -125,6 +127,7 @@ buildFHSEnv {
antonxy
vojta001
kashw2
+ tombert
];
platforms = [ "x86_64-linux" ];
};
From 0f9a116cf5e69a03b94ec396cc86b26c13dc24b4 Mon Sep 17 00:00:00 2001
From: Bobbe
Date: Fri, 12 Jun 2026 16:38:56 +0200
Subject: [PATCH 11/85] maintainers: add 30350n
---
maintainers/maintainer-list.nix | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 42c0657a8c62..799408a70077 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -208,6 +208,11 @@
github = "2hexed";
githubId = 54501296;
};
+ _30350n = {
+ name = "Max Schlecht";
+ github = "30350n";
+ githubId = 34186858;
+ };
_360ied = {
name = "Brian Zhu";
email = "therealbarryplayer@gmail.com";
From 2c443cbed0420ebd61b27f70a07edf892b71a1bf Mon Sep 17 00:00:00 2001
From: Rasmus Enevoldsen
Date: Sat, 28 Feb 2026 22:42:04 +0100
Subject: [PATCH 12/85] octavePackages.control: 3.6.1 -> 4.2.1
Added fetchSubmodules to let control fetch slicot-reference.
Added updateScript, so it gets updates more often.
---
.../octave-modules/control/default.nix | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/octave-modules/control/default.nix b/pkgs/development/octave-modules/control/default.nix
index 4ba5c2f90799..afc3976c2eef 100644
--- a/pkgs/development/octave-modules/control/default.nix
+++ b/pkgs/development/octave-modules/control/default.nix
@@ -6,17 +6,19 @@
lapack,
blas,
autoreconfHook,
+ nix-update-script,
}:
buildOctavePackage rec {
pname = "control";
- version = "3.6.1";
+ version = "4.2.1";
src = fetchFromGitHub {
owner = "gnu-octave";
repo = "pkg-control";
- tag = "control-${version}";
- sha256 = "sha256-7beEsdrne50NY4lGCotxGXwwWnMzUR2CKCc20OCjd0g=";
+ tag = "${pname}-${version}";
+ fetchSubmodules = true;
+ sha256 = "sha256-NOZi003brDQ5nVyP7w5n7hxhafbiBwMPErhhTQhn2bw=";
};
# Running autoreconfHook inside the src directory fixes a compile issue about
@@ -41,6 +43,13 @@ buildOctavePackage rec {
blas
];
+ passthru.updateScript = nix-update-script {
+ extraArgs = [
+ "--version-regex"
+ "control-(.*)"
+ ];
+ };
+
meta = {
homepage = "https://gnu-octave.github.io/packages/control/";
license = lib.licenses.gpl3Plus;
From bc469214f96891e72cef0bff270495c09c1ff19e Mon Sep 17 00:00:00 2001
From: Jan C Kaldestad
Date: Mon, 22 Jun 2026 08:15:18 +0200
Subject: [PATCH 13/85] kcl: 0.12.3 -> 0.12.4
---
pkgs/by-name/kc/kcl/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix
index 79c57ceca027..c6c1e4a70e65 100644
--- a/pkgs/by-name/kc/kcl/package.nix
+++ b/pkgs/by-name/kc/kcl/package.nix
@@ -11,16 +11,16 @@
buildGoModule (finalAttrs: {
pname = "kcl";
- version = "0.12.3";
+ version = "0.12.4";
src = fetchFromGitHub {
owner = "kcl-lang";
repo = "cli";
rev = "v${finalAttrs.version}";
- hash = "sha256-vOdL+It8wY+U0Jt68KPAxMe3th0muaCXlEkuEphCVVY=";
+ hash = "sha256-jtAfFwgtIP2sJRH4RcGTgVn/S5yvA15q3u2xeWus/8s=";
};
- vendorHash = "sha256-NfRVgGtm8w/K0utb3/AlBfT71txpmJlOaFrdqGC8Dkg=";
+ vendorHash = "sha256-aKXfVDu3uTEeSzs4nVWQMUj+HaVkzk+iTr+lti+Yb6E=";
subPackages = [ "cmd/kcl" ];
From 22b2a5912313c20e95ad940b3f62633dddfea35a Mon Sep 17 00:00:00 2001
From: Jan C Kaldestad
Date: Mon, 22 Jun 2026 13:12:58 +0200
Subject: [PATCH 14/85] kcl: fix installCheckPhase for new run subcommand
---
pkgs/by-name/kc/kcl/package.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix
index c6c1e4a70e65..3b36c50c5afb 100644
--- a/pkgs/by-name/kc/kcl/package.nix
+++ b/pkgs/by-name/kc/kcl/package.nix
@@ -51,7 +51,7 @@ buildGoModule (finalAttrs: {
runHook preInstallCheck
set -o pipefail
$out/bin/kcl --version | grep $version
- $out/bin/kcl <(echo 'hello = "KCL"') | grep "hello: KCL"
+ $out/bin/kcl run <(echo 'hello = "KCL"') | grep "hello: KCL"
runHook postInstallCheck
'';
From e63956b77f1c98371173a1307f55f6000a19f0b3 Mon Sep 17 00:00:00 2001
From: Vera Aguilera Puerto
Date: Sat, 20 Jun 2026 11:07:05 +0200
Subject: [PATCH 15/85] smartgit: 24.1.5 -> 26.1.038
---
pkgs/by-name/sm/smartgit/package.nix | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/pkgs/by-name/sm/smartgit/package.nix b/pkgs/by-name/sm/smartgit/package.nix
index 3de1113f331e..b3195420c298 100644
--- a/pkgs/by-name/sm/smartgit/package.nix
+++ b/pkgs/by-name/sm/smartgit/package.nix
@@ -1,5 +1,6 @@
{
lib,
+ git,
stdenv,
fetchurl,
makeDesktopItem,
@@ -16,13 +17,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "smartgit";
- version = "24.1.5";
+ version = "26.1.038";
src = fetchurl {
- url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${
+ url = "https://download.smartgit.dev/smartgit/smartgit-${
builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
- }.tar.gz";
- hash = "sha256-YqueTbwA9KcXEJG5TeWkPzzNyAnnJQ1+VQYsqZKS2/I=";
+ }-no-git-linux-amd64.tar.gz";
+ hash = "sha256-XyMdojfyaTS3S3felGRvOOazx1mym/wE3j4GyCU9crc=";
};
nativeBuildInputs = [ wrapGAppsHook3 ];
@@ -37,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
gappsWrapperArgs+=( \
--prefix PATH : ${
lib.makeBinPath [
+ git
jre
which
]
@@ -103,11 +105,11 @@ stdenv.mkDerivation (finalAttrs: {
SmartGit is a multi-platform Git GUI client, free to use for active Open Source developers and users from academic institutions.
Command line Git is required.
'';
- homepage = "https://www.syntevo.com/smartgit/";
- changelog = "https://www.syntevo.com/smartgit/changelog-${lib.versions.majorMinor finalAttrs.version}.txt";
+ homepage = "https://www.smartgit.dev/";
+ changelog = "https://www.smartgit.dev/changelogs/changelog-${lib.versions.majorMinor finalAttrs.version}.txt";
license = lib.licenses.unfree;
mainProgram = "smartgit";
- platforms = lib.platforms.linux;
+ platforms = [ "x86_64-linux" ];
maintainers = with lib.maintainers; [
jraygauthier
tmssngr
From 1d7a8283eefd955657392db2ddd824b36460b0b3 Mon Sep 17 00:00:00 2001
From: Adam Thompson-Sharpe
Date: Mon, 22 Jun 2026 22:44:48 -0400
Subject: [PATCH 16/85] garage-webui: drop
Hasn't been updated or had a release in 9 months and depends on an EOL
version of pnpm (v9).
---
pkgs/by-name/ga/garage-webui/package.nix | 75 ------------------------
pkgs/top-level/aliases.nix | 1 +
2 files changed, 1 insertion(+), 75 deletions(-)
delete mode 100644 pkgs/by-name/ga/garage-webui/package.nix
diff --git a/pkgs/by-name/ga/garage-webui/package.nix b/pkgs/by-name/ga/garage-webui/package.nix
deleted file mode 100644
index a0d4b336b0ec..000000000000
--- a/pkgs/by-name/ga/garage-webui/package.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{
- lib,
- stdenv,
- fetchFromGitHub,
- buildGoModule,
- nodejs,
- pnpm_9,
- fetchPnpmDeps,
- pnpmConfigHook,
- nix-update-script,
-}:
-buildGoModule (finalAttrs: {
- pname = "garage-webui";
- version = "1.1.0";
-
- src = fetchFromGitHub {
- owner = "khairul169";
- repo = "garage-webui";
- tag = finalAttrs.version;
- hash = "sha256-bqUAhZBSQkWZ1QsgPslEUDwt8NOg25Os0NGlPoyjPL4=";
- };
-
- frontend = stdenv.mkDerivation (finalAttrs': {
- pname = "${finalAttrs.pname}-frontend";
- inherit (finalAttrs) version src;
-
- nativeBuildInputs = [
- nodejs
- pnpmConfigHook
- pnpm_9
- ];
-
- pnpmDeps = fetchPnpmDeps {
- inherit (finalAttrs') pname version src;
- pnpm = pnpm_9;
- fetcherVersion = 3;
- hash = "sha256-z/Y9q/SE2c/KYzIOAfATlprjr6NjmmUHQB+ZbO39OK4=";
- };
-
- buildPhase = ''
- runHook preBuild
- pnpm run build
- runHook postBuild
- '';
-
- installPhase = ''
- runHook preInstall
- cp -r dist $out/
- runHook postInstall
- '';
- });
-
- preBuild = ''
- cp -r ${finalAttrs.frontend} ./ui/dist
- '';
-
- modRoot = "./backend";
- tags = [ "prod" ];
- env.CGO_ENABLED = 0;
- vendorHash = "sha256-7z6r6w/SbBlYYHMxm11xFl/QEYZc2KebnOJZRgYRUYk=";
-
- passthru = {
- updateScript = nix-update-script { };
- };
-
- meta = {
- description = "Simple admin web UI for Garage";
- homepage = "https://github.com/khairul169/garage-webui";
- changelog = "https://github.com/khairul169/garage-webui/releases/tag/${finalAttrs.version}";
- mainProgram = "garage-webui";
- license = lib.licenses.mit;
- platforms = lib.platforms.all;
- maintainers = with lib.maintainers; [ griffi-gh ];
- };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b31726dc2518..221ffe735461 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -860,6 +860,7 @@ mapAliases {
gamecube-tools = throw "gamecube-tools was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
gamehub = throw "'gamehub' has been removed as it was archived upstream and depended on webkitgtk 4.0"; # Added 2026-06-07
gandi-cli = throw "'gandi-cli' has been removed as it is unmaintained upstream"; # Added 2026-01-11
+ garage-webui = throw "'garage-webui' has been removed as it is unmaintained upstream"; # Added 2026-06-23
garage_0_8 = throw "'garage_0_8' has been removed as it is unmaintained upstream"; # Added 2025-06-23
garage_0_8_7 = throw "'garage_0_8_7' has been removed as it is unmaintained upstream"; # Added 2025-06-23
garage_0_9 = throw "'garage_0_9' has been removed as it is unmaintained upstream"; # Added 2025-09-16
From e6b897761cd512d09728b01f6aae37840224dac6 Mon Sep 17 00:00:00 2001
From: Cole <65095161+zeusec@users.noreply.github.com>
Date: Tue, 23 Jun 2026 07:08:03 -0500
Subject: [PATCH 17/85] nvidia-container-toolkit: 1.18.2 -> 1.19.1
---
.../0001-Add-dlopen-discoverer.patch | 59 ++++++++++---------
.../nv/nvidia-container-toolkit/package.nix | 10 +++-
2 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/0001-Add-dlopen-discoverer.patch b/pkgs/by-name/nv/nvidia-container-toolkit/0001-Add-dlopen-discoverer.patch
index ddc7d34ac7c1..9aa0b786678e 100644
--- a/pkgs/by-name/nv/nvidia-container-toolkit/0001-Add-dlopen-discoverer.patch
+++ b/pkgs/by-name/nv/nvidia-container-toolkit/0001-Add-dlopen-discoverer.patch
@@ -1,20 +1,20 @@
-From e4449f06a8989ff22947309151855b388c311aed Mon Sep 17 00:00:00 2001
+From 0db315c9ca1e8f2144edf020aa4dd309e889d4d1 Mon Sep 17 00:00:00 2001
From: Jared Baur
Date: Mon, 22 Jan 2024 20:42:48 -0800
Subject: [PATCH] Add dlopen discoverer
---
- internal/lookup/dlopen.go | 57 ++++++++++++++++++++++++++++++++++++++
- internal/lookup/library.go | 3 ++
- 2 files changed, 60 insertions(+)
- create mode 100644 internal/lookup/dlopen.go
+ pkg/lookup/dlopen.go | 63 +++++++++++++++++++++++++++++++++++++++++++
+ pkg/lookup/library.go | 1 +
+ 2 files changed, 64 insertions(+)
+ create mode 100644 pkg/lookup/dlopen.go
-diff --git a/internal/lookup/dlopen.go b/internal/lookup/dlopen.go
+diff --git a/pkg/lookup/dlopen.go b/pkg/lookup/dlopen.go
new file mode 100644
-index 00000000..7cd84522
+index 0000000..7af8ca0
--- /dev/null
-+++ b/internal/lookup/dlopen.go
-@@ -0,0 +1,57 @@
++++ b/pkg/lookup/dlopen.go
+@@ -0,0 +1,63 @@
+package lookup
+
+// #cgo LDFLAGS: -ldl
@@ -35,11 +35,17 @@ index 00000000..7cd84522
+ file
+}
+
-+// NewDlopenLocator creats a locator that can be used for locating libraries
++// NewDlopenLocator creates a locator that can be used for locating libraries
+// through the dlopen mechanism.
+func NewDlopenLocator(opts ...Option) Locator {
-+ f := newFileLocator(opts...)
-+ d := dlopenLocator{file: *f}
++ o := NewFactory(opts...)
++ f := file{
++ logger: o.logger,
++ filter: o.filter,
++ count: o.count,
++ prefixes: getSearchPrefixes(o.root, o.searchPaths...),
++ }
++ d := dlopenLocator{file: f}
+ return &d
+}
+
@@ -72,19 +78,18 @@ index 00000000..7cd84522
+
+ return []string{libAbsolutePath}, nil
+}
-diff --git a/internal/lookup/library.go b/internal/lookup/library.go
-index 7f5cf7c8..916edde2 100644
---- a/internal/lookup/library.go
-+++ b/internal/lookup/library.go
-@@ -61,7 +61,10 @@ func NewLibraryLocator(opts ...Option) Locator {
- // We construct a symlink locator for expected library locations.
- symlinkLocator := NewSymlinkLocator(opts...)
-
-+ dlopenLocator := NewDlopenLocator(opts...)
-+
- l := First(
-+ dlopenLocator,
- symlinkLocator,
- newLdcacheLocator(opts...),
+diff --git a/pkg/lookup/library.go b/pkg/lookup/library.go
+index e57bd0e..adeff77 100644
+--- a/pkg/lookup/library.go
++++ b/pkg/lookup/library.go
+@@ -51,6 +51,7 @@ func NewLibraryLocator(opts ...Option) Locator {
+ }...),
)
---
+ l := First(
++ NewDlopenLocator(opts...),
+ NewSymlinkLocator(opts...),
+ f.newLdcacheLocator(),
+ )
+--
+2.54.0
+
diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
index 395084b81afa..96381c58dea4 100644
--- a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
+++ b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
@@ -13,13 +13,13 @@ let
in
buildGoModule (finalAttrs: {
pname = "nvidia-container-toolkit";
- version = "1.18.2";
+ version = "1.19.1";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = "nvidia-container-toolkit";
tag = "v${finalAttrs.version}";
- hash = "sha256-OMM7IQ65jPr9I5YUwVR3SXbuARnLjS2GSVq2j4J8uFY=";
+ hash = "sha256-0ivgJA5JY/17FIoOrOvUF7NjMMu7aXfh39sMQcabCm8=";
};
@@ -33,11 +33,15 @@ buildGoModule (finalAttrs: {
patches = [
# This patch causes library lookups to first attempt loading via dlopen
# before falling back to the regular symlink location and ldcache location.
+ # Required on NixOS, where the driver libraries live outside the ldcache and
+ # the FHS paths that the upstream locators search. Upstream tried to add an
+ # equivalent locator but reverted it; tracked in
+ # https://github.com/NVIDIA/nvidia-container-toolkit/issues/1677
./0001-Add-dlopen-discoverer.patch
];
postPatch = ''
- substituteInPlace internal/config/config.go \
+ substituteInPlace api/config/v1/config.go \
--replace-fail '/usr/bin/nvidia-container-runtime-hook' "$tools/bin/nvidia-container-runtime-hook" \
--replace-fail '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig'
From 72e9150e24cd99b75a98706a7a02043fd8168566 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Wed, 24 Jun 2026 11:24:31 +0000
Subject: [PATCH 18/85] level-zero: 1.29.0 -> 1.31.0
---
pkgs/by-name/le/level-zero/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/le/level-zero/package.nix b/pkgs/by-name/le/level-zero/package.nix
index 0d3fdf208a5a..6eca9754361b 100644
--- a/pkgs/by-name/le/level-zero/package.nix
+++ b/pkgs/by-name/le/level-zero/package.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "level-zero";
- version = "1.29.0";
+ version = "1.31.0";
src = fetchFromGitHub {
owner = "oneapi-src";
repo = "level-zero";
tag = "v${finalAttrs.version}";
- hash = "sha256-2OtJoVO8C9E1bf2uQv01O99wtuguINRSX4dCM6S93ns=";
+ hash = "sha256-/3HVvivHKSwvrrFEU7LHP2H/6bHDBDyI1SVr/3A6Ie0=";
};
nativeBuildInputs = [
From 9a792a7ac3a4fb4a8e04f0a189b48ecc262f3b34 Mon Sep 17 00:00:00 2001
From: Dom Rodriguez
Date: Wed, 24 Jun 2026 18:48:08 +0100
Subject: [PATCH 19/85] deskflow: Run tests sequentially to prevent race
conditions
Deskflow writes to a config file and reads it back during `checkPhase`
(specifically, the unit tests), and due to parallelism, this causes a
race condition, and fails the unit tests.
This commit disables the implicit tests that run during build with
CMake, and *explicitly* runs the unit tests in `checkPhase`, with `-j1`,
as well as the legacy tests, which mean the tests will not race against
the same file.
Relates to build failure in #503256.
---
pkgs/by-name/de/deskflow/package.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/by-name/de/deskflow/package.nix b/pkgs/by-name/de/deskflow/package.nix
index e391c3410856..8a2d5dd2893f 100644
--- a/pkgs/by-name/de/deskflow/package.nix
+++ b/pkgs/by-name/de/deskflow/package.nix
@@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
"-DCMAKE_SKIP_RPATH=ON" # Avoid generating incorrect RPATH
+ "-DSKIP_BUILD_TESTS=ON" # Perform unit tests in `checkPhase` manually, with one job at a time.
];
strictDeps = true;
@@ -99,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
runHook preCheck
export QT_QPA_PLATFORM=offscreen
+ ctest --test-dir "src/unittests" --output-on-failure
./bin/legacytests
runHook postCheck
From 00326c11b66f4ba5a9958ec5685471a6a27d1bb4 Mon Sep 17 00:00:00 2001
From: Raphael Borun Das Gupta
Date: Wed, 24 Jun 2026 22:24:16 +0200
Subject: [PATCH 20/85] guile-hoot: partially under LGPL v3 or later
---
pkgs/by-name/gu/guile-hoot/package.nix | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pkgs/by-name/gu/guile-hoot/package.nix b/pkgs/by-name/gu/guile-hoot/package.nix
index 6849a75af93a..5ad9b2776c0f 100644
--- a/pkgs/by-name/gu/guile-hoot/package.nix
+++ b/pkgs/by-name/gu/guile-hoot/package.nix
@@ -62,7 +62,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Scheme to WebAssembly compiler backend for GNU Guile and a general purpose WASM toolchain";
homepage = "https://codeberg.org/spritely/hoot";
- license = lib.licenses.asl20;
+ license = with lib.licenses; [
+ asl20
+ lgpl3Plus
+ ];
maintainers = with lib.maintainers; [ jinser ];
platforms = lib.platforms.unix;
mainProgram = "hoot";
From 8e409819380e1484c92cfc11673f97b06fad86d7 Mon Sep 17 00:00:00 2001
From: Raphael Borun Das Gupta
Date: Wed, 24 Jun 2026 21:47:54 +0200
Subject: [PATCH 21/85] =?UTF-8?q?guile-hoot:=200.8.0=20=E2=86=92=200.9.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkgs/by-name/gu/guile-hoot/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/gu/guile-hoot/package.nix b/pkgs/by-name/gu/guile-hoot/package.nix
index 6849a75af93a..3e08c19f5284 100644
--- a/pkgs/by-name/gu/guile-hoot/package.nix
+++ b/pkgs/by-name/gu/guile-hoot/package.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "guile-hoot";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchFromCodeberg {
owner = "spritely";
repo = "hoot";
tag = "v${finalAttrs.version}";
- hash = "sha256-b372dMUsDTa+hYrOwvj+/YcwVP52BCJxwSGRaqSSWZs=";
+ hash = "sha256-ZzWGdLKiJF9lBKrlX7jCKnPlmWRi1dDB4zrfkIOMpQU=";
};
nativeBuildInputs = [
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
libs = [ "$out" ] ++ finalAttrs.propagatedBuildInputs;
in
''
- cp ./repl/repl.js $out/share/guile-hoot/0.8.0/repl/repl.js
+ cp ./repl/repl.js $out/share/guile-hoot/${finalAttrs.version}/repl/repl.js
wrapProgram $out/bin/hoot \
--prefix GUILE_LOAD_PATH : ${lib.makeSearchPath guile.siteDir libs} \
--prefix GUILE_LOAD_COMPILED_PATH : ${lib.makeSearchPath guile.siteCcacheDir libs}
From b6b3c09229fd2ee34546ee6389d873a01a17b48a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?=
Date: Thu, 25 Jun 2026 11:53:30 +0200
Subject: [PATCH 22/85] nixos/chrony: restart service
---
nixos/modules/services/networking/ntp/chrony.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix
index 8dac1de5c574..628fb09ed156 100644
--- a/nixos/modules/services/networking/ntp/chrony.nix
+++ b/nixos/modules/services/networking/ntp/chrony.nix
@@ -300,6 +300,7 @@ in
serviceConfig = {
Type = "notify";
ExecStart = "${chronyPkg}/bin/chronyd ${toString chronyFlags}";
+ Restart = "on-failure";
# Proc filesystem
ProcSubset = "pid";
From 26b2005253b303a716a59959c3bba3a4b050e63d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?=
Date: Thu, 25 Jun 2026 09:00:53 -0300
Subject: [PATCH 23/85] lxqt.lxqt-wayland-session: 0.4.0 -> 0.4.1
Diff: https://github.com/lxqt/lxqt-wayland-session/compare/0.4.0...0.4.1
---
pkgs/desktops/lxqt/lxqt-wayland-session/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
index 2f08d2cb4800..881e7bc67a4d 100644
--- a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "lxqt-wayland-session";
- version = "0.4.0";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = "lxqt-wayland-session";
rev = version;
- hash = "sha256-QmknSFJLmAy3OxU9jv6xMAAxQXlWuUcuPNHDs8r2/ls=";
+ hash = "sha256-7wNp1a+JCnFu2h391KUeNRlZqybA5gY3ZCciYbIx5Rs=";
};
nativeBuildInputs = [
From d83c2d821bed18d52654d914c4d4e6b1001cb7fb Mon Sep 17 00:00:00 2001
From: Bobbe
Date: Fri, 19 Jun 2026 00:52:15 +0200
Subject: [PATCH 24/85] camera-streamer: init at 0.4.2
---
pkgs/by-name/ca/camera-streamer/package.nix | 80 +++++++++++++++++++++
1 file changed, 80 insertions(+)
create mode 100644 pkgs/by-name/ca/camera-streamer/package.nix
diff --git a/pkgs/by-name/ca/camera-streamer/package.nix b/pkgs/by-name/ca/camera-streamer/package.nix
new file mode 100644
index 000000000000..25503cf16bcb
--- /dev/null
+++ b/pkgs/by-name/ca/camera-streamer/package.nix
@@ -0,0 +1,80 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ cmake,
+ makeWrapper,
+ pkg-config,
+ which,
+ xxd,
+ ffmpeg,
+ libcamera,
+ live555,
+ openssl,
+ v4l-utils,
+}:
+stdenv.mkDerivation rec {
+ pname = "camera-streamer";
+ version = "0.4.2";
+
+ __structuredAttrs = true;
+
+ src = fetchFromGitHub {
+ owner = "ayufan";
+ repo = "camera-streamer";
+ tag = "v${version}";
+ hash = "sha256-umU8Rp8+wUvQCNK8OpgND/6gPD013SB6sdXSLy5UGAQ=";
+ fetchSubmodules = true;
+ };
+
+ # not sure why the -Werror isn't being an issue for the project maintainer
+ # my best guess is it's because the project README specifices
+ # "Debian Bookworm" as a requirement which provides gcc12 by default
+ postPatch = ''
+ sed -i 's|git submodule update.*||' Makefile
+ substituteInPlace Makefile --replace-warn "-Werror" ""
+ '';
+
+ strictDeps = true;
+
+ nativeBuildInputs = [
+ cmake
+ makeWrapper
+ pkg-config
+ which
+ xxd
+ ];
+
+ buildInputs = [
+ ffmpeg
+ libcamera
+ live555
+ openssl
+ ];
+
+ dontUseCmakeConfigure = true;
+
+ makeFlags = [
+ "GIT_VERSION=${src.tag}"
+ "GIT_REVISION=${src.rev}"
+ ];
+
+ installPhase = ''
+ runHook preInstall
+
+ install -D camera-streamer $out/bin/camera-streamer
+ wrapProgram $out/bin/camera-streamer --prefix PATH : ${lib.makeBinPath [ v4l-utils ]}
+
+ runHook postInstall
+ '';
+
+ meta = {
+ homepage = "https://github.com/ayufan/camera-streamer";
+ changelog = "https://github.com/ayufan/camera-streamer/releases/tag/v${version}";
+ description = "High-performance low-latency camera streamer for Raspberry PI's";
+ license = lib.licenses.gpl3Only;
+ maintainers = with lib.maintainers; [ _30350n ];
+ platforms = lib.platforms.linux;
+ mainProgram = "camera-streamer";
+ };
+}
From f284088e8df7357159c49a70693e7a332f51d26a Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk
Date: Thu, 25 Jun 2026 21:58:55 +0200
Subject: [PATCH 25/85] nsd: 4.12.0 -> 4.14.3
We were severely behind on NSD, update to the latest version. 4.14.3 is
a security release that fixes several CVEs, but all of them were
introduced after 4.12.0, so to my knowledge there are no known security
issues with the previous packaged version, so landing this change is not
security-sensitive.
Upstream added a new configure option, --enable-dnstap, which is enabled
by default, so I enabled it by default here too. I didn't tie it to a
NixOS configuration setting because I don't personally use that part and
there is a todo about it, so let's keep the change surface minimal.
---
pkgs/by-name/ns/nsd/package.nix | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/pkgs/by-name/ns/nsd/package.nix b/pkgs/by-name/ns/nsd/package.nix
index e60228f1b7ce..7955413208a5 100644
--- a/pkgs/by-name/ns/nsd/package.nix
+++ b/pkgs/by-name/ns/nsd/package.nix
@@ -2,9 +2,12 @@
lib,
stdenv,
fetchurl,
+ fstrm,
libevent,
openssl,
pkg-config,
+ protobuf,
+ protobufc,
systemdMinimal,
nixosTests,
config,
@@ -14,37 +17,42 @@
bind8Stats ? config.nsd.bind8Stats or false,
checking ? config.nsd.checking or false,
ipv6 ? config.nsd.ipv6 or true,
- mmap ? config.nsd.mmap or false,
minimalResponses ? config.nsd.minimalResponses or true,
+ mmap ? config.nsd.mmap or false,
nsec3 ? config.nsd.nsec3 or true,
ratelimit ? config.nsd.ratelimit or false,
recvmmsg ? config.nsd.recvmmsg or false,
rootServer ? config.nsd.rootServer or false,
rrtypes ? config.nsd.rrtypes or false,
zoneStats ? config.nsd.zoneStats or false,
+ withDnstap ? true,
withSystemd ? config.nsd.withSystemd or (lib.meta.availableOn stdenv.hostPlatform systemdMinimal),
configFile ? config.nsd.configFile or "/etc/nsd/nsd.conf",
}:
stdenv.mkDerivation (finalAttrs: {
pname = "nsd";
- version = "4.12.0";
+ version = "4.14.3";
src = fetchurl {
url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-${finalAttrs.version}.tar.gz";
- hash = "sha256-+ezCz3m6UFgPLfYpGO/EQAhMW/EQV9tEwZqpZDzUteg=";
+ hash = "sha256-limtZNnBsBm74iKW1RSNeuZfWIziZaZCR1B0DwUrsSs=";
};
nativeBuildInputs = [
pkg-config
- ];
+ ]
+ ++ lib.optionals withDnstap [ protobuf ];
buildInputs = [
libevent
openssl
]
- ++ lib.optionals withSystemd [
- systemdMinimal
+ ++ lib.optionals withSystemd [ systemdMinimal ]
+ ++ lib.optionals withDnstap [
+ fstrm
+ # NSD links against libprotobuf-c, it's not just a build-time dependency.
+ protobufc
];
enableParallelBuilding = true;
@@ -73,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
++ edf rootServer "root-server"
++ edf rrtypes "draft-rrtypes"
++ edf zoneStats "zone-stats"
+ ++ edf withDnstap "dnstap"
++ edf withSystemd "systemd"
++ [
"--with-ssl=${openssl.dev}"
From c707a8edaac9a1b8692d89728d07cfc57cf4ffc7 Mon Sep 17 00:00:00 2001
From: Saad Nadeem
Date: Mon, 15 Jun 2026 05:50:23 -0400
Subject: [PATCH 26/85] pipeweaver: init at 0.1.6
---
pkgs/by-name/pi/pipeweaver/package.nix | 126 +++++++++++++++++++++++++
1 file changed, 126 insertions(+)
create mode 100644 pkgs/by-name/pi/pipeweaver/package.nix
diff --git a/pkgs/by-name/pi/pipeweaver/package.nix b/pkgs/by-name/pi/pipeweaver/package.nix
new file mode 100644
index 000000000000..ac386a89f88c
--- /dev/null
+++ b/pkgs/by-name/pi/pipeweaver/package.nix
@@ -0,0 +1,126 @@
+{
+ lib,
+ buildNpmPackage,
+ fetchFromGitHub,
+ rustPlatform,
+ pkg-config,
+ pipewire,
+ nix-update-script,
+ stdenv,
+}:
+
+rustPlatform.buildRustPackage (
+ finalAttrs:
+ let
+ web = buildNpmPackage {
+ pname = "${finalAttrs.pname}-web";
+ inherit (finalAttrs) version src;
+
+ sourceRoot = "${finalAttrs.src.name}/web";
+
+ npmDepsHash = "sha256-ZX/3H/VdRdWC2j+mPA/0rZflDhslqTN1mqA9vvQRQG0=";
+
+ installPhase = ''
+ runHook preInstall
+ cp -r dist $out
+ runHook postInstall
+ '';
+ };
+ in
+ {
+ pname = "pipeweaver";
+ version = "0.1.6";
+
+ __structuredAttrs = true;
+
+ src = fetchFromGitHub {
+ owner = "pipeweaver";
+ repo = "pipeweaver";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-wf3gxCLT5vOz+5+CpfmkX0stKoAOpQ6KIoW6xBNV1xk=";
+ };
+
+ cargoHash = "sha256-Jv0fF6keg2NcUnCJhCId7rwPVZK1/Q9+otQNjp54RCI=";
+
+ nativeBuildInputs = [
+ pkg-config
+ rustPlatform.bindgenHook
+ ];
+
+ buildInputs = [
+ pipewire
+ ];
+
+ cargoBuildFlags = [
+ "--workspace"
+ "--exclude"
+ "pipeweaver-app"
+ "--all-features"
+ ];
+
+ cargoTestFlags = [
+ "--workspace"
+ "--exclude"
+ "pipeweaver-app"
+ "--all-features"
+ ];
+
+ postPatch = ''
+ # Prevent daemon/build.rs from running to prevent impure git and npm calls.
+ rm daemon/build.rs
+ substituteInPlace daemon/Cargo.toml --replace-fail 'build = "build.rs"' ""
+
+ mkdir -p daemon/web-content
+ cp -r ${web}/* daemon/web-content/
+ '';
+
+ # Provide GIT_HASH that build.rs would have set
+ env.GIT_HASH = finalAttrs.src.tag;
+
+ installPhase = ''
+ runHook preInstall
+
+ releaseDir=target/${stdenv.hostPlatform.rust.cargoShortTarget}/release
+
+ install -Dm755 $releaseDir/pipeweaver-daemon -t $out/bin
+ install -Dm755 $releaseDir/pipeweaver-client -t $out/bin
+
+ install -Dm644 daemon/resources/icons/pipeweaver.png \
+ $out/share/icons/hicolor/48x48/apps/pipeweaver.png
+ install -Dm644 daemon/resources/icons/pipeweaver.svg \
+ $out/share/icons/hicolor/scalable/apps/pipeweaver.svg
+ install -Dm644 daemon/resources/icons/pipeweaver-large.png \
+ $out/share/pixmaps/pipeweaver.png
+ install -Dm644 daemon/resources/desktop/pipeweaver.desktop \
+ $out/share/applications/pipeweaver.desktop
+
+ substituteInPlace $out/share/applications/pipeweaver.desktop \
+ --replace-fail "Path=/usr/bin" "Path=$out/bin" \
+ --replace-fail "Exec=/usr/bin/pipeweaver-daemon" "Exec=$out/bin/pipeweaver-daemon"
+
+ install -Dm644 README.md $out/share/doc/pipeweaver/README.md
+ install -Dm644 LICENSE $out/share/licenses/pipeweaver/LICENSE
+
+ runHook postInstall
+ '';
+
+ passthru = {
+ inherit web;
+ updateScript = nix-update-script {
+ extraArgs = [
+ "--subpackage"
+ "web"
+ ];
+ };
+ };
+
+ meta = {
+ description = "Manage streaming audio on Linux through PipeWire with virtual channels, mixing, and routing";
+ homepage = "https://github.com/pipeweaver/pipeweaver";
+ license = lib.licenses.mit;
+ mainProgram = "pipeweaver-daemon";
+ platforms = lib.platforms.linux;
+ maintainers = with lib.maintainers; [ saadndm ];
+ };
+ }
+)
From d19924c50abeea21e4c065c68a6b80edb1f63959 Mon Sep 17 00:00:00 2001
From: Sapi <144389458+tree-sapii@users.noreply.github.com>
Date: Thu, 25 Jun 2026 23:30:11 -0400
Subject: [PATCH 27/85] maintainers: add tree-sapii
---
maintainers/maintainer-list.nix | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 26d7e7fa77b5..431039b38ba0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28359,6 +28359,12 @@
githubId = 5623227;
name = "Quentin Boyer";
};
+ tree-sapii = {
+ email = "supersapiiiiii@gmail.com";
+ github = "tree-sapii";
+ githubId = 144389458;
+ name = "sapii";
+ };
treemo = {
email = "matthieu.chevrier@treemo.fr";
github = "treemo";
From 63ba3230afaf2e6833d2438f49470ebebeff8174 Mon Sep 17 00:00:00 2001
From: Sapi <144389458+tree-sapii@users.noreply.github.com>
Date: Thu, 25 Jun 2026 17:26:17 -0400
Subject: [PATCH 28/85] bitwarden-desktop: 2026.5.0 -> 2026.6.0, migrated to
finalAttrs
---
pkgs/by-name/bi/bitwarden-desktop/package.nix | 36 +++++++++----------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index 5bbbbae658e8..a53954076a30 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -21,19 +21,18 @@
}:
let
- description = "Secure and free password manager for all of your devices";
icon = "bitwarden";
electron = electron_39;
in
-buildNpmPackage rec {
+buildNpmPackage (finalAttrs: {
pname = "bitwarden-desktop";
- version = "2026.5.0";
+ version = "2026.6.0";
src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
- rev = "desktop-v${version}";
- hash = "sha256-R00wt5W4kKmFIODEaGoUqDwfGyHH/2PpiRaC8Gq3d88=";
+ tag = "desktop-v${finalAttrs.version}";
+ hash = "sha256-JIIis3wW0cU33ovRQfJi3HlB2YdLZ5IPvueq1dGFbas=";
};
patches = [
@@ -49,10 +48,6 @@ buildNpmPackage rec {
];
postPatch = ''
- # https://github.com/bitwarden/clients/pull/20480
- substituteInPlace package-lock.json apps/desktop/desktop_native/napi/package.json \
- --replace-fail '"@napi-rs/cli": "3.5.1"' '"@napi-rs/cli": "3.2.0"'
-
# remove code under unfree license
rm -r bitwarden_license
@@ -78,18 +73,18 @@ buildNpmPackage rec {
];
npmWorkspace = "apps/desktop";
- npmDepsFetcherVersion = 2;
- npmDepsHash = "sha256-xmb3zwE8/nWpRlUOgTz2UhNRaUA8KW9sHQHA97pjjfg=";
+ npmDepsFetcherVersion = 3;
+ npmDepsHash = "sha256-mvFLZwWwIv4PbUwfTWvwZ9JyRoHJSwAA0cT4RXD0/YU=";
cargoDeps = rustPlatform.fetchCargoVendor {
- inherit
+ inherit (finalAttrs)
pname
version
src
cargoRoot
patches
;
- hash = "sha256-phvk4t1JKfSYGzm/vm1rT8A0fACHJF/C0WiZ2Lk3cV0=";
+ hash = "sha256-xyK3+z2yfCG9K5XAB6LNEeyqMRknONi6ZfY/3oko7Z8=";
};
cargoRoot = "apps/desktop/desktop_native";
@@ -169,7 +164,7 @@ buildNpmPackage rec {
];
preCheck = ''
- pushd ${cargoRoot}
+ pushd ${finalAttrs.cargoRoot}
cargoCheckType=release
HOME=$(mktemp -d)
'';
@@ -223,7 +218,7 @@ buildNpmPackage rec {
name = "bitwarden";
exec = "bitwarden %U";
inherit icon;
- comment = description;
+ comment = finalAttrs.meta.description;
desktopName = "Bitwarden";
categories = [ "Utility" ];
mimeTypes = [ "x-scheme-handler/bitwarden" ];
@@ -240,11 +235,14 @@ buildNpmPackage rec {
};
meta = {
- changelog = "https://github.com/bitwarden/clients/releases/tag/${src.rev}";
- inherit description;
+ changelog = "https://github.com/bitwarden/clients/releases/tag/${finalAttrs.src.tag}";
+ description = "Secure and free password manager for all of your devices";
homepage = "https://bitwarden.com";
license = lib.licenses.gpl3;
- maintainers = with lib.maintainers; [ amarshall ];
+ maintainers = with lib.maintainers; [
+ tree-sapii
+ amarshall
+ ];
platforms = [
"x86_64-linux"
"aarch64-linux"
@@ -253,4 +251,4 @@ buildNpmPackage rec {
];
mainProgram = "bitwarden";
};
-}
+})
From 9e0ea43999236c56fb09456a686aac6ff4cf6d75 Mon Sep 17 00:00:00 2001
From: Patrick
Date: Mon, 8 Jun 2026 10:38:09 +0200
Subject: [PATCH 29/85] your_spotify: switch to pnpm 11
---
pkgs/by-name/yo/your_spotify/client.nix | 4 ++--
pkgs/by-name/yo/your_spotify/package.nix | 11 +++++------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/pkgs/by-name/yo/your_spotify/client.nix b/pkgs/by-name/yo/your_spotify/client.nix
index 900a50393558..c429ae8c7256 100644
--- a/pkgs/by-name/yo/your_spotify/client.nix
+++ b/pkgs/by-name/yo/your_spotify/client.nix
@@ -6,7 +6,7 @@
pnpmDeps,
apiEndpoint ? "http://localhost:3000",
pnpmConfigHook,
- pnpm_9,
+ pnpm_11,
nodejs,
}:
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [
pnpmConfigHook
- pnpm_9
+ pnpm_11
nodejs
];
diff --git a/pkgs/by-name/yo/your_spotify/package.nix b/pkgs/by-name/yo/your_spotify/package.nix
index ad88f3d79da1..764efd7f0387 100644
--- a/pkgs/by-name/yo/your_spotify/package.nix
+++ b/pkgs/by-name/yo/your_spotify/package.nix
@@ -4,14 +4,13 @@
fetchFromGitHub,
fetchPnpmDeps,
pnpmConfigHook,
- pnpm_9,
+ pnpm_11,
nodejs,
makeWrapper,
callPackage,
nixosTests,
nix-update-script,
}:
-
stdenv.mkDerivation (finalAttrs: {
pname = "your_spotify_server";
version = "1.20.0";
@@ -25,15 +24,15 @@ stdenv.mkDerivation (finalAttrs: {
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
- pnpm = pnpm_9;
- fetcherVersion = 3;
- hash = "sha256-j6COg8Q0uj+5TjN/BUVst2UMhXLT3drLWUzdG/x51rk=";
+ pnpm = pnpm_11;
+ fetcherVersion = 4;
+ hash = "sha256-eUAzQ+LV+RZs/QEb5r7l9cisBjjWU8eGMm2r9ZNXmX8=";
};
nativeBuildInputs = [
makeWrapper
pnpmConfigHook
- pnpm_9
+ pnpm_11
nodejs
];
From cb19bd309b2a1d3a6e6daef372a45ccf2d76bc00 Mon Sep 17 00:00:00 2001
From: pwnwriter
Date: Fri, 26 Jun 2026 09:03:16 -0400
Subject: [PATCH 30/85] box-cli: init at 0.1.112
---
pkgs/by-name/bo/box-cli/package.nix | 42 +++++++++++++++++++++++++++++
pkgs/by-name/bo/box-cli/sources.nix | 22 +++++++++++++++
2 files changed, 64 insertions(+)
create mode 100644 pkgs/by-name/bo/box-cli/package.nix
create mode 100644 pkgs/by-name/bo/box-cli/sources.nix
diff --git a/pkgs/by-name/bo/box-cli/package.nix b/pkgs/by-name/bo/box-cli/package.nix
new file mode 100644
index 000000000000..d153e44b49f3
--- /dev/null
+++ b/pkgs/by-name/bo/box-cli/package.nix
@@ -0,0 +1,42 @@
+{
+ lib,
+ stdenv,
+ fetchurl,
+ installShellFiles,
+}:
+
+let
+ sources = import ./sources.nix;
+in
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "box-cli";
+ version = "0.1.112";
+
+ strictDeps = true;
+ __structuredAttrs = true;
+
+ src = fetchurl sources.${stdenv.hostPlatform.system};
+
+ dontUnpack = true;
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm755 $src $out/bin/box
+
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "CLI for Ascii Box cloud sandboxes";
+ homepage = "https://ascii.dev";
+ license = lib.licenses.unfree;
+ sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+ maintainers = with lib.maintainers; [ pwnwriter ];
+ mainProgram = "box";
+ platforms = lib.attrNames sources;
+ };
+})
diff --git a/pkgs/by-name/bo/box-cli/sources.nix b/pkgs/by-name/bo/box-cli/sources.nix
new file mode 100644
index 000000000000..9aab3af13384
--- /dev/null
+++ b/pkgs/by-name/bo/box-cli/sources.nix
@@ -0,0 +1,22 @@
+# NOTE:
+# To update: run `nix-prefetch-url` for each platform URL and convert to SRI hash.
+# URLs: https://ascii.dev/api/box/cli/download?platform={platform}&channel=ascii-prod
+# Last updated: 2026-06-26
+{
+ x86_64-linux = {
+ url = "https://ascii.dev/api/box/cli/download?platform=linux-x64&channel=ascii-prod";
+ hash = "sha256-DWQNenz/pmFVH5QM554lBk6+RwgOCjCBe7p+ZkHADTI=";
+ };
+ aarch64-linux = {
+ url = "https://ascii.dev/api/box/cli/download?platform=linux-arm64&channel=ascii-prod";
+ hash = "sha256-V2Sk6C1ZTRWlYQ2bVQTvK6PU8BkBPkmJMjUAo2Ul6+Q=";
+ };
+ x86_64-darwin = {
+ url = "https://ascii.dev/api/box/cli/download?platform=darwin-x64&channel=ascii-prod";
+ hash = "sha256-QI+ecq0O4dkKqdIvkONcYdXsS+EQLFIU35ulKGNSCRE=";
+ };
+ aarch64-darwin = {
+ url = "https://ascii.dev/api/box/cli/download?platform=darwin-arm64&channel=ascii-prod";
+ hash = "sha256-cyjMUGkWfNOggvtBfVqCijmcAj0P2SuFQORwg9EWbn0=";
+ };
+}
From 0eaee353c729ca5719a00a743f7c28673fa5a8c9 Mon Sep 17 00:00:00 2001
From: eymeric
Date: Wed, 20 May 2026 14:49:28 +0200
Subject: [PATCH 31/85] open-stage-control-headless: init at 1.30.3
---
.../open-stage-control-headless/package.nix | 56 +++++++++++++++++++
pkgs/top-level/aliases.nix | 2 +-
2 files changed, 57 insertions(+), 1 deletion(-)
create mode 100644 pkgs/by-name/op/open-stage-control-headless/package.nix
diff --git a/pkgs/by-name/op/open-stage-control-headless/package.nix b/pkgs/by-name/op/open-stage-control-headless/package.nix
new file mode 100644
index 000000000000..5e862b509196
--- /dev/null
+++ b/pkgs/by-name/op/open-stage-control-headless/package.nix
@@ -0,0 +1,56 @@
+{
+ lib,
+ stdenv,
+ fetchzip,
+ unzip,
+ makeWrapper,
+ nodejs,
+ python3,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "open-stage-control-headless";
+ version = "1.30.3";
+
+ src = fetchzip {
+ url = "https://openstagecontrol.ammd.net/packages/open-stage-control_${finalAttrs.version}_node.zip";
+ hash = "sha256-ef9433pG+eMFc+7pReE2qA3hK27y5KyiRTPQ2h6Ir8A=";
+ };
+
+ __structuredAttrs = true;
+ strictDeps = true;
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ buildInputs = [
+ python3.pkgs.python-rtmidi
+ ];
+
+ dontConfigure = true;
+ dontBuild = true;
+ sourceRoot = ".";
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p "$out/lib/open-stage-control"
+ cp -r ./source/* "$out/lib/open-stage-control/"
+
+ mkdir -p "$out/bin"
+ makeWrapper ${nodejs}/bin/node "$out/bin/open-stage-control" \
+ --prefix PYTHONPATH : "$PYTHONPATH" \
+ --prefix PATH : ${lib.makeBinPath [ python3 ]} \
+ --add-flags "$out/lib/open-stage-control"
+
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "Libre and modular OSC / MIDI controller";
+ homepage = "https://openstagecontrol.ammd.net/";
+ license = lib.licenses.gpl3Only;
+ maintainers = with lib.maintainers; [ eymeric ];
+ platforms = nodejs.meta.platforms;
+ mainProgram = "open-stage-control";
+ };
+})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f8623d3b89d7..c2381b0bc640 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1682,7 +1682,7 @@ mapAliases {
onscripter-en = throw "onscripter-en has been removed due to lack of maintenance in both upstream and Nixpkgs; onscripter is available instead"; # Added 2025-10-17
onthespot = throw "onethespot has been removed due to lack of upstream maintenance"; # Added 2025-09-26
opae = throw "opae has been removed because it has been marked as broken since June 2023."; # Added 2025-10-11
- open-stage-control = throw "'open-stage-control' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-05-04
+ open-stage-control = throw "'open-stage-control' has been removed due to being broken for more than a year; see RFC 180. Consider using open-stage-control-headless instead."; # Added 2026-05-04
open-timeline-io = warnAlias "'open-timeline-io' has been renamed to 'opentimelineio'" opentimelineio; # Added 2025-08-10
openafs_1_8 = throw "'openafs_1_8' has been renamed to/replaced by 'openafs'"; # Converted to throw 2025-10-27
openai = throw "'openai' has been removed, since upstream removed the legacy CLI in v2.35.0; use 'python3Packages.openai' instead"; # Added 2026-06-10
From 058ec23f34bf14cb8db1ac8721726bf04f3a0b3c Mon Sep 17 00:00:00 2001
From: Nicolas Benes
Date: Fri, 26 Jun 2026 00:39:22 +0200
Subject: [PATCH 32/85] qwt: fix generated pkg-config file
Apply a patch to fix the generated Qt6Qwt6.pc when qwt is built against
Qt6. The file otherwise contains requires for Qt5 libraries.
I vendored the patch, because I couldn't find a way to use fetchpatch
with sourceforge.net. It is created with "git format-patch" directly
from the upstream qwt git repo.
---
...001-pkgconfig-for-Qt-5-6-adjustments.patch | 49 +++++++++++++++++++
pkgs/development/libraries/qwt/default.nix | 13 +++++
2 files changed, 62 insertions(+)
create mode 100644 pkgs/development/libraries/qwt/0001-pkgconfig-for-Qt-5-6-adjustments.patch
diff --git a/pkgs/development/libraries/qwt/0001-pkgconfig-for-Qt-5-6-adjustments.patch b/pkgs/development/libraries/qwt/0001-pkgconfig-for-Qt-5-6-adjustments.patch
new file mode 100644
index 000000000000..628a2c8560c0
--- /dev/null
+++ b/pkgs/development/libraries/qwt/0001-pkgconfig-for-Qt-5-6-adjustments.patch
@@ -0,0 +1,49 @@
+From b225ea23753ce35356ad1b53c0854813004bb605 Mon Sep 17 00:00:00 2001
+From: rathmann
+Date: Thu, 22 May 2025 15:33:04 +0200
+Subject: [PATCH] pkgconfig for Qt 5/6 adjustments
+
+---
+ src/src.pro | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/src/src.pro b/src/src.pro
+index 96e0624..8990ece 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -81,22 +81,27 @@ contains(QWT_CONFIG, QwtPkgConfig) {
+
+ greaterThan(QT_MAJOR_VERSION, 4) {
+
+- QMAKE_PKGCONFIG_FILE = Qt$${QT_MAJOR_VERSION}$${QMAKE_PKGCONFIG_NAME}
+- QMAKE_PKGCONFIG_REQUIRES = Qt5Widgets Qt5Concurrent Qt5PrintSupport
++ QTLIB_PREFIX = Qt$${QT_MAJOR_VERSION} # e.g., "Qt5"
++ QMAKE_PKGCONFIG_FILE = $${QTLIB_PREFIX}$${QMAKE_PKGCONFIG_NAME} # e.g., "Qt5Qwt6"
++
++ # Base Qt library requirements
++ QMAKE_PKGCONFIG_REQUIRES = $${QTLIB_PREFIX}Widgets
++ QMAKE_PKGCONFIG_REQUIRES += $${QTLIB_PREFIX}Concurrent
++ QMAKE_PKGCONFIG_REQUIRES += $${QTLIB_PREFIX}PrintSupport
+
+ contains(QWT_CONFIG, QwtSvg) {
+- QMAKE_PKGCONFIG_REQUIRES += Qt5Svg
++ QMAKE_PKGCONFIG_REQUIRES += $${QTLIB_PREFIX}Svg
+ }
+
+ contains(QWT_CONFIG, QwtOpenGL) {
+- QMAKE_PKGCONFIG_REQUIRES += Qt5OpenGL
++ QMAKE_PKGCONFIG_REQUIRES += $${QTLIB_PREFIX}OpenGL
+ }
+
+ QMAKE_DISTCLEAN += $${DESTDIR}/$${QMAKE_PKGCONFIG_DESTDIR}/$${QMAKE_PKGCONFIG_FILE}.pc
+ }
+ else {
+
+- # there is no QMAKE_PKGCONFIG_FILE fo Qt4
++ # there is no QMAKE_PKGCONFIG_FILE for Qt4
+ QMAKE_PKGCONFIG_REQUIRES = QtGui
+
+ contains(QWT_CONFIG, QwtSvg) {
+--
+2.54.0
+
diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix
index 11ab4425721f..b9ffa84d4472 100644
--- a/pkgs/development/libraries/qwt/default.nix
+++ b/pkgs/development/libraries/qwt/default.nix
@@ -23,6 +23,19 @@ stdenv.mkDerivation rec {
sha256 = "sha256-3LCFiWwoquxVGMvAjA7itOYK2nrJKdgmOfYYmFGmEpo=";
};
+ patches = [
+ # Fix the generated pkg-config file when built against Qt6.
+ # The file wrongly pulled in an unsatisfied dependency to Qt5.
+ #
+ # When building Qwt using Qt6, the constructed pkgconfig .pc file was
+ # previously set up to only look for Qt5 libraries. This fix now matches
+ # the library dependency to the Qt version used in building Qwt.
+ #
+ # See upstream commit b225ea23753ce35356ad1b53c0854813004bb605.
+ # https://sourceforge.net/p/qwt/git/ci/b225ea23753ce35356ad1b53c0854813004bb605/basic
+ ./0001-pkgconfig-for-Qt-5-6-adjustments.patch
+ ];
+
propagatedBuildInputs = [
qtbase
qtsvg
From 16ced49385f0c74091f071110687c3a1eb24da6c Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Fri, 26 Jun 2026 22:27:44 +0000
Subject: [PATCH 33/85] matterjs-server: 1.1.1 -> 1.1.2
---
pkgs/by-name/ma/matterjs-server/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/ma/matterjs-server/package.nix b/pkgs/by-name/ma/matterjs-server/package.nix
index 52aa12a2c322..2c39891d83e9 100644
--- a/pkgs/by-name/ma/matterjs-server/package.nix
+++ b/pkgs/by-name/ma/matterjs-server/package.nix
@@ -12,7 +12,7 @@
buildNpmPackage (finalAttrs: {
pname = "matterjs-server";
- version = "1.1.1";
+ version = "1.1.2";
__structuredAttrs = true;
strictDeps = true;
@@ -20,10 +20,10 @@ buildNpmPackage (finalAttrs: {
owner = "matter-js";
repo = "matterjs-server";
tag = "v${finalAttrs.version}";
- hash = "sha256-1BbAPTu9YFSYuZh7sIa1mpAGJtyWB3NWxls8zindmso=";
+ hash = "sha256-+ICWKZAcKwfd72eWUwmM7XmCwC4F6P+o1JsHNK2+ROE=";
};
- npmDepsHash = "sha256-FcGjEOpXMaB4GQGcFfOgFwXrkbGKb8q55j95x+m+lxQ=";
+ npmDepsHash = "sha256-L1G8/Y23deIjA4azMFLn+ZS95sKoRPSR1O7R8kZF5MU=";
nativeBuildInputs = [
makeBinaryWrapper
From 61e59b3dc45e012df1e6c4f613efc387522c1b63 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Fri, 26 Jun 2026 22:38:05 +0000
Subject: [PATCH 34/85] python3Packages.cutlass: 0.4.0 -> 0.5.0
---
pkgs/development/python-modules/cutlass/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/cutlass/default.nix b/pkgs/development/python-modules/cutlass/default.nix
index aaa22047148f..5b509469d996 100644
--- a/pkgs/development/python-modules/cutlass/default.nix
+++ b/pkgs/development/python-modules/cutlass/default.nix
@@ -19,14 +19,14 @@
buildPythonPackage (finalAttrs: {
pname = "cutlass";
- version = "0.4.0";
+ version = "0.5.0";
pyproject = true;
__structuredAttrs = true;
# No tags on GitHub
src = fetchPypi {
inherit (finalAttrs) pname version;
- hash = "sha256-+9Y7twguzeqGJP9813hAStzjLVlTeLD+JHrHndzA9AM=";
+ hash = "sha256-dAxt/1EROwJix/Sz889XJ9MXfN1FBFQYSNeB3H43g7E=";
};
build-system = [
From 733579e7f0653bbcc3fd1fb13d86663eca7d9e16 Mon Sep 17 00:00:00 2001
From: Lein Matsumaru
Date: Sat, 27 Jun 2026 01:38:55 +0000
Subject: [PATCH 35/85] python3Packages.ggml-python: 0.0.42 -> 0.0.44
add update script to find correct version tag
---
.../python-modules/ggml-python/default.nix | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/ggml-python/default.nix b/pkgs/development/python-modules/ggml-python/default.nix
index dfc5798bc261..a1f6fbe59375 100644
--- a/pkgs/development/python-modules/ggml-python/default.nix
+++ b/pkgs/development/python-modules/ggml-python/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ nix-update-script,
# build-system
cmake,
@@ -34,7 +35,7 @@
buildPythonPackage (finalAttrs: {
pname = "ggml-python";
- version = "0.0.42";
+ version = "0.0.44";
pyproject = true;
__structuredAttrs = true;
@@ -44,7 +45,7 @@ buildPythonPackage (finalAttrs: {
tag = "v${finalAttrs.version}";
# ggml-python expects an older version of ggml than pkgs.ggml's
fetchSubmodules = true;
- hash = "sha256-dbYxAropTT8h1BnMg4Ua1hY/IUYWHaZcS0ckj38UoO4=";
+ hash = "sha256-Pjc91nKBAdmEg8TmirWdD1AcKlY+BCDAoHzL6mTE2SM=";
};
build-system = [
@@ -92,6 +93,13 @@ buildPythonPackage (finalAttrs: {
pytestCheckHook
];
+ passthru.updateScript = nix-update-script {
+ extraArgs = [
+ "--version-regex"
+ "^v([0-9.]+)$"
+ ];
+ };
+
meta = {
description = "Python bindings for ggml";
homepage = "https://github.com/abetlen/ggml-python";
From bf959d33312809ad956ff73309dc78d82fcfc160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
<848000+eclairevoyant@users.noreply.github.com>
Date: Fri, 26 Jun 2026 21:46:31 -0400
Subject: [PATCH 36/85] python3Packages.afdko: fix build on darwin
---
...mtx-avoid-unsigned-integer-underflow.patch | 34 +++++++++++++++++++
.../python-modules/afdko/default.nix | 4 +++
2 files changed, 38 insertions(+)
create mode 100644 pkgs/development/python-modules/afdko/0001-addfeatures-hmtx-avoid-unsigned-integer-underflow.patch
diff --git a/pkgs/development/python-modules/afdko/0001-addfeatures-hmtx-avoid-unsigned-integer-underflow.patch b/pkgs/development/python-modules/afdko/0001-addfeatures-hmtx-avoid-unsigned-integer-underflow.patch
new file mode 100644
index 000000000000..eb4a03e68647
--- /dev/null
+++ b/pkgs/development/python-modules/afdko/0001-addfeatures-hmtx-avoid-unsigned-integer-underflow.patch
@@ -0,0 +1,34 @@
+From 91833ab6c1a769f82f30dbf126362d079905bfc6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=A9clairevoyant?=
+ <848000+eclairevoyant@users.noreply.github.com>
+Date: Fri, 26 Jun 2026 21:28:41 -0400
+Subject: [PATCH] addfeatures/hmtx: avoid unsigned integer underflow
+
+---
+ c/addfeatures/hotconv/hmtx.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/c/addfeatures/hotconv/hmtx.cpp b/c/addfeatures/hotconv/hmtx.cpp
+index 9336c986..2d8ca98e 100644
+--- a/c/addfeatures/hotconv/hmtx.cpp
++++ b/c/addfeatures/hotconv/hmtx.cpp
+@@ -52,12 +52,12 @@ int hmtxFill(hotCtx g) {
+ /* Optimize metrics */
+ FWord width = hmtx.advanceWidth.back();
+ size_t i;
+- for (i = hmtx.advanceWidth.size() - 2; i >= 0; i--) {
+- if (hmtx.advanceWidth[i] != width)
++ for (i = hmtx.advanceWidth.size(); i >= 2; i--) {
++ if (hmtx.advanceWidth[i-2] != width)
+ break;
+ }
+- if (i + 2 != hmtx.advanceWidth.size())
+- hmtx.advanceWidth.resize(i+2);
++ if (i != hmtx.advanceWidth.size())
++ hmtx.advanceWidth.resize(i);
+
+ return hmtx.Fill();
+ }
+--
+2.54.0
+
diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix
index 1053d44c328f..70eb28a87de0 100644
--- a/pkgs/development/python-modules/afdko/default.nix
+++ b/pkgs/development/python-modules/afdko/default.nix
@@ -69,6 +69,10 @@ buildPythonPackage (finalAttrs: {
# Use antlr4 runtime from nixpkgs and link it dynamically
./use-dynamic-system-antlr4-runtime.patch
+
+ # integer underflow causes incorrect behavior
+ # patch submitted upstream as https://github.com/adobe-type-tools/afdko/pull/1843
+ ./0001-addfeatures-hmtx-avoid-unsigned-integer-underflow.patch
];
env = {
From c2942d7b0ef20888b2adaafcf8b4c79358c245bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Sat, 27 Jun 2026 10:31:31 +0000
Subject: [PATCH 37/85] python3Packages.pyatv: 0.17.0 -> 0.18.0
---
pkgs/development/python-modules/pyatv/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix
index 090c86dfc495..9f2bb6c338d7 100644
--- a/pkgs/development/python-modules/pyatv/default.nix
+++ b/pkgs/development/python-modules/pyatv/default.nix
@@ -29,14 +29,14 @@
buildPythonPackage (finalAttrs: {
pname = "pyatv";
- version = "0.17.0";
+ version = "0.18.0";
pyproject = true;
src = fetchFromGitHub {
owner = "postlund";
repo = "pyatv";
tag = "v${finalAttrs.version}";
- hash = "sha256-wsLqG1yJf5A3BMgpbQMrXn6NzpcF4BU1TD+0NJ6Nt7c=";
+ hash = "sha256-UNBpVB2H+xr0ijdlfK/Hrh6k3lhRSqHkthjWp/WZsaQ=";
};
pythonRelaxDeps = [
From 632446907f51e9376e71ac5b4a74f541bb9d1c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?=
Date: Sat, 27 Jun 2026 16:24:40 +0200
Subject: [PATCH 38/85] nextcloud-client: 33.0.5 -> 33.0.6
Diff: https://github.com/nextcloud-releases/desktop/compare/v33.0.5...v33.0.6
Changelog: https://github.com/nextcloud/desktop/releases/tag/v33.0.6
---
pkgs/by-name/ne/nextcloud-client/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix
index 7bf868ad76fb..b161bde0f33e 100644
--- a/pkgs/by-name/ne/nextcloud-client/package.nix
+++ b/pkgs/by-name/ne/nextcloud-client/package.nix
@@ -23,7 +23,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "nextcloud-client";
- version = "33.0.5";
+ version = "33.0.6";
outputs = [
"out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "nextcloud-releases";
repo = "desktop";
tag = "v${finalAttrs.version}";
- hash = "sha256-YRaND3JdZQZGtuNfthliyqcPvpC742h4C6l3HBbYorI=";
+ hash = "sha256-jIK8LszlX19KrhP0u1BNwBxujMg2/lEuYqWWNRMkoiE=";
};
patches = [
From d7a368779abec248368e8c0129854b168ed1e68d Mon Sep 17 00:00:00 2001
From: klea
Date: Sat, 27 Jun 2026 15:30:26 +0000
Subject: [PATCH 39/85] podman: 5.8.3 -> 5.8.4
Fixes CVE-2026-57231/GHSA-4hq8-gpf5-8p68 (#535959)
---
pkgs/by-name/po/podman/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix
index 0b2ab61c9351..0f2c6f07607a 100644
--- a/pkgs/by-name/po/podman/package.nix
+++ b/pkgs/by-name/po/podman/package.nix
@@ -42,13 +42,13 @@
}:
buildGoModule (finalAttrs: {
pname = "podman";
- version = "5.8.3";
+ version = "5.8.4";
src = fetchFromGitHub {
owner = "containers";
repo = "podman";
tag = "v${finalAttrs.version}";
- hash = "sha256-MS5eaGTcCAtEvoQUhGlX8UfoOqNOv0VAoeFxfAvB3Zs=";
+ hash = "sha256-zhEtMZVKiv1L72EMlwgz8sHpmvhejGp98oW63aPj+rQ=";
};
patches = [
From 0c51b51468b75a71da4b70ccfb0428822493485d Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Sat, 27 Jun 2026 15:53:13 +0000
Subject: [PATCH 40/85] uv: 0.11.22 -> 0.11.25
---
pkgs/by-name/uv/uv/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 69dababf6511..27443c8b129c 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "uv";
- version = "0.11.22";
+ version = "0.11.25";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "astral-sh";
repo = "uv";
tag = finalAttrs.version;
- hash = "sha256-/MDEo86070RYMxaZ/whXWIiI2hxt3b5eTYSb43RB5Vg=";
+ hash = "sha256-MtfaDZ6dDuTTBus9KKj5r03IHo48AmEcsU+VlAW3l68=";
};
- cargoHash = "sha256-zStSTwpFWWc4sC59VPK7wYjQl77B+FvY/4E3zlppQjo=";
+ cargoHash = "sha256-dtkGj/de34HbdFPQbSWBHZGZmif2xQmUS8qqEyFTnmc=";
buildInputs = [
rust-jemalloc-sys
From a87153b56faffa32462f122cee1ec8350a8a68e1 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <24027+bbigras@users.noreply.github.com>
Date: Mon, 22 Jun 2026 20:49:36 -0400
Subject: [PATCH 41/85] veilid: 0.5.3 -> 0.5.5
---
pkgs/by-name/ve/veilid/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/ve/veilid/package.nix b/pkgs/by-name/ve/veilid/package.nix
index 32907a2a5026..207124d7dae9 100644
--- a/pkgs/by-name/ve/veilid/package.nix
+++ b/pkgs/by-name/ve/veilid/package.nix
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "veilid";
- version = "0.5.3";
+ version = "0.5.5";
src = fetchFromGitLab {
owner = "veilid";
repo = "veilid";
rev = "v${finalAttrs.version}";
- hash = "sha256-qPV5kVp/1ZTLzo8i3DkGLxuoOaMJxZJUEzYGNReJyHY=";
+ hash = "sha256-14jRIs2iE5JH1ZmC/1DGcg6cejsnmhUTkquXNmOEuQA=";
};
- cargoHash = "sha256-LjysGZihXoE82224nXNrRWIMe6/POXDqjMO29zg+MMI=";
+ cargoHash = "sha256-xuIw/RRKydanStS7dw1jK96bgEH0U5TDbayaBZq/OCg=";
nativeBuildInputs = [
capnproto
From 7e01f1f544793eff4c990bff4f45ad556ed2a9a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Sat, 27 Jun 2026 17:19:09 +0000
Subject: [PATCH 42/85] s7: 11.8-unstable-2026-05-22 ->
11.9-unstable-2026-06-27
---
pkgs/by-name/s7/s7/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix
index 31bea400be81..c480594bd0e0 100644
--- a/pkgs/by-name/s7/s7/package.nix
+++ b/pkgs/by-name/s7/s7/package.nix
@@ -26,14 +26,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "s7";
- version = "11.8-unstable-2026-05-22";
+ version = "11.9-unstable-2026-06-27";
src = fetchFromGitLab {
domain = "cm-gitlab.stanford.edu";
owner = "bil";
repo = "s7";
- rev = "d8791be9964708ccb98c7cabb39acd2b8f97fdbb";
- hash = "sha256-kT2zFadlKc0JWqxnuoQ9hVinGhZb0XOwC3WEVeYcLPw=";
+ rev = "1416ca232c9154e47235be2378151f9f2beea278";
+ hash = "sha256-lA4nLtJ6+O5Cn7TQRzZCPhk3oB8qHdpewZE5yM8z4iw=";
};
buildInputs =
From a55aec32e70b408e5e5d357ba0d967b403ba5d3d Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Sun, 28 Jun 2026 00:13:30 +0000
Subject: [PATCH 43/85] brutus: 1.5.1 -> 1.6.0
---
pkgs/by-name/br/brutus/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/br/brutus/package.nix b/pkgs/by-name/br/brutus/package.nix
index f4bd5ee04df1..ae79c20a6525 100644
--- a/pkgs/by-name/br/brutus/package.nix
+++ b/pkgs/by-name/br/brutus/package.nix
@@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "brutus";
- version = "1.5.1";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "praetorian-inc";
repo = "brutus";
tag = "v${finalAttrs.version}";
- hash = "sha256-Jk4O0euYvW7e8iwS0zmKAmw4yXMNU0ABovznzv5tXVM=";
+ hash = "sha256-Kb5+ue83YEHUG6Ezi7e7WmljHUPRXXD7/bT2ypTZVg4=";
};
- vendorHash = "sha256-YdnKRxPagV6h22QEEOpC/HNUGfyFyWwIsh2LxMUmMrk=";
+ vendorHash = "sha256-XpwwFz8PfyTksLD0SomC5BE0tzUL9D/qtBSed4mrsXQ=";
ldflags = [
"-s"
From 783c1a807225d2c3c5f5ada6cbb2acef31e37a91 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Sun, 28 Jun 2026 00:35:57 +0000
Subject: [PATCH 44/85] chisel: 1.11.6 -> 1.11.7
---
pkgs/by-name/ch/chisel/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/ch/chisel/package.nix b/pkgs/by-name/ch/chisel/package.nix
index 0b262add6dde..822ec78afed4 100644
--- a/pkgs/by-name/ch/chisel/package.nix
+++ b/pkgs/by-name/ch/chisel/package.nix
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "chisel";
- version = "1.11.6";
+ version = "1.11.7";
src = fetchFromGitHub {
owner = "jpillora";
repo = "chisel";
tag = "v${finalAttrs.version}";
- hash = "sha256-3pLqTOVJfp9MiorObS8I1KHB0MthzzK3oLFz+5emqxE=";
+ hash = "sha256-VLQsYxd7wMRTrmqO5dGgqmhL/oOQULEIMo4xUaKXG5I=";
};
vendorHash = "sha256-hqHd+62csVjHY2oAvi5fwlI0LbjR/LSDg6b1SMwe8Fw=";
From 3b8e905df86701a3f64d29b3c82ae5b0384bf703 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Sun, 28 Jun 2026 01:32:30 +0000
Subject: [PATCH 45/85] terraform-mcp-server: 0.5.2 -> 1.0.0
---
pkgs/by-name/te/terraform-mcp-server/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/te/terraform-mcp-server/package.nix b/pkgs/by-name/te/terraform-mcp-server/package.nix
index bc23b234e95f..b4ce22f32362 100644
--- a/pkgs/by-name/te/terraform-mcp-server/package.nix
+++ b/pkgs/by-name/te/terraform-mcp-server/package.nix
@@ -6,16 +6,16 @@
}:
buildGoModule (finalAttrs: {
pname = "terraform-mcp-server";
- version = "0.5.2";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "terraform-mcp-server";
tag = "v${finalAttrs.version}";
- hash = "sha256-4NUSMNLWn5Pmwq//M0yHn7qw9oUI4Q3MDXeQ8xBLLSI=";
+ hash = "sha256-0+TjwCDiuNAM6MkGTxw7cigwp1EaDmSFkyMYS+XwC1E=";
};
- vendorHash = "sha256-FuAt2epg4wH7oNa0nvQMWZZwOL1YtpSVdEBxkeY2Heg=";
+ vendorHash = "sha256-6azUKwzkVg68SvuVlse5ljB2H49tRUWgDasLjEl8KKw=";
ldflags = [
"-X main.version=${finalAttrs.version}"
From 076459328bab4f6d31d09a9d1446ca2d999a13c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
Date: Fri, 26 Jun 2026 22:59:12 -0700
Subject: [PATCH 46/85] karakeep: pass patches directly to fetchPnpmDeps
---
pkgs/by-name/ka/karakeep/package.nix | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/pkgs/by-name/ka/karakeep/package.nix b/pkgs/by-name/ka/karakeep/package.nix
index 31c3823c1ff2..55d4e20cbc2a 100644
--- a/pkgs/by-name/ka/karakeep/package.nix
+++ b/pkgs/by-name/ka/karakeep/package.nix
@@ -52,18 +52,13 @@ stdenv.mkDerivation (finalAttrs: {
];
pnpmDeps = fetchPnpmDeps {
- inherit (finalAttrs) pname version;
+ inherit (finalAttrs)
+ pname
+ version
+ src
+ patches
+ ;
pnpm = pnpm_9;
-
- # We need to pass the patched source code, so pnpm sees the patched version
- src = stdenv.mkDerivation {
- name = "${finalAttrs.pname}-patched-source";
- inherit (finalAttrs) src patches;
- installPhase = ''
- cp -pr --reflink=auto -- . $out
- '';
- };
-
fetcherVersion = 3;
hash = "sha256-aT4JPx3iYw4kw8GHXKWMnelSVT0q2S3PK8DgSCQCyKQ=";
};
From 9f7747b8ee02d8d0245e6140097a930cdaf71bdd Mon Sep 17 00:00:00 2001
From: pwnwriter
Date: Fri, 26 Jun 2026 09:03:16 -0400
Subject: [PATCH 47/85] box-cli: init at 0.1.112
---
pkgs/by-name/bo/box-cli/package.nix | 16 ++++++--
pkgs/by-name/bo/box-cli/sources.json | 22 +++++++++++
pkgs/by-name/bo/box-cli/sources.nix | 22 -----------
pkgs/by-name/bo/box-cli/update.sh | 57 ++++++++++++++++++++++++++++
4 files changed, 91 insertions(+), 26 deletions(-)
create mode 100644 pkgs/by-name/bo/box-cli/sources.json
delete mode 100644 pkgs/by-name/bo/box-cli/sources.nix
create mode 100755 pkgs/by-name/bo/box-cli/update.sh
diff --git a/pkgs/by-name/bo/box-cli/package.nix b/pkgs/by-name/bo/box-cli/package.nix
index d153e44b49f3..4e245d062f8c 100644
--- a/pkgs/by-name/bo/box-cli/package.nix
+++ b/pkgs/by-name/bo/box-cli/package.nix
@@ -6,17 +6,23 @@
}:
let
- sources = import ./sources.nix;
+ sources = lib.importJSON ./sources.json;
+ platform =
+ sources.platforms.${stdenv.hostPlatform.system}
+ or (throw "Unsupported platform: ${stdenv.hostPlatform.system}");
in
stdenv.mkDerivation (finalAttrs: {
pname = "box-cli";
- version = "0.1.112";
+ inherit (sources) version;
strictDeps = true;
__structuredAttrs = true;
- src = fetchurl sources.${stdenv.hostPlatform.system};
+ src = fetchurl {
+ url = "https://github.com/ariana-dot-dev/agent-server/releases/download/${sources.tag}/${platform.filename}";
+ inherit (platform) hash;
+ };
dontUnpack = true;
@@ -30,6 +36,8 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstall
'';
+ passthru.updateScript = ./update.sh;
+
meta = {
description = "CLI for Ascii Box cloud sandboxes";
homepage = "https://ascii.dev";
@@ -37,6 +45,6 @@ stdenv.mkDerivation (finalAttrs: {
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
maintainers = with lib.maintainers; [ pwnwriter ];
mainProgram = "box";
- platforms = lib.attrNames sources;
+ platforms = lib.attrNames sources.platforms;
};
})
diff --git a/pkgs/by-name/bo/box-cli/sources.json b/pkgs/by-name/bo/box-cli/sources.json
new file mode 100644
index 000000000000..10c07df913c5
--- /dev/null
+++ b/pkgs/by-name/bo/box-cli/sources.json
@@ -0,0 +1,22 @@
+{
+ "version": "0.1.112",
+ "tag": "box-cli-v0.1.112-ascii-prod1",
+ "platforms": {
+ "x86_64-linux": {
+ "filename": "box-linux-x64",
+ "hash": "sha256-DWQNenz/pmFVH5QM554lBk6+RwgOCjCBe7p+ZkHADTI="
+ },
+ "aarch64-linux": {
+ "filename": "box-linux-arm64",
+ "hash": "sha256-V2Sk6C1ZTRWlYQ2bVQTvK6PU8BkBPkmJMjUAo2Ul6+Q="
+ },
+ "x86_64-darwin": {
+ "filename": "box-darwin-x64",
+ "hash": "sha256-QI+ecq0O4dkKqdIvkONcYdXsS+EQLFIU35ulKGNSCRE="
+ },
+ "aarch64-darwin": {
+ "filename": "box-darwin-arm64",
+ "hash": "sha256-cyjMUGkWfNOggvtBfVqCijmcAj0P2SuFQORwg9EWbn0="
+ }
+ }
+}
diff --git a/pkgs/by-name/bo/box-cli/sources.nix b/pkgs/by-name/bo/box-cli/sources.nix
deleted file mode 100644
index 9aab3af13384..000000000000
--- a/pkgs/by-name/bo/box-cli/sources.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# NOTE:
-# To update: run `nix-prefetch-url` for each platform URL and convert to SRI hash.
-# URLs: https://ascii.dev/api/box/cli/download?platform={platform}&channel=ascii-prod
-# Last updated: 2026-06-26
-{
- x86_64-linux = {
- url = "https://ascii.dev/api/box/cli/download?platform=linux-x64&channel=ascii-prod";
- hash = "sha256-DWQNenz/pmFVH5QM554lBk6+RwgOCjCBe7p+ZkHADTI=";
- };
- aarch64-linux = {
- url = "https://ascii.dev/api/box/cli/download?platform=linux-arm64&channel=ascii-prod";
- hash = "sha256-V2Sk6C1ZTRWlYQ2bVQTvK6PU8BkBPkmJMjUAo2Ul6+Q=";
- };
- x86_64-darwin = {
- url = "https://ascii.dev/api/box/cli/download?platform=darwin-x64&channel=ascii-prod";
- hash = "sha256-QI+ecq0O4dkKqdIvkONcYdXsS+EQLFIU35ulKGNSCRE=";
- };
- aarch64-darwin = {
- url = "https://ascii.dev/api/box/cli/download?platform=darwin-arm64&channel=ascii-prod";
- hash = "sha256-cyjMUGkWfNOggvtBfVqCijmcAj0P2SuFQORwg9EWbn0=";
- };
-}
diff --git a/pkgs/by-name/bo/box-cli/update.sh b/pkgs/by-name/bo/box-cli/update.sh
new file mode 100755
index 000000000000..3656eb168b46
--- /dev/null
+++ b/pkgs/by-name/bo/box-cli/update.sh
@@ -0,0 +1,57 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq nix
+
+set -euo pipefail
+
+cd "$(dirname "$0")"
+
+channel="ascii-prod"
+repo="ariana-dot-dev/agent-server"
+
+old_version=$(jq -r ".version" sources.json)
+
+tag=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
+ "https://api.github.com/repos/${repo}/git/refs/tags/box-cli-v" \
+ | jq -r --arg channel "$channel" \
+ '[.[].ref | select(test($channel)) | ltrimstr("refs/tags/")] | sort_by(split(".")[2] | tonumber) | last')
+
+if [[ -z "$tag" || "$tag" == "null" ]]; then
+ echo "No box-cli release found for channel $channel"
+ exit 1
+fi
+
+version=$(echo "$tag" | sed -n 's/^box-cli-v\([0-9.]*\)-.*/\1/p')
+
+if [[ "$old_version" == "$version" ]]; then
+ echo "box-cli is already up to date at $version"
+ exit 0
+fi
+
+echo "Updating box-cli from $old_version to $version"
+
+declare -A platforms=(
+ [x86_64-linux]="box-linux-x64"
+ [aarch64-linux]="box-linux-arm64"
+ [x86_64-darwin]="box-darwin-x64"
+ [aarch64-darwin]="box-darwin-arm64"
+)
+
+sources_tmp="$(mktemp)"
+jq -n --arg v "$version" --arg t "$tag" '{version: $v, tag: $t, platforms: {}}' > "$sources_tmp"
+
+for platform in "${!platforms[@]}"; do
+ filename="${platforms[$platform]}"
+ url="https://github.com/${repo}/releases/download/${tag}/${filename}"
+ echo "Fetching hash for $platform ($filename)..."
+ sha256hash="$(nix-prefetch-url --type sha256 "$url")"
+ hash="$(nix hash convert --to sri --hash-algo sha256 "$sha256hash")"
+ jq --arg platform "$platform" \
+ --arg filename "$filename" \
+ --arg hash "$hash" \
+ '.platforms += {($platform): {filename: $filename, hash: $hash}}' \
+ "$sources_tmp" > "${sources_tmp}.tmp" && mv "${sources_tmp}.tmp" "$sources_tmp"
+done
+
+mv "$sources_tmp" sources.json
+
+echo "Updated box-cli to $version (tag: $tag)"
From dcc4fcf8aeae1f77d81e63241e0d753c2dffc8cd Mon Sep 17 00:00:00 2001
From: mikaeladev
Date: Sun, 28 Jun 2026 04:11:56 +0100
Subject: [PATCH 48/85] openlinkhub: install binary to `$out/opt/OpenLinkHub`
makes openlinkhub work out of the box, provided that `$out/opt/OpenLinkHub` is
copied to a mutable directory and run from there.
---
pkgs/by-name/op/openlinkhub/package.nix | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/op/openlinkhub/package.nix b/pkgs/by-name/op/openlinkhub/package.nix
index 7d15eadd40a4..067c2d28ddfc 100644
--- a/pkgs/by-name/op/openlinkhub/package.nix
+++ b/pkgs/by-name/op/openlinkhub/package.nix
@@ -37,10 +37,12 @@ buildGoModule (finalAttrs: {
runHook preInstall
install -Dm 644 -t $out/etc/udev/rules.d 99-openlinkhub.rules
- install -Dm 755 -t $out/bin $GOPATH/bin/OpenLinkHub
+ install -Dm 755 -t $out/opt/OpenLinkHub $GOPATH/bin/OpenLinkHub
- mkdir -p $out/opt/OpenLinkHub
- cp -r {database,static,web} $out/opt/OpenLinkHub
+ cp -rt $out/opt/OpenLinkHub database static web
+
+ mkdir -p $out/bin
+ ln -st $out/bin $out/opt/OpenLinkHub/OpenLinkHub
runHook postInstall
'';
From ebd782baf852fa9223ad5aabd04e9071edd7c9fd Mon Sep 17 00:00:00 2001
From: klea
Date: Sun, 28 Jun 2026 06:17:30 +0000
Subject: [PATCH 49/85] podman: Limit the platform to linux
---
pkgs/by-name/po/podman/package.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix
index 0f2c6f07607a..f8314ebeefcf 100644
--- a/pkgs/by-name/po/podman/package.nix
+++ b/pkgs/by-name/po/podman/package.nix
@@ -204,5 +204,6 @@ buildGoModule (finalAttrs: {
license = lib.licenses.asl20;
teams = [ lib.teams.podman ];
mainProgram = "podman";
+ platforms = lib.platforms.linux;
};
})
From bc237fdc0acd50181a8c1d7fff897e2675a0d997 Mon Sep 17 00:00:00 2001
From: klea
Date: Sun, 28 Jun 2026 06:30:39 +0000
Subject: [PATCH 50/85] nixos/tests/podman: replace deprecated os.system in
tls-ghostunnel
Seems the shell script ${gen-ca} doesn't have a prefix, and thus requires being
run on a shell.
---
nixos/tests/podman/tls-ghostunnel.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nixos/tests/podman/tls-ghostunnel.nix b/nixos/tests/podman/tls-ghostunnel.nix
index 1fcfd08f0efc..027683df4b25 100644
--- a/nixos/tests/podman/tls-ghostunnel.nix
+++ b/nixos/tests/podman/tls-ghostunnel.nix
@@ -83,7 +83,7 @@ import ../make-test-python.nix (
};
testScript = ''
- import os
+ import subprocess
import shlex
@@ -93,7 +93,7 @@ import ../make-test-python.nix (
def cmd(command):
print(f"+{command}")
- r = os.system(command)
+ r = subprocess.run(command, shell=True).returncode
if r != 0:
raise Exception(f"Command {command} failed with exit code {r}")
From d8f7d8ae696d5932e418b7039098691c4e9bf7e6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Sun, 28 Jun 2026 08:38:16 +0000
Subject: [PATCH 51/85] python3Packages.aioimmich: 0.15.0 -> 0.15.1
---
pkgs/development/python-modules/aioimmich/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/aioimmich/default.nix b/pkgs/development/python-modules/aioimmich/default.nix
index 4b7846cc6c6c..cbcda0f177bb 100644
--- a/pkgs/development/python-modules/aioimmich/default.nix
+++ b/pkgs/development/python-modules/aioimmich/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "aioimmich";
- version = "0.15.0";
+ version = "0.15.1";
pyproject = true;
src = fetchFromGitHub {
owner = "mib1185";
repo = "aioimmich";
tag = "v${version}";
- hash = "sha256-lsxN4gl1t7za/0ac6fXZysEeXSQtNAvQCMN/eqRvWoQ=";
+ hash = "sha256-2WdQnK25vrBtNKzkgpSaWcdkrfEggtBhe3DI7DuMS8k=";
};
postPatch = ''
From 58136cc66d2e66288f8b9297727597dd6ca5cc33 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Sun, 28 Jun 2026 09:30:55 +0000
Subject: [PATCH 52/85] gh-aw: 0.79.8 -> 0.80.9
---
pkgs/by-name/gh/gh-aw/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/gh/gh-aw/package.nix b/pkgs/by-name/gh/gh-aw/package.nix
index ae4aeb238489..927e0e503241 100644
--- a/pkgs/by-name/gh/gh-aw/package.nix
+++ b/pkgs/by-name/gh/gh-aw/package.nix
@@ -6,7 +6,7 @@
}:
buildGoModule (finalAttrs: {
pname = "gh-aw";
- version = "0.79.8";
+ version = "0.80.9";
__structuredAttrs = true;
@@ -14,10 +14,10 @@ buildGoModule (finalAttrs: {
owner = "github";
repo = "gh-aw";
tag = "v${finalAttrs.version}";
- hash = "sha256-n1w235wCvHZs48PWIu3v4qob3SQPt1kMLszHe/7Rcwg=";
+ hash = "sha256-2BGFKy/X8j0jYQc+W2rLZmZmPgCvZ+QOZweQaAQQJLM=";
};
- vendorHash = "sha256-GgDf2Ly8Vs/FTqk3w5yNYn/X1bWyfUBWhfl8QH2WFVg=";
+ vendorHash = "sha256-jxh8R/X12/QHxZOIKsTvS6FcDQSmJ7RJEvDnJuUr93A=";
subPackages = [ "cmd/gh-aw" ];
From 4fab42124c1459530d8283138ce5bf94d856d674 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Sun, 28 Jun 2026 09:35:48 +0000
Subject: [PATCH 53/85] python3Packages.oelint-data: 1.5.6 -> 1.5.8
---
pkgs/development/python-modules/oelint-data/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix
index 6093f9d965c1..4b2c00f8aca5 100644
--- a/pkgs/development/python-modules/oelint-data/default.nix
+++ b/pkgs/development/python-modules/oelint-data/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage (finalAttrs: {
pname = "oelint-data";
- version = "1.5.6";
+ version = "1.5.8";
pyproject = true;
__structuredAttrs = true;
@@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: {
owner = "priv-kweihmann";
repo = "oelint-data";
tag = finalAttrs.version;
- hash = "sha256-JkH8y3FzpMMIIv/42c+WzqJtA63SVQ/1v6ZE/5ybYR8=";
+ hash = "sha256-cjQAJtslRGZ7FwjlVoxgGVoPmdx6J8qlHcxbl/auf0I=";
};
build-system = [
From 67b225831eaca95d0396a3ce8360cc73b7f2b8f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Sun, 28 Jun 2026 10:18:06 +0000
Subject: [PATCH 54/85] python3Packages.pysigma-backend-elasticsearch: 2.0.3 ->
2.1.0
---
.../python-modules/pysigma-backend-elasticsearch/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix
index fc6bfb9da8a3..5406d26e0ef2 100644
--- a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix
+++ b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage (finalAttrs: {
pname = "pysigma-backend-elasticsearch";
- version = "2.0.3";
+ version = "2.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "SigmaHQ";
repo = "pySigma-backend-elasticsearch";
tag = "v${finalAttrs.version}";
- hash = "sha256-54AxC3cK8Vh/cT2LjYzbgQFJrgoSxFU2QbsML3YUCHs=";
+ hash = "sha256-eSf0uhjhO1Bc63EBy505tTGASTNJ/mK0943vBXAT9As=";
};
build-system = [ poetry-core ];
From accc739d1ae7134abe5af9047e680016633066f8 Mon Sep 17 00:00:00 2001
From: Patrick
Date: Mon, 8 Jun 2026 10:38:09 +0200
Subject: [PATCH 55/85] nixos/tests/your_spotify: switch test to mongodb-ce
---
nixos/tests/your_spotify.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/nixos/tests/your_spotify.nix b/nixos/tests/your_spotify.nix
index c4935face7df..9fa13e453fb5 100644
--- a/nixos/tests/your_spotify.nix
+++ b/nixos/tests/your_spotify.nix
@@ -6,6 +6,7 @@
};
nodes.machine = {
+ services.mongodb.package = pkgs.mongodb-ce;
services.your_spotify = {
enable = true;
spotifySecretFile = pkgs.writeText "spotifySecretFile" "deadbeef";
From 19bd60de3646c206ae8872650e0d0edd52555234 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Sun, 28 Jun 2026 10:36:36 +0000
Subject: [PATCH 56/85] mcp-grafana: 0.16.0 -> 0.17.0
---
pkgs/by-name/mc/mcp-grafana/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/mc/mcp-grafana/package.nix b/pkgs/by-name/mc/mcp-grafana/package.nix
index 71b4cfbbdc3f..cff814dd122e 100644
--- a/pkgs/by-name/mc/mcp-grafana/package.nix
+++ b/pkgs/by-name/mc/mcp-grafana/package.nix
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "mcp-grafana";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "grafana";
repo = "mcp-grafana";
tag = "v${finalAttrs.version}";
- hash = "sha256-/K7m+VexScHppGuxKsGpz18WmJ3Xphmk2/nCHphwL1o=";
+ hash = "sha256-uAVqmLGZzD1CMXIw/eYGh/15W2jDS8Iwr5jClRSuCyQ=";
};
vendorHash = "sha256-E7Uh5nG6elUhEa+4RCtgGrle0Py6TjRc+OOvjtik1D8=";
From 33882863bb7d5f722e946820d3ae8a28e9a5675c Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Sun, 28 Jun 2026 10:58:51 +0000
Subject: [PATCH 57/85] python3Packages.yara-x: 1.18.0 -> 1.19.0
---
pkgs/development/python-modules/yara-x/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/python-modules/yara-x/default.nix b/pkgs/development/python-modules/yara-x/default.nix
index a388d097e415..c819d80dd87b 100644
--- a/pkgs/development/python-modules/yara-x/default.nix
+++ b/pkgs/development/python-modules/yara-x/default.nix
@@ -9,21 +9,21 @@
buildPythonPackage rec {
pname = "yara-x";
- version = "1.18.0";
+ version = "1.19.0";
pyproject = true;
src = fetchFromGitHub {
owner = "VirusTotal";
repo = "yara-x";
tag = "v${version}";
- hash = "sha256-4cHCBSmBhjuk8otOB+ykiviaHVDmrguIVCLCRMcq7L4=";
+ hash = "sha256-CokjFTQoFT9k/2/MuQSbfzHonW4V0F8hskhqDvpCesM=";
};
buildAndTestSubdir = "py";
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname src version;
- hash = "sha256-MMERL3DcOlTEa2S6BMboFi8MfKC8ah2wZtOQRbO6ADg=";
+ hash = "sha256-wMh8F++16tQ0IUhacBPb4rDcydmDKZKzQf8EK/qDJXo=";
};
nativeBuildInputs = [
From 6450dc0c44aa550c17b52bcaff6387907fa44f39 Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer
Date: Sun, 28 Jun 2026 13:27:41 +0200
Subject: [PATCH 58/85] kulala-core: improve description
Closes #536011.
Assisted-by: pi coding agent / Mika (OpenAI GPT-5.5)
---
pkgs/by-name/ku/kulala-core/package.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/by-name/ku/kulala-core/package.nix b/pkgs/by-name/ku/kulala-core/package.nix
index e16c7f26174f..08c47b0e895a 100644
--- a/pkgs/by-name/ku/kulala-core/package.nix
+++ b/pkgs/by-name/ku/kulala-core/package.nix
@@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
meta = {
- description = "Core parser and runner for kulala.nvim";
+ description = "HTTP client library powering the Kulala toolchain";
homepage = "https://github.com/mistweaverco/kulala-core";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ khaneliman ];
From 516366f11a89a66e1bb44681b690001417406754 Mon Sep 17 00:00:00 2001
From: Martin Weinelt
Date: Sun, 28 Jun 2026 14:09:38 +0200
Subject: [PATCH 59/85] python3Packages.numba: fix numpy 2.5 compat
---
.../python-modules/numba/default.nix | 29 +++++++++++--------
.../python-modules/numba/numpy2.4.patch | 28 ------------------
.../python-modules/numba/numpy2.5.patch | 26 +++++++++++++++++
3 files changed, 43 insertions(+), 40 deletions(-)
delete mode 100644 pkgs/development/python-modules/numba/numpy2.4.patch
create mode 100644 pkgs/development/python-modules/numba/numpy2.5.patch
diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 0e38f0392cde..11c25c98168d 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -4,7 +4,6 @@
fetchFromGitHub,
buildPythonPackage,
replaceVars,
- fetchpatch,
# nativeBuildInputs
setuptools,
@@ -16,8 +15,8 @@
# tests
numba,
pytestCheckHook,
+ pytest-xdist,
writableTmpDirAsHomeHook,
- numpy_1,
writers,
python,
@@ -56,11 +55,26 @@ buildPythonPackage (finalAttrs: {
hash = "sha256-DMmUyTElDFyMK4BUQ4EhDNmG43lOWQHurKbnSyhAs5k=";
};
+ patches = [
+ ./numpy2.5.patch
+ ]
+ ++ lib.optionals cudaSupport [
+ (replaceVars ./cuda_path.patch {
+ cuda_toolkit_path = cudatoolkit;
+ cuda_toolkit_lib_path = lib.getLib cudatoolkit;
+ })
+ ];
+
postPatch = ''
substituteInPlace numba/cuda/cudadrv/driver.py \
--replace-fail \
"dldir = [" \
"dldir = [ '${addDriverRunpath.driverLink}/lib', "
+
+ substituteInPlace setup.py \
+ --replace-fail 'max_numpy_run_version = "2.5"' 'max_numpy_run_version = "2.6"'
+ substituteInPlace numba/__init__.py \
+ --replace-fail "(2, 4)" "(2, 6)"
'';
build-system = [
@@ -84,15 +98,9 @@ buildPythonPackage (finalAttrs: {
llvmlite
];
- patches = lib.optionals cudaSupport [
- (replaceVars ./cuda_path.patch {
- cuda_toolkit_path = cudatoolkit;
- cuda_toolkit_lib_path = lib.getLib cudatoolkit;
- })
- ];
-
nativeCheckInputs = [
pytestCheckHook
+ pytest-xdist
writableTmpDirAsHomeHook
];
@@ -145,9 +153,6 @@ buildPythonPackage (finalAttrs: {
doFullCheck = true;
testsWithoutSandbox = false;
};
- numpy_1 = numba.override {
- numpy = numpy_1;
- };
};
meta = {
diff --git a/pkgs/development/python-modules/numba/numpy2.4.patch b/pkgs/development/python-modules/numba/numpy2.4.patch
deleted file mode 100644
index 37fd13bd9582..000000000000
--- a/pkgs/development/python-modules/numba/numpy2.4.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/numba/__init__.py b/numba/__init__.py
-index 33f752018..7d3b3ae8d 100644
---- a/numba/__init__.py
-+++ b/numba/__init__.py
-@@ -39,8 +39,8 @@ def _ensure_critical_deps():
- f"{numpy_version[0]}.{numpy_version[1]}.")
- raise ImportError(msg)
-
-- if numpy_version > (2, 3):
-- msg = (f"Numba needs NumPy 2.3 or less. Got NumPy "
-+ if numpy_version > (2, 4):
-+ msg = (f"Numba needs NumPy 2.4 or less. Got NumPy "
- f"{numpy_version[0]}.{numpy_version[1]}.")
- raise ImportError(msg)
-
-diff --git a/setup.py b/setup.py
-index 9eaa191cb..a5febef1e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -23,7 +23,7 @@ min_python_version = "3.10"
- max_python_version = "3.15" # exclusive
- min_numpy_build_version = "2.0.0rc1"
- min_numpy_run_version = "1.22"
--max_numpy_run_version = "2.4"
-+max_numpy_run_version = "2.5"
- min_llvmlite_version = "0.46.0dev0"
- max_llvmlite_version = "0.47"
-
diff --git a/pkgs/development/python-modules/numba/numpy2.5.patch b/pkgs/development/python-modules/numba/numpy2.5.patch
new file mode 100644
index 000000000000..7cc84679ced9
--- /dev/null
+++ b/pkgs/development/python-modules/numba/numpy2.5.patch
@@ -0,0 +1,26 @@
+diff --git a/numba/np/arrayobj.py b/numba/np/arrayobj.py
+index ae81627ec..dd69a2a45 100644
+--- a/numba/np/arrayobj.py
++++ b/numba/np/arrayobj.py
+@@ -6639,7 +6639,7 @@ def impl_np_vstack(tup):
+ return impl
+
+
+-if numpy_version >= (2, 0):
++if (2, 0) <= numpy_version < (2, 5):
+ overload(np.row_stack)(impl_np_vstack)
+
+
+diff --git a/numba/tests/test_dyn_array.py b/numba/tests/test_dyn_array.py
+index 99328052c..dfbf57589 100644
+--- a/numba/tests/test_dyn_array.py
++++ b/numba/tests/test_dyn_array.py
+@@ -36,7 +36,7 @@ def np_vstack(a, b, c):
+ return np.vstack((a, b, c))
+
+ def np_row_stack(a, b, c):
+- return np.row_stack((a, b, c))
++ return np.vstack((a, b, c))
+
+ def np_dstack(a, b, c):
+ return np.dstack((a, b, c))
From 613e641c95d138ab190bbb24efe65868ecd30f46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?=
Date: Sun, 28 Jun 2026 14:11:14 +0200
Subject: [PATCH 60/85] heroic-unwrapped: pnpm_10_29_2 -> pnpm_10
---
pkgs/by-name/he/heroic-unwrapped/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix
index fe5df97a6ba3..8f0bdf3cbe88 100644
--- a/pkgs/by-name/he/heroic-unwrapped/package.nix
+++ b/pkgs/by-name/he/heroic-unwrapped/package.nix
@@ -4,7 +4,7 @@
stdenv,
fetchFromGitHub,
# Pinned, because our FODs are not guaranteed to be stable between major versions.
- pnpm_10_29_2,
+ pnpm_10,
fetchPnpmDeps,
pnpmConfigHook,
nodejs,
@@ -21,7 +21,7 @@
}:
let
- pnpm = pnpm_10_29_2;
+ pnpm = pnpm_10;
legendary = callPackage ./legendary.nix { };
epic-integration = callPackage ./epic-integration.nix { };
From c598b5141216f41bf0958c6a8dbb3186b048a763 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Sun, 28 Jun 2026 12:23:19 +0000
Subject: [PATCH 61/85] glaze: 7.8.2 -> 7.8.3
---
pkgs/by-name/gl/glaze/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix
index e82a36ba528f..0ac368b97160 100644
--- a/pkgs/by-name/gl/glaze/package.nix
+++ b/pkgs/by-name/gl/glaze/package.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "glaze";
- version = "7.8.2";
+ version = "7.8.3";
src = fetchFromGitHub {
owner = "stephenberry";
repo = "glaze";
tag = "v${finalAttrs.version}";
- hash = "sha256-T0oYGqmF+0gXT4VESN4h1P/rUfV9BGmpvLWp+6BKiFI=";
+ hash = "sha256-WqtaZ3AVDs1oIfAVQuU63eg+0753LoYfv/pRyG9OMnM=";
};
nativeBuildInputs = [ cmake ];
From 50fb927b0d1a9f16fc254627e6f22ba8d5605ba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?=
Date: Sun, 28 Jun 2026 14:29:15 +0200
Subject: [PATCH 62/85] voicevox: pnpm_10_29_2 -> pnpm_10
---
pkgs/by-name/vo/voicevox/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/vo/voicevox/package.nix b/pkgs/by-name/vo/voicevox/package.nix
index 49346e310642..d7c8ff60d7aa 100644
--- a/pkgs/by-name/vo/voicevox/package.nix
+++ b/pkgs/by-name/vo/voicevox/package.nix
@@ -13,7 +13,7 @@
nodejs,
fetchPnpmDeps,
pnpmConfigHook,
- pnpm_10_29_2,
+ pnpm_10,
_7zz,
electron,
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
postPatch
;
- pnpm = pnpm_10_29_2;
+ pnpm = pnpm_10;
# let's just be safe and add these explicitly to nativeBuildInputs
# even though the fetcher already uses them in its implementation
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
moreutils
nodejs
pnpmConfigHook
- pnpm_10_29_2
+ pnpm_10
]
++ lib.optionals stdenv.hostPlatform.isLinux [
copyDesktopItems
From ed3910e2c692c7c6a4ac2edca3f7a0b5238659b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?=
Date: Sun, 28 Jun 2026 14:53:09 +0200
Subject: [PATCH 63/85] teleport_{17,18}: pnpm_10_29_2 -> pnpm_10
---
pkgs/build-support/teleport/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/build-support/teleport/default.nix b/pkgs/build-support/teleport/default.nix
index d696a6243627..8d51876e536a 100644
--- a/pkgs/build-support/teleport/default.nix
+++ b/pkgs/build-support/teleport/default.nix
@@ -10,7 +10,7 @@
nodejs,
openssl,
pkg-config,
- pnpm_10_29_2,
+ pnpm_10,
fetchPnpmDeps,
pnpmConfigHook,
rustc,
@@ -81,7 +81,7 @@ let
pname
version
;
- pnpm = pnpm_10_29_2;
+ pnpm = pnpm_10;
fetcherVersion = 3;
hash = pnpmHash;
};
@@ -91,7 +91,7 @@ let
cargo
nodejs
pnpmConfigHook
- pnpm_10_29_2
+ pnpm_10
rustc
rustc.llvmPackages.lld
rustPlatform.cargoSetupHook
From c191a1732b47c2281f6c8e4b6327901b9b0fd5c1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt
Date: Sun, 28 Jun 2026 14:56:17 +0200
Subject: [PATCH 64/85] python3Packages.barectf: fix setuptools 82 compat
---
.../python-modules/barectf/default.nix | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/barectf/default.nix b/pkgs/development/python-modules/barectf/default.nix
index 661826855615..0ef38100e3cd 100644
--- a/pkgs/development/python-modules/barectf/default.nix
+++ b/pkgs/development/python-modules/barectf/default.nix
@@ -2,9 +2,9 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ fetchpatch,
poetry-core,
pytest7CheckHook,
- setuptools,
jsonschema,
pyyaml,
jinja2,
@@ -23,6 +23,18 @@ buildPythonPackage rec {
hash = "sha256-JelFfd3WS012dveNlIljhLdyPmgE9VEOXoZE3MBA/Gw=";
};
+ patches = [
+ (fetchpatch {
+ name = "setuptools-82-compat.patch";
+ url = "https://github.com/efficios/barectf/commit/e16d289546bb4f6b0d909f79b8d6188eabe32640.patch";
+ hash = "sha256-5tSOxc6trSHFPnVj+7YVO9J65bZ1H2MFKrZAbRy1WTM=";
+ excludes = [
+ "pyproject.toml"
+ "poetry.lock"
+ ];
+ })
+ ];
+
nativeBuildInputs = [
poetry-core
];
@@ -33,8 +45,11 @@ buildPythonPackage rec {
"termcolor"
];
+ pythonRemoveDeps = [
+ "setuptools"
+ ];
+
propagatedBuildInputs = [
- setuptools # needs pkg_resources at runtime
jsonschema
pyyaml
jinja2
From 0cb64fad203bd8729ab3aabab7d98ffef83c5329 Mon Sep 17 00:00:00 2001
From: Seudonym
Date: Fri, 5 Jun 2026 13:14:08 +0530
Subject: [PATCH 65/85] inter: use installFonts
---
pkgs/by-name/in/inter/package.nix | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/pkgs/by-name/in/inter/package.nix b/pkgs/by-name/in/inter/package.nix
index afe7ecea9380..1378a93ff670 100644
--- a/pkgs/by-name/in/inter/package.nix
+++ b/pkgs/by-name/in/inter/package.nix
@@ -2,8 +2,8 @@
lib,
stdenvNoCC,
fetchzip,
+ installFonts,
}:
-
stdenvNoCC.mkDerivation rec {
pname = "inter";
version = "4.1";
@@ -14,15 +14,13 @@ stdenvNoCC.mkDerivation rec {
hash = "sha256-5vdKKvHAeZi6igrfpbOdhZlDX2/5+UvzlnCQV6DdqoQ=";
};
- installPhase = ''
- runHook preInstall
-
- mkdir -p $out/share/fonts/truetype
- cp Inter.ttc InterVariable*.ttf $out/share/fonts/truetype
-
- runHook postInstall
+ nativeBuildInputs = [ installFonts ];
+ postPatch = ''
+ rm extras/ -rf
'';
+ dontInstallWebfonts = true;
+
meta = {
homepage = "https://rsms.me/inter/";
description = "Typeface specially designed for user interfaces";
From 3df64cb5d10263cc0b48f0a8d2c726be6cd7f794 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Sun, 28 Jun 2026 13:09:32 +0000
Subject: [PATCH 66/85] rtk: 0.42.4 -> 0.43.0
---
pkgs/by-name/rt/rtk/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/rt/rtk/package.nix b/pkgs/by-name/rt/rtk/package.nix
index f2966a8c8913..2286c9a334d8 100644
--- a/pkgs/by-name/rt/rtk/package.nix
+++ b/pkgs/by-name/rt/rtk/package.nix
@@ -12,17 +12,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rtk";
- version = "0.42.4";
+ version = "0.43.0";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "rtk-ai";
repo = "rtk";
tag = "v${finalAttrs.version}";
- hash = "sha256-8nLJ5PVefXmoXQyw6HERfCP06C+l4I+7XLwKFNVNpew=";
+ hash = "sha256-n5bkPPsrdM4fE5ltocTjlq+JwRgp39yib6S79fci4m4=";
};
- cargoHash = "sha256-YsKOyEZ281ojqiitnvCFGy/MzHMyr4hlxqMnvrQwguQ=";
+ cargoHash = "sha256-XKUKdhxfnwUCOx9slqx4oUFa09HcosPLVh5Xkh87oSk=";
nativeBuildInputs = [
makeWrapper
From b6d4449398a92718cfaed03bc0e954b6dd8ab448 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Sun, 28 Jun 2026 14:02:43 +0000
Subject: [PATCH 67/85] bottom: 0.13.0 -> 0.14.2
---
pkgs/by-name/bo/bottom/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/bo/bottom/package.nix b/pkgs/by-name/bo/bottom/package.nix
index f799a92f56d1..efac4477c3ae 100644
--- a/pkgs/by-name/bo/bottom/package.nix
+++ b/pkgs/by-name/bo/bottom/package.nix
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "bottom";
- version = "0.13.0";
+ version = "0.14.2";
src = fetchFromGitHub {
owner = "ClementTsang";
repo = "bottom";
tag = finalAttrs.version;
- hash = "sha256-UlkdYrfIjZU6N9W3KSZj4Au333DdejQG3TPRu5CjuBE=";
+ hash = "sha256-0RaMkTmX6figTBjAxoH57330pHpVJJP8br33FxezqB0=";
};
- cargoHash = "sha256-bQOhLlnMHFq5O5OUPWGmt00miKJTycBdhDUnfuUWPVk=";
+ cargoHash = "sha256-wCcc0t8MA0koeGdqVcz4uYKChU7gtHTQ8yqZGNigSxA=";
nativeBuildInputs = [
autoAddDriverRunpath
From 8f8df99200697aa99a6b504fe16953b473155926 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao
Date: Sun, 28 Jun 2026 22:16:07 +0800
Subject: [PATCH 68/85] .github/ISSUE_TEMPLATE: fix hydra icon links
Reference: https://github.com/NixOS/hydra/commit/7935cda933b639b89e4fa9bf0b0e20c992726e2c
---
.github/ISSUE_TEMPLATE/04_build_failure.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/04_build_failure.yml b/.github/ISSUE_TEMPLATE/04_build_failure.yml
index e095322c2e82..fca7254928ad 100644
--- a/.github/ISSUE_TEMPLATE/04_build_failure.yml
+++ b/.github/ISSUE_TEMPLATE/04_build_failure.yml
@@ -56,12 +56,12 @@ body:
description: |
Can [Hydra](https://hydra.nixos.org), Nixpkgs' Continuous Integration system, reproduce this build failure?
Please use the search function in the header bar to locate the last build job for the package in question.
- - If there's a 
icon near the package entry, say '**Yes, Hydra can reproduce this build failure.**'
- - If there's a 
icon near the package entry, then the build failure occurs with another package, and you need to track the original failing package by going down the chain of 'Cached failures' until you reach the final package in the failing dependency chain. Once you locate the failing package, re-write this report against that package and say '**Yes, Hydra can reproduce this build failure.**'
- - If there's a 
icon near the package entry, then it most likely means it's a local issue with your system. (Maybe you ran out of space?)
+ - If there's a 
icon near the package entry, say '**Yes, Hydra can reproduce this build failure.**'
+ - If there's a 
icon near the package entry, then the build failure occurs with another package, and you need to track the original failing package by going down the chain of 'Cached failures' until you reach the final package in the failing dependency chain. Once you locate the failing package, re-write this report against that package and say '**Yes, Hydra can reproduce this build failure.**'
+ - If there's a 
icon near the package entry, then it most likely means it's a local issue with your system. (Maybe you ran out of space?)
You can still open a build failure report, but please say '**No, Hydra cannot reproduce this build failure.**' below.
- - If there's a 
icon near the package entry, say '**Hydra is currently rebuilding this package.**'
- - If there's a 
icon near the package entry, then the build job was stopped manually. If this occurs, please coordinate with the [Infrastructure Team](https://matrix.to/#/#infra:nixos.org), and say '**The last build job was manually cancelled.**'
+ - If there's a 
icon near the package entry, say '**Hydra is currently rebuilding this package.**'
+ - If there's a 
icon near the package entry, then the build job was stopped manually. If this occurs, please coordinate with the [Infrastructure Team](https://matrix.to/#/#infra:nixos.org), and say '**The last build job was manually cancelled.**'
- If Hydra isn't supposed to build the package at all, say '**Hydra doesn’t try to build the package.**'
options:
- "Please select the Hydra Status."
From 529a1fc31812b1cd93236dc2e59bcd22ba889ed2 Mon Sep 17 00:00:00 2001
From: K900
Date: Sun, 28 Jun 2026 14:35:36 +0300
Subject: [PATCH 69/85] playwright.webkit: fix libjxl override
---
pkgs/development/web/playwright/webkit.nix | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/pkgs/development/web/playwright/webkit.nix b/pkgs/development/web/playwright/webkit.nix
index 55f20bdcd9eb..1a29cf31c1e5 100644
--- a/pkgs/development/web/playwright/webkit.nix
+++ b/pkgs/development/web/playwright/webkit.nix
@@ -79,6 +79,13 @@ let
hash = "sha256-I3PGgh0XqRkCFz7lUZ3Q4eU0+0GwaQcVb6t4Pru1kKo=";
fetchSubmodules = true;
};
+
+ # override split output shenanigans from the main package
+ outputs = [
+ "out"
+ "dev"
+ ];
+
patches = [
# Add missing content to fix gcc compilation for RISCV architecture
# https://github.com/libjxl/libjxl/pull/2211
From 4f39574b549ef678d7b2318515746d82f087d587 Mon Sep 17 00:00:00 2001
From: K900
Date: Sun, 28 Jun 2026 14:38:52 +0300
Subject: [PATCH 70/85] python3Packages.fontparts: unpin setuptools-scm
---
pkgs/development/python-modules/fontparts/default.nix | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix
index bc6b8c1e797a..43bf78c3dd3b 100644
--- a/pkgs/development/python-modules/fontparts/default.nix
+++ b/pkgs/development/python-modules/fontparts/default.nix
@@ -31,7 +31,10 @@ buildPythonPackage (finalAttrs: {
postPatch = ''
substituteInPlace pyproject.toml \
- --replace-fail ', "vcs-versioning"' ""
+ --replace-fail ', "vcs-versioning"' "" \
+ --replace-fail "setuptools_scm[toml]>=3.4,<10" "setuptools_scm[toml]"
+ substituteInPlace setup.cfg \
+ --replace-fail "setuptools_scm==9.2.2" "setuptools_scm"
'';
build-system = [
From b812bc2a4a1597b73bc9a5422318fe6bcc9bde34 Mon Sep 17 00:00:00 2001
From: K900
Date: Sun, 28 Jun 2026 14:47:03 +0300
Subject: [PATCH 71/85] treewide: drop gst-vaapi
Upstream dropped it and it no longer builds.
---
.../obs-studio/plugins/obs-vaapi/default.nix | 2 -
pkgs/by-name/ci/citrix-workspace/package.nix | 1 -
pkgs/by-name/de/deltachat-tauri/package.nix | 1 -
.../fl/flet-client-flutter/package.nix | 2 +-
.../gn/gnome-network-displays/package.nix | 1 -
pkgs/by-name/ka/kazumi/package.nix | 1 -
pkgs/by-name/pi/picard/package.nix | 18 +--
pkgs/by-name/pi/pipeline/package.nix | 1 -
pkgs/by-name/py/pympress/package.nix | 1 -
pkgs/by-name/xp/xpra/package.nix | 1 -
.../libraries/gstreamer/default.nix | 3 +-
.../libraries/gstreamer/vaapi/default.nix | 120 ------------------
pkgs/development/libraries/qt-6/default.nix | 1 -
.../qt-6/modules/qtmultimedia/default.nix | 2 -
14 files changed, 9 insertions(+), 146 deletions(-)
delete mode 100644 pkgs/development/libraries/gstreamer/vaapi/default.nix
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix
index fd7837eb5cc3..840c5a50ac76 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix
@@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
# - We need "getLib" instead of default derivation, otherwise it brings gstreamer-bin;
# - without gst-plugins-base it won't even show proper errors in logs;
# - Without gst-plugins-bad it won't find element "vapostproc";
- # - gst-vaapi adds "VA-API" to "Encoder type";
# Tip: "could not link appsrc to videoconvert1" can mean a lot of things, enable GST_DEBUG=2 for help.
passthru.obsWrapperArguments =
let
@@ -48,7 +47,6 @@ stdenv.mkDerivation rec {
gstreamer
gst-plugins-base
gst-plugins-bad
- gst-vaapi
];
# Fix output directory
diff --git a/pkgs/by-name/ci/citrix-workspace/package.nix b/pkgs/by-name/ci/citrix-workspace/package.nix
index 7b1f996bfcf2..9051b4e72b37 100644
--- a/pkgs/by-name/ci/citrix-workspace/package.nix
+++ b/pkgs/by-name/ci/citrix-workspace/package.nix
@@ -91,7 +91,6 @@ let
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-ugly
- gst_all_1.gst-vaapi
];
gstPluginPath = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" gstPackages;
diff --git a/pkgs/by-name/de/deltachat-tauri/package.nix b/pkgs/by-name/de/deltachat-tauri/package.nix
index 26cb46756bca..1387196ffbae 100644
--- a/pkgs/by-name/de/deltachat-tauri/package.nix
+++ b/pkgs/by-name/de/deltachat-tauri/package.nix
@@ -64,7 +64,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
- gst_all_1.gst-vaapi
gst_all_1.gstreamer
libayatana-appindicator
openssl
diff --git a/pkgs/by-name/fl/flet-client-flutter/package.nix b/pkgs/by-name/fl/flet-client-flutter/package.nix
index 867b9d0f2e9c..7733ee43da04 100644
--- a/pkgs/by-name/fl/flet-client-flutter/package.nix
+++ b/pkgs/by-name/fl/flet-client-flutter/package.nix
@@ -51,7 +51,7 @@ flutter338.buildFlutterApplication rec {
mpv-unwrapped
gst_all_1.gst-libav
gst_all_1.gst-plugins-base
- gst_all_1.gst-vaapi
+ gst_all_1.gst-plugins-bad
gst_all_1.gstreamer
libunwind
orc
diff --git a/pkgs/by-name/gn/gnome-network-displays/package.nix b/pkgs/by-name/gn/gnome-network-displays/package.nix
index 681954677367..57e2576d2b7d 100644
--- a/pkgs/by-name/gn/gnome-network-displays/package.nix
+++ b/pkgs/by-name/gn/gnome-network-displays/package.nix
@@ -59,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-ugly
gst_all_1.gst-rtsp-server
- gst_all_1.gst-vaapi
pipewire
networkmanager
json-glib
diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix
index 511e88086d0e..da2c473ae1bb 100644
--- a/pkgs/by-name/ka/kazumi/package.nix
+++ b/pkgs/by-name/ka/kazumi/package.nix
@@ -91,7 +91,6 @@ flutter.buildFlutterApplication {
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
- gst_all_1.gst-vaapi
gst_all_1.gstreamer
libayatana-appindicator
mpv-unwrapped
diff --git a/pkgs/by-name/pi/picard/package.nix b/pkgs/by-name/pi/picard/package.nix
index db9009ebaedf..51336472ded0 100644
--- a/pkgs/by-name/pi/picard/package.nix
+++ b/pkgs/by-name/pi/picard/package.nix
@@ -45,17 +45,13 @@ pythonPackages.buildPythonApplication (finalAttrs: {
++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform qt5.qtwayland) [
qt5.qtwayland
]
- ++ lib.optionals (pyqt5.multimediaEnabled) (
- [
- qt5.qtmultimedia.bin
- gst_all_1.gst-libav
- gst_all_1.gst-plugins-base
- gst_all_1.gst-plugins-good
- ]
- ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform gst_all_1.gst-vaapi) [
- gst_all_1.gst-vaapi
- ]
- );
+ ++ lib.optionals (pyqt5.multimediaEnabled) [
+ qt5.qtmultimedia.bin
+ gst_all_1.gst-libav
+ gst_all_1.gst-plugins-base
+ gst_all_1.gst-plugins-good
+ gst_all_1.gst-plugins-bad
+ ];
pythonRelaxDeps = lib.optionals stdenv.hostPlatform.isDarwin [
# Should be resolved in the next version
diff --git a/pkgs/by-name/pi/pipeline/package.nix b/pkgs/by-name/pi/pipeline/package.nix
index ffd0e38f62a7..32e6e5e887b6 100644
--- a/pkgs/by-name/pi/pipeline/package.nix
+++ b/pkgs/by-name/pi/pipeline/package.nix
@@ -74,7 +74,6 @@ stdenv.mkDerivation (finalAttrs: {
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-ugly
- gst_all_1.gst-vaapi
glib-networking # For GIO_EXTRA_MODULES. Fixes "TLS support is not available"
];
diff --git a/pkgs/by-name/py/pympress/package.nix b/pkgs/by-name/py/pympress/package.nix
index 288ea438fb5d..55a6b40b82cb 100644
--- a/pkgs/by-name/py/pympress/package.nix
+++ b/pkgs/by-name/py/pympress/package.nix
@@ -56,7 +56,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
gst_all_1.gst-plugins-ugly
(gst_all_1.gst-plugins-good.override { gtkSupport = true; })
gst_all_1.gst-libav
- gst_all_1.gst-vaapi
];
doCheck = false; # there are no tests
diff --git a/pkgs/by-name/xp/xpra/package.nix b/pkgs/by-name/xp/xpra/package.nix
index 6d9c26e42de9..bcd5776b7d21 100644
--- a/pkgs/by-name/xp/xpra/package.nix
+++ b/pkgs/by-name/xp/xpra/package.nix
@@ -159,7 +159,6 @@ effectiveBuildPythonApplication rec {
]
++ (with gst_all_1; [
gst-libav
- gst-vaapi
gst-plugins-ugly
gst-plugins-bad
gst-plugins-base
diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index b41e8192aaa4..21712e04da55 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -37,8 +37,6 @@ lib.makeScope newScope (
gst-editing-services = callPackage ./ges { };
- gst-vaapi = callPackage ./vaapi { };
-
icamerasrc-ipu6 = callPackage ./icamerasrc { };
icamerasrc-ipu6ep = callPackage ./icamerasrc {
ipu6-camera-hal = ipu6ep-camera-hal;
@@ -51,5 +49,6 @@ lib.makeScope newScope (
}
// lib.optionalAttrs config.allowAliases {
gst-plugins-viperfx = throw "'gst_all_1.gst-plugins-viperfx' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
+ gst-vaapi = throw "'gst_all_1.gst-vaapi' has been removed in GStreamer 1.28. Users are recommended to switch to gst-plugins-bad, however it is not an in-place upgrade."; # Added 2026-06-28
}
)
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
deleted file mode 100644
index e5796cc6a9e8..000000000000
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ /dev/null
@@ -1,120 +0,0 @@
-{
- lib,
- stdenv,
- fetchurl,
- meson,
- ninja,
- pkg-config,
- gst-plugins-base,
- bzip2,
- libva,
- wayland,
- wayland-protocols,
- wayland-scanner,
- libdrm,
- udev,
- libxv,
- libxrandr,
- libxext,
- libx11,
- libsm,
- libice,
- libxcb,
- libGLU,
- libGL,
- gstreamer,
- gst-plugins-bad,
- nasm,
- libvpx,
- python3,
- # Checks meson.is_cross_build(), so even canExecute isn't enough.
- enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform,
- hotdoc,
- directoryListingUpdater,
- apple-sdk_gstreamer,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
- pname = "gstreamer-vaapi";
- version = "1.26.11";
-
- outputs = [
- "out"
- "dev"
- ];
-
- src = fetchurl {
- url = "https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-${finalAttrs.version}.tar.xz";
- hash = "sha256-8S+TAnPHodPg1/hblP+dE3nRYqzMky6Mo9OJk+0n/Kw=";
- };
-
- separateDebugInfo = true;
-
- __structuredAttrs = true;
- strictDeps = true;
-
- nativeBuildInputs = [
- meson
- ninja
- pkg-config
- python3
- bzip2
- wayland-scanner
- ]
- ++ lib.optionals enableDocumentation [
- hotdoc
- ];
-
- buildInputs = [
- gstreamer
- gst-plugins-base
- gst-plugins-bad
- libva
- wayland
- wayland-protocols
- libdrm
- udev
- libx11
- libxcb
- libxext
- libxv
- libxrandr
- libsm
- libice
- nasm
- libvpx
- ]
- ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
- libGL
- libGLU
- ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- apple-sdk_gstreamer
- ];
-
- mesonFlags = [
- "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
- (lib.mesonEnable "doc" enableDocumentation)
- ];
-
- postPatch = ''
- patchShebangs \
- scripts/extract-release-date-from-doap-file.py
- '';
-
- preFixup = ''
- moveToOutput "lib/gstreamer-1.0/pkgconfig" "$dev"
- '';
-
- passthru = {
- updateScript = directoryListingUpdater { odd-unstable = true; };
- };
-
- meta = {
- description = "Set of VAAPI GStreamer Plug-ins";
- homepage = "https://gstreamer.freedesktop.org";
- license = lib.licenses.lgpl21Plus;
- platforms = lib.platforms.linux;
- maintainers = with lib.maintainers; [ tmarkus ];
- };
-})
diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix
index b8a7afb5496c..6f1489005a12 100644
--- a/pkgs/development/libraries/qt-6/default.nix
+++ b/pkgs/development/libraries/qt-6/default.nix
@@ -89,7 +89,6 @@ let
gst-plugins-base
gst-plugins-good
gst-libav
- gst-vaapi
;
};
qtmqtt = callPackage ./modules/qtmqtt.nix { };
diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
index 104bfb752531..50829d0b0ef7 100644
--- a/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
@@ -14,7 +14,6 @@
gst-plugins-base,
gst-plugins-good,
gst-libav,
- gst-vaapi,
ffmpeg,
libva,
libpulseaudio,
@@ -59,7 +58,6 @@ qtModule {
gst-plugins-base
gst-plugins-good
gst-libav
- gst-vaapi
];
patches = lib.optionals stdenv.hostPlatform.isMinGW [
From d5f3ba05b658a8842ed5d483b29564c968c78209 Mon Sep 17 00:00:00 2001
From: K900
Date: Sun, 28 Jun 2026 14:49:03 +0300
Subject: [PATCH 72/85] python3Packages.jq: skip another test that relies on
exact jq error text
---
pkgs/development/python-modules/jq/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/development/python-modules/jq/default.nix b/pkgs/development/python-modules/jq/default.nix
index 01c93b61a9fe..39fc694fa546 100644
--- a/pkgs/development/python-modules/jq/default.nix
+++ b/pkgs/development/python-modules/jq/default.nix
@@ -38,6 +38,7 @@ buildPythonPackage rec {
disabledTests = [
# tries to match exact error text, fails with jq 1.8
"test_value_error_is_raised_if_program_is_invalid"
+ "test_value_error_is_raised_if_input_cannot_be_processed_by_program"
];
pythonImportsCheck = [ "jq" ];
From 22927b96798d1cdbf665448f97898f1b32253e52 Mon Sep 17 00:00:00 2001
From: K900
Date: Sun, 28 Jun 2026 14:50:45 +0300
Subject: [PATCH 73/85] treewide: drop python3Packages.aiosasl and friends
---
pkgs/by-name/ur/urlwatch/package.nix | 1 -
.../python-modules/aiosasl/default.nix | 52 ----------
.../python-modules/aioxmpp/default.nix | 98 -------------------
pkgs/top-level/python-aliases.nix | 2 +
pkgs/top-level/python-packages.nix | 4 -
5 files changed, 2 insertions(+), 155 deletions(-)
delete mode 100644 pkgs/development/python-modules/aiosasl/default.nix
delete mode 100644 pkgs/development/python-modules/aioxmpp/default.nix
diff --git a/pkgs/by-name/ur/urlwatch/package.nix b/pkgs/by-name/ur/urlwatch/package.nix
index 662eb3ec4fe1..8e9a88908a66 100644
--- a/pkgs/by-name/ur/urlwatch/package.nix
+++ b/pkgs/by-name/ur/urlwatch/package.nix
@@ -19,7 +19,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
build-system = with python3Packages; [ setuptools ];
dependencies = with python3Packages; [
- aioxmpp
beautifulsoup4
cssbeautifier
cssselect
diff --git a/pkgs/development/python-modules/aiosasl/default.nix b/pkgs/development/python-modules/aiosasl/default.nix
deleted file mode 100644
index 95f5ed8e7470..000000000000
--- a/pkgs/development/python-modules/aiosasl/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
- lib,
- buildPythonPackage,
- fetchFromGitHub,
- fetchpatch,
- pyopenssl,
- pytestCheckHook,
- setuptools,
-}:
-
-buildPythonPackage rec {
- pname = "aiosasl";
- version = "0.5.0";
- pyproject = true;
-
- src = fetchFromGitHub {
- owner = "horazont";
- repo = "aiosasl";
- tag = "v${version}";
- hash = "sha256-JIuNPb/l4QURMQc905H2iNGCfMz+zM/QJhDQOR8LPdc=";
- };
-
- patches = [
- (fetchpatch {
- name = "python311-compat.patch";
- url = "https://github.com/horazont/aiosasl/commit/44c48d36b416bd635d970dba2607a31b2167ea1b.patch";
- hash = "sha256-u6PJKV54dU2MA9hXa/9hJ3eLVds1DuLHGbt8y/OakWs=";
- })
- ];
-
- postPatch = ''
- # https://github.com/horazont/aiosasl/issues/28
- substituteInPlace tests/test_aiosasl.py \
- --replace-fail "assertRaisesRegexp" "assertRaisesRegex"
- '';
-
- build-system = [ setuptools ];
-
- nativeCheckInputs = [
- pyopenssl
- pytestCheckHook
- ];
-
- pythonImportsCheck = [ "aiosasl" ];
-
- meta = {
- description = "Asyncio SASL library";
- homepage = "https://github.com/horazont/aiosasl";
- license = lib.licenses.lgpl3Plus;
- maintainers = with lib.maintainers; [ dotlambda ];
- };
-}
diff --git a/pkgs/development/python-modules/aioxmpp/default.nix b/pkgs/development/python-modules/aioxmpp/default.nix
deleted file mode 100644
index e0285de62caa..000000000000
--- a/pkgs/development/python-modules/aioxmpp/default.nix
+++ /dev/null
@@ -1,98 +0,0 @@
-{
- lib,
- aioopenssl,
- aiosasl,
- babel,
- buildPythonPackage,
- dnspython,
- fetchFromCodeberg,
- lxml,
- multidict,
- pyasn1-modules,
- pyasn1,
- pyopenssl,
- pytestCheckHook,
- pythonAtLeast,
- pytz,
- setuptools,
- sortedcollections,
- tzlocal,
-}:
-
-buildPythonPackage rec {
- pname = "aioxmpp";
- version = "0.13.3";
- pyproject = true;
-
- src = fetchFromCodeberg {
- owner = "jssfr";
- repo = "aioxmpp";
- tag = "v${version}";
- hash = "sha256-bQPKEM5eKhFI3Kx3U1espdxqjnG4yUgOXmYCrd98PDo=";
- };
-
- postPatch = ''
- substituteInPlace tests/bookmarks/test_service.py \
- --replace-fail 'can only assign an iterable$' 'must assign iterable'
- substituteInPlace tests/test_utils.py \
- --replace-fail 'property of .* has no' 'property .*of .* has no'
- '';
-
- pythonRelaxDeps = [
- "lxml"
- ];
-
- build-system = [ setuptools ];
-
- dependencies = [
- aiosasl
- aioopenssl
- babel
- dnspython
- lxml
- multidict
- pyasn1
- pyasn1-modules
- pyopenssl
- pytz
- sortedcollections
- tzlocal
- ];
-
- pythonImportsCheck = [
- "aioxmpp"
- "aioxmpp.node"
- "aioxmpp.security_layer"
- "aioxmpp.stanza"
- "aioxmpp.stream"
- ];
-
- nativeCheckInputs = [ pytestCheckHook ];
-
- disabledTestPaths = [ "benchmarks" ];
-
- disabledTests = [
- # AttributeError: 'zoneinfo.ZoneInfo' object has no attribute 'normalize'
- "test_convert_field_datetime_default_locale"
- ]
- ++ lib.optionals (pythonAtLeast "3.12") [
- # asyncio issues
- "test_is_abstract"
- "Testbackground"
- "TestCapturingXSO"
- "Testcheck_x509"
- "TestClient"
- "TestIntegerType"
- "TestStanzaStream"
- "TestStanzaToken"
- "TestXMLStream"
- ];
-
- meta = {
- description = "Pure-python XMPP library for asyncio";
- homepage = "https://codeberg.org/jssfr/aioxmpp";
- changelog = "https://codeberg.org/jssfr/aioxmpp/src/tag/${src.tag}/docs/api/changelog.rst";
- license = lib.licenses.lgpl3Plus;
- maintainers = with lib.maintainers; [ dotlambda ];
- };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index bb7a0d656d72..09ee27d347d3 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -78,8 +78,10 @@ mapAliases {
abjad = throw "'abjad' was removed due to lack of maintenance"; # Added 2026-03-24
abodepy = throw "'abodepy' has been renamed to/replaced by 'jaraco-abode'"; # Converted to throw 2025-10-29
aioinflux = throw "'aioinflux' was removed because it is abandonned upstream. For InfluxDB v2+ support, please use the official Python client library"; # Added 2026-01-15
+ aiosasl = throw "'aiosasl' was removed because it is abandoned upstream and does not work on modern Python versions."; # Added 2026-06-28
aiosenz = throw "aiosenz was removed because Home Assistant switched to pysenz"; # added 2025-12-29
aioshutil = throw "'aioshutil' was removed because uiprotect no longer depends on it"; # added 2026-02-16
+ aioxmpp = throw "'aioxmpp' was removed because it depends on aiosasl, which is abandoned and does not work on modern Python versions."; # Added 2026-06-28
amazon-kclpy = throw "amazon-kclpy has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
amazon_kclpy = throw "'amazon_kclpy' has been renamed to/replaced by 'amazon-kclpy'"; # Converted to throw 2025-10-29
amqplib = throw "amqplib has been removed as it was unmaintained upstream"; # Added 2025-11-22
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8f90a996d573..921aef1f726a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -516,8 +516,6 @@ self: super: with self; {
aiorwlock = callPackage ../development/python-modules/aiorwlock { };
- aiosasl = callPackage ../development/python-modules/aiosasl { };
-
aiosendspin = callPackage ../development/python-modules/aiosendspin { };
aiosendspin-mpris = callPackage ../development/python-modules/aiosendspin-mpris { };
@@ -600,8 +598,6 @@ self: super: with self; {
aiowmi = callPackage ../development/python-modules/aiowmi { };
- aioxmpp = callPackage ../development/python-modules/aioxmpp { };
-
aioymaps = callPackage ../development/python-modules/aioymaps { };
aiozeroconf = callPackage ../development/python-modules/aiozeroconf { };
From 8240c4665a8083eef1f75d2d6f29ffed313c627d Mon Sep 17 00:00:00 2001
From: K900
Date: Sun, 28 Jun 2026 15:10:01 +0300
Subject: [PATCH 74/85] python3Packages.aiohttp-jinja2: fix build with aiohttp
3.14
---
.../python-modules/aiohttp-jinja2/aiohttp-3.14.patch | 11 +++++++++++
.../python-modules/aiohttp-jinja2/default.nix | 5 +++++
2 files changed, 16 insertions(+)
create mode 100644 pkgs/development/python-modules/aiohttp-jinja2/aiohttp-3.14.patch
diff --git a/pkgs/development/python-modules/aiohttp-jinja2/aiohttp-3.14.patch b/pkgs/development/python-modules/aiohttp-jinja2/aiohttp-3.14.patch
new file mode 100644
index 000000000000..7070f63fefb1
--- /dev/null
+++ b/pkgs/development/python-modules/aiohttp-jinja2/aiohttp-3.14.patch
@@ -0,0 +1,11 @@
+--- a/aiohttp_jinja2/__init__.py
++++ b/aiohttp_jinja2/__init__.py
+@@ -38,7 +38,7 @@
+ "APP_CONTEXT_PROCESSORS_KEY"
+ )
+ APP_KEY: Final = web.AppKey[jinja2.Environment]("APP_KEY")
+-REQUEST_CONTEXT_KEY: Final = "aiohttp_jinja2_context"
++REQUEST_CONTEXT_KEY: Final = web.RequestKey("jinja_context", dict)
+
+ _T = TypeVar("_T")
+ _P = ParamSpec("_P")
\ No newline at end of file
diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix
index 9ccf48edc5e1..d917bc9eaced 100644
--- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix
+++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix
@@ -20,6 +20,11 @@ buildPythonPackage rec {
hash = "sha256-o6f/UmTlvKUuiuVHu/0HYbcklSMNQ40FtsCRW+YZsOI=";
};
+ patches = [
+ # Adapted from https://github.com/aio-libs/aiohttp-jinja2/pull/1025
+ ./aiohttp-3.14.patch
+ ];
+
build-system = [ setuptools ];
dependencies = [
From db6a86467918a3cd155b8e0eedee144d628931ec Mon Sep 17 00:00:00 2001
From: K900
Date: Sun, 28 Jun 2026 15:10:13 +0300
Subject: [PATCH 75/85] tpm2-tss: don't test on 32-bit
swtpm doesn't build on 32-bit targets so we can't run the tests.
---
pkgs/development/libraries/tpm2-tss/default.nix | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix
index b4bce91d0878..6bf372a5dd92 100644
--- a/pkgs/development/libraries/tpm2-tss/default.nix
+++ b/pkgs/development/libraries/tpm2-tss/default.nix
@@ -167,7 +167,9 @@ stdenv.mkDerivation (finalAttrs: {
stdenv.buildPlatform.canExecute stdenv.hostPlatform
&& !stdenv.hostPlatform.isDarwin
# Tests rely on mocking, which can't work with static libs.
- && !stdenv.hostPlatform.isStatic;
+ && !stdenv.hostPlatform.isStatic
+ # swtpm does not build on 32-bit targets
+ && !stdenv.hostPlatform.is32bit;
# Since we rewrote the load path in the dynamic loader for the TCTI
# The various tcti implementation should be placed in their target directory
# before we could run tests, so we make turn checkPhase into installCheckPhase
From 87e2e48e4e3d3fc4057446c16a59af901e4c08bd Mon Sep 17 00:00:00 2001
From: K900
Date: Sun, 28 Jun 2026 15:12:21 +0300
Subject: [PATCH 76/85] lemmy-server: allow warnings
Remember kids, don't -Werror in production.
---
pkgs/servers/web-apps/lemmy/server.nix | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix
index c3cb5c6444e1..1b6028b4f37e 100644
--- a/pkgs/servers/web-apps/lemmy/server.nix
+++ b/pkgs/servers/web-apps/lemmy/server.nix
@@ -49,6 +49,9 @@ rustPlatform.buildRustPackage rec {
PROTOC = "${protobuf}/bin/protoc";
PROTOC_INCLUDE = "${protobuf}/include";
+
+ # #[deny(warnings)] trips on newer rustc
+ RUSTFLAGS = "--cap-lints warn";
};
nativeBuildInputs = [
protobuf
From b9ec3822af779f9bb6df21b40fe7d12ca8e5bd64 Mon Sep 17 00:00:00 2001
From: K900
Date: Sun, 28 Jun 2026 17:09:01 +0300
Subject: [PATCH 77/85] python3Packages.pandas: 3.0.3 -> 3.0.4
Fixes crash
---
pkgs/development/python-modules/pandas/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index e4b838dba6ba..a0519d35c2ab 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -63,7 +63,7 @@
let
pandas = buildPythonPackage rec {
pname = "pandas";
- version = "3.0.3";
+ version = "3.0.4";
pyproject = true;
src = fetchFromGitHub {
@@ -73,7 +73,7 @@ let
postFetch = ''
sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' $out/pandas/_version.py
'';
- hash = "sha256-G+pWdmft/kcxv97ySa+0ZFEgvMKuNaK33DseZQ8R1z8=";
+ hash = "sha256-cPnvBVs5xXjbRoj6KU/KeNn+To9oue7H0OBaJ2JdJG4=";
};
# A NOTE regarding the Numpy version relaxing: Both Numpy versions 1.x &
From 696dfc991b1a980164849bbad98a55acbcba6049 Mon Sep 17 00:00:00 2001
From: Aiden Schembri
Date: Fri, 5 Jun 2026 09:33:20 +0200
Subject: [PATCH 78/85] ladybird: 0-unstable-2026-05-04 ->
0-unstable-2026-06-05
---
pkgs/by-name/la/ladybird/package.nix | 42 ++++++++++++++++++++++++----
1 file changed, 37 insertions(+), 5 deletions(-)
diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix
index 47d584108578..9d0bb1d819af 100644
--- a/pkgs/by-name/la/ladybird/package.nix
+++ b/pkgs/by-name/la/ladybird/package.nix
@@ -3,6 +3,7 @@
stdenv,
fetchFromGitHub,
fetchpatch,
+ fetchurl,
unicode-emoji,
unicode-character-database,
unicode-idna,
@@ -14,6 +15,7 @@
libavif,
angle, # libEGL
libjxl,
+ libedit,
libpulseaudio,
libwebp,
libxcrypt,
@@ -34,26 +36,34 @@
skia,
nixosTests,
unstableGitUpdater,
+ _experimental-update-script-combinators,
+ common-updater-scripts,
libtommath,
sdl3,
icu78,
simdjson,
}:
+let
+ hstsPreloadData = fetchurl {
+ url = "https://raw.githubusercontent.com/chromium/chromium/aa04f175415addb04bb78936b0d8b973fbd8ea61/net/http/transport_security_state_static.json";
+ hash = "sha256-TKcPBRVxoZgka8M3vTV/dZ+4+f3t2+ZrZZYJl1QO4WM=";
+ };
+in
stdenv.mkDerivation (finalAttrs: {
pname = "ladybird";
- version = "0-unstable-2026-05-04";
+ version = "0-unstable-2026-06-05";
src = fetchFromGitHub {
owner = "LadybirdBrowser";
repo = "ladybird";
- rev = "90b790f8702a5d5c5a66ef02f8669da2838ca6e3";
- hash = "sha256-BdJ24YtKMv8B6Vvequf9b5qr0S3FfFuphFo78mCIaN4=";
+ rev = "02b205361dd239e134f434e484b609d1fa5f1938";
+ hash = "sha256-+CVJjrL1kqT2A7r89F+riiHpMa39rcggqG9SByidUY4=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
- hash = "sha256-sbNYOdY56+waCVQHbGuvV5jT9EawV2IiGmL1e/O6ZRc=";
+ hash = "sha256-n0ACVH8NXwe7SIaGFoJ20WIGGR3XjcuLTwPSKGJpT5s=";
};
postPatch = ''
@@ -85,6 +95,9 @@ stdenv.mkDerivation (finalAttrs: {
mkdir build/Caches/PublicSuffix
cp ${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat build/Caches/PublicSuffix
+
+ mkdir build/Caches/HSTSPreload
+ cp ${hstsPreloadData} build/Caches/HSTSPreload/transport_security_state_static.json
'';
nativeBuildInputs = [
@@ -109,6 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
libavif
angle # libEGL
libjxl
+ libedit
libwebp
libxcrypt
mimalloc
@@ -176,7 +190,25 @@ stdenv.mkDerivation (finalAttrs: {
nixosTest = nixosTests.ladybird;
};
- passthru.updateScript = unstableGitUpdater { };
+ passthru.updateScript =
+ let
+ updateSource = unstableGitUpdater {
+ hardcodeZeroVersion = true;
+ };
+
+ updateCargoDeps = {
+ command = [
+ (lib.getExe' common-updater-scripts "update-source-version")
+ "ladybird"
+ "--ignore-same-version"
+ "--source-key=cargoDeps.vendorStaging"
+ ];
+ };
+ in
+ _experimental-update-script-combinators.sequence [
+ updateSource
+ updateCargoDeps
+ ];
meta = {
description = "Browser using the SerenityOS LibWeb engine with a Qt or Cocoa GUI";
From ffec75b842aa60673fc860a56a1f6f2a81f4d864 Mon Sep 17 00:00:00 2001
From: Martin Weinelt
Date: Sun, 28 Jun 2026 17:04:34 +0200
Subject: [PATCH 79/85] python3Packages.opentelemetry-instrumentation-logging:
disable benchmarking
---
.../opentelemetry-instrumentation-logging/default.nix | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-logging/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-logging/default.nix
index c81381cdf363..6e459a895c75 100644
--- a/pkgs/development/python-modules/opentelemetry-instrumentation-logging/default.nix
+++ b/pkgs/development/python-modules/opentelemetry-instrumentation-logging/default.nix
@@ -1,10 +1,10 @@
{
- lib,
buildPythonPackage,
hatchling,
opentelemetry-api,
opentelemetry-instrumentation,
opentelemetry-test-utils,
+ pytest-benchmark,
pytestCheckHook,
}:
@@ -24,9 +24,14 @@ buildPythonPackage {
nativeCheckInputs = [
opentelemetry-test-utils
+ pytest-benchmark
pytestCheckHook
];
+ pytestFlags = [
+ "--benchmark-disable"
+ ];
+
pythonImportsCheck = [ "opentelemetry.instrumentation.logging" ];
meta = opentelemetry-instrumentation.meta // {
From 0c81eaadca25a8fcfeeb2a0dc46cb9a481d4ebf2 Mon Sep 17 00:00:00 2001
From: Aiden Schembri
Date: Sun, 28 Jun 2026 17:05:26 +0200
Subject: [PATCH 80/85] chromium-hsts-preload-list: init at 151.0.7891.2
---
.../ch/chromium-hsts-preload-list/package.nix | 37 +++++++++++++++++++
.../ch/chromium-hsts-preload-list/update.sh | 17 +++++++++
pkgs/by-name/la/ladybird/package.nix | 10 +----
pkgs/by-name/li/libhsts/package.nix | 15 +-------
pkgs/by-name/li/libhsts/update.sh | 14 -------
5 files changed, 58 insertions(+), 35 deletions(-)
create mode 100644 pkgs/by-name/ch/chromium-hsts-preload-list/package.nix
create mode 100755 pkgs/by-name/ch/chromium-hsts-preload-list/update.sh
delete mode 100755 pkgs/by-name/li/libhsts/update.sh
diff --git a/pkgs/by-name/ch/chromium-hsts-preload-list/package.nix b/pkgs/by-name/ch/chromium-hsts-preload-list/package.nix
new file mode 100644
index 000000000000..694535a8d51f
--- /dev/null
+++ b/pkgs/by-name/ch/chromium-hsts-preload-list/package.nix
@@ -0,0 +1,37 @@
+{
+ lib,
+ stdenvNoCC,
+ fetchurl,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+ pname = "chromium-hsts-preload-list";
+ version = "151.0.7891.2";
+
+ src = fetchurl {
+ url = "https://raw.github.com/chromium/chromium/${finalAttrs.version}/net/http/transport_security_state_static.json";
+ hash = "sha256-YuiotSk0Lf3IHz/UjgCmU/brdB1lszob6DN4DXyjiWU=";
+ };
+
+ dontUnpack = true;
+ strictDeps = true;
+ __structuredAttrs = true;
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm444 $src $out/share/chromium-hsts-preload-list/transport_security_state_static.json
+
+ runHook postInstall
+ '';
+
+ passthru.updateScript = ./update.sh;
+
+ meta = {
+ description = "Chromium HSTS preload list";
+ homepage = "https://www.chromium.org/hsts/";
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ schembriaiden ];
+ platforms = lib.platforms.all;
+ };
+})
diff --git a/pkgs/by-name/ch/chromium-hsts-preload-list/update.sh b/pkgs/by-name/ch/chromium-hsts-preload-list/update.sh
new file mode 100755
index 000000000000..4fa1d3459839
--- /dev/null
+++ b/pkgs/by-name/ch/chromium-hsts-preload-list/update.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p common-updater-scripts curl jq nix
+
+set -euo pipefail
+
+latest_version=$(
+ curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/chromium/chromium/tags" \
+ | jq -r 'map(select(.prerelease | not)) | .[1].name'
+)
+
+hash=$(
+ nix-prefetch-url "https://raw.github.com/chromium/chromium/$latest_version/net/http/transport_security_state_static.json"
+)
+sri_hash=$(nix hash convert --hash-algo sha256 --to sri "$hash")
+
+cd "$(dirname "$0")/../../../.."
+update-source-version chromium-hsts-preload-list "$latest_version" "$sri_hash"
diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix
index 9d0bb1d819af..5e8f45e08a92 100644
--- a/pkgs/by-name/la/ladybird/package.nix
+++ b/pkgs/by-name/la/ladybird/package.nix
@@ -3,11 +3,11 @@
stdenv,
fetchFromGitHub,
fetchpatch,
- fetchurl,
unicode-emoji,
unicode-character-database,
unicode-idna,
publicsuffix-list,
+ chromium-hsts-preload-list,
cmake,
ninja,
pkg-config,
@@ -44,12 +44,6 @@
simdjson,
}:
-let
- hstsPreloadData = fetchurl {
- url = "https://raw.githubusercontent.com/chromium/chromium/aa04f175415addb04bb78936b0d8b973fbd8ea61/net/http/transport_security_state_static.json";
- hash = "sha256-TKcPBRVxoZgka8M3vTV/dZ+4+f3t2+ZrZZYJl1QO4WM=";
- };
-in
stdenv.mkDerivation (finalAttrs: {
pname = "ladybird";
version = "0-unstable-2026-06-05";
@@ -97,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
cp ${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat build/Caches/PublicSuffix
mkdir build/Caches/HSTSPreload
- cp ${hstsPreloadData} build/Caches/HSTSPreload/transport_security_state_static.json
+ cp ${chromium-hsts-preload-list}/share/chromium-hsts-preload-list/transport_security_state_static.json build/Caches/HSTSPreload
'';
nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libhsts/package.nix b/pkgs/by-name/li/libhsts/package.nix
index b5d9fae0bb2a..621ea039025d 100644
--- a/pkgs/by-name/li/libhsts/package.nix
+++ b/pkgs/by-name/li/libhsts/package.nix
@@ -2,21 +2,12 @@
lib,
stdenv,
fetchFromGitLab,
- fetchurl,
+ chromium-hsts-preload-list,
autoconf-archive,
autoreconfHook,
pkg-config,
python3,
}:
-let
- chromium_version = "151.0.7891.2";
-
- hsts_list = fetchurl {
- url = "https://raw.github.com/chromium/chromium/${chromium_version}/net/http/transport_security_state_static.json";
- hash = "sha256-YuiotSk0Lf3IHz/UjgCmU/brdB1lszob6DN4DXyjiWU=";
- };
-
-in
stdenv.mkDerivation rec {
pname = "libhsts";
version = "0.1.0";
@@ -39,7 +30,7 @@ stdenv.mkDerivation rec {
postPatch = ''
pushd tests
- cp ${hsts_list} transport_security_state_static.json
+ cp ${chromium-hsts-preload-list}/share/chromium-hsts-preload-list/transport_security_state_static.json .
# strip comments from json
sed 's/^ *\/\/.*$//g' transport_security_state_static.json >hsts.json
popd
@@ -53,8 +44,6 @@ stdenv.mkDerivation rec {
python3
];
- passthru.updateScript = ./update.sh;
-
meta = {
description = "Library to easily check a domain against the Chromium HSTS Preload list";
mainProgram = "hsts";
diff --git a/pkgs/by-name/li/libhsts/update.sh b/pkgs/by-name/li/libhsts/update.sh
deleted file mode 100755
index 911f91918332..000000000000
--- a/pkgs/by-name/li/libhsts/update.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl jq
-
-set -euo pipefail -x
-
-cd "$(dirname "$0")"
-
-chromium_version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/chromium/chromium/tags" | jq -r 'map(select(.prerelease | not)) | .[1].name')
-sha256=$(nix-prefetch-url "https://raw.github.com/chromium/chromium/$chromium_version/net/http/transport_security_state_static.json")
-hash=$(nix hash convert --to sri "$sha256")
-
-sed -e "0,/chromium_version/s/chromium_version = \".*\"/chromium_version = \"$chromium_version\"/" \
- -e "0,/hash/s/hash = \".*\"/sha256 = \"$hash\"/" \
- --in-place ./default.nix
From 5aece2a41360ef27c0c67cfd83abb77b191b707d Mon Sep 17 00:00:00 2001
From: Martin Weinelt
Date: Sun, 28 Jun 2026 17:26:46 +0200
Subject: [PATCH 81/85] python3Packages.seaborn: disable failing tests
These are probably related to the matplotlib 3.11 bump.
---
pkgs/development/python-modules/seaborn/default.nix | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix
index 08041d7a5d7b..3a48512d690b 100644
--- a/pkgs/development/python-modules/seaborn/default.nix
+++ b/pkgs/development/python-modules/seaborn/default.nix
@@ -12,6 +12,7 @@
pandas,
scipy,
statsmodels,
+ writableTmpDirAsHomeHook,
}:
buildPythonPackage rec {
@@ -64,11 +65,16 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytest-xdist
pytest8_3CheckHook
+ writableTmpDirAsHomeHook
];
disabledTests = [
# requires internet connection
"test_load_dataset_string_error"
+ # matplotlib error string matching
+ "test_theme_validation"
+ # log scale transformation match too strict
+ "test_log_scale"
]
++ lib.optionals (!stdenv.hostPlatform.isx86) [
# overly strict float tolerances
From afe08de82e9b643dc3f53e785a3d205627baf465 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Sun, 28 Jun 2026 16:01:59 +0000
Subject: [PATCH 82/85] rs-lxmf: 1.0.0 -> 1.0.1
---
pkgs/by-name/rs/rs-lxmf/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/rs/rs-lxmf/package.nix b/pkgs/by-name/rs/rs-lxmf/package.nix
index 3c3732e2a4ac..a7da96f88d3e 100644
--- a/pkgs/by-name/rs/rs-lxmf/package.nix
+++ b/pkgs/by-name/rs/rs-lxmf/package.nix
@@ -9,14 +9,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rs-lxmf";
- version = "1.0.0";
+ version = "1.0.1";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "ratspeak";
repo = "rsLXMF";
tag = "v${finalAttrs.version}";
- hash = "sha256-fqSd+XZayW8mYdUF3MY/KjclvhfHtO1I4y1ot3EbdnA=";
+ hash = "sha256-VxtuDM34EnDya/OPA9H+ihrAdueczqjXsjQZMYenDIE=";
};
postPatch = ''
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
done
'';
- cargoHash = "sha256-Lv+mxsAtpzjd9tbMioZEH+7rvYVRiPYfD3icgQc+BrU=";
+ cargoHash = "sha256-qMDqCH2oCZDJ8TQTDtgxooL1Ltn4khVyXr186NfWtKY=";
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
From cb262ee05de93b8998123b04668c0b2f5deed637 Mon Sep 17 00:00:00 2001
From: K900
Date: Thu, 25 Jun 2026 16:13:14 +0300
Subject: [PATCH 83/85] opencloud: 7.1.0 -> 7.2.0
Diff: https://github.com/opencloud-eu/opencloud/compare/v7.1.0...v7.2.0
Changelog: https://github.com/opencloud-eu/opencloud/blob/v7.2.0/CHANGELOG.md
---
pkgs/by-name/op/opencloud/idp-web.nix | 2 +-
pkgs/by-name/op/opencloud/package.nix | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/op/opencloud/idp-web.nix b/pkgs/by-name/op/opencloud/idp-web.nix
index 9cb501702c2f..1d7f65bda3e5 100644
--- a/pkgs/by-name/op/opencloud/idp-web.nix
+++ b/pkgs/by-name/op/opencloud/idp-web.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
pnpm = pnpm_11;
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pnpmRoot}";
fetcherVersion = 4;
- hash = "sha256-NN5MmWYQgaG4s8+mnLWo8EzOobACOnYhdwt4+/4kz9o=";
+ hash = "sha256-pQ01vBvC29B5oxDWtt7anI5QtFbvQFFBVamQtA2WTNo=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/op/opencloud/package.nix b/pkgs/by-name/op/opencloud/package.nix
index 500c89f0f85f..983299455638 100644
--- a/pkgs/by-name/op/opencloud/package.nix
+++ b/pkgs/by-name/op/opencloud/package.nix
@@ -28,13 +28,13 @@ let
in
buildGoModule (finalAttrs: {
pname = "opencloud";
- version = "7.1.0";
+ version = "7.2.0";
src = fetchFromGitHub {
owner = "opencloud-eu";
repo = "opencloud";
tag = "v${finalAttrs.version}";
- hash = "sha256-Lr/YF+vuaBIe6sQ+CeVuqV6BDe9jAIQLTZbCKyvn6As=";
+ hash = "sha256-GAoDEXk7sBN7N0V/msi/fcJS72RqqlF6Qb5B9hArmvk=";
};
postPatch = ''
From 35edb8aaa8caccd963c9428d4d93148f2e7e81da Mon Sep 17 00:00:00 2001
From: K900
Date: Sun, 28 Jun 2026 19:22:47 +0300
Subject: [PATCH 84/85] opencloud.web: 7.1.0 -> 7.1.2
Diff: https://github.com/opencloud-eu/web/compare/v7.1.0...v7.1.2
Changelog: https://github.com/opencloud-eu/web/blob/v7.1.2/CHANGELOG.md
---
pkgs/by-name/op/opencloud/web.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/op/opencloud/web.nix b/pkgs/by-name/op/opencloud/web.nix
index 7a679bc9d8c2..63367385af39 100644
--- a/pkgs/by-name/op/opencloud/web.nix
+++ b/pkgs/by-name/op/opencloud/web.nix
@@ -10,20 +10,20 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "opencloud-web";
- version = "7.1.0";
+ version = "7.1.2";
src = fetchFromGitHub {
owner = "opencloud-eu";
repo = "web";
tag = "v${finalAttrs.version}";
- hash = "sha256-awEGCmdauqHkigXqumOYs8woOyY8gIccmzKOyrZ7SwQ=";
+ hash = "sha256-zwD/Mn7jL960EVaG3gVqFo6FPPMhQTMz3LKy8ZnOObk=";
};
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_11;
fetcherVersion = 4;
- hash = "sha256-oIVbhvFiVu0S7sSs5u14M0A1+Q1WmiAsyoBt8QtojyE=";
+ hash = "sha256-YEdZ5B11I6U140qam7e1TMOacRqUeINhr/TI13ddAa0=";
};
nativeBuildInputs = [
From 67695b335b7a99572e9ee51582b0f191f0fb9b31 Mon Sep 17 00:00:00 2001
From: K900
Date: Sun, 28 Jun 2026 19:31:21 +0300
Subject: [PATCH 85/85] home-assistant: fix plexapi override
---
pkgs/servers/home-assistant/default.nix | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 8de81bf72298..b5ebfba471e3 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -150,6 +150,11 @@ let
tag = version;
hash = "sha256-NwGGNN6LC3gvE8zoVL5meNWMbqZjJ+6PcU2ebJTfJmU=";
};
+
+ # ancient pinned version requires pkg_resources
+ nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [
+ self.setuptools_80
+ ];
});
# Pinned due to API changes in 0.1.0