From 2b9740196ccae11dd164c443b049fc5ca643d8bf Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Thu, 24 Apr 2025 21:46:59 +0300 Subject: [PATCH 001/129] iosevka: get `set` value from `privateBuildPlan`, if it's an attrset I find it redundant to set `set`, when a config is supplied. --- pkgs/by-name/io/iosevka/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix index 90f9b1140ad5..353e7ca68813 100644 --- a/pkgs/by-name/io/iosevka/package.nix +++ b/pkgs/by-name/io/iosevka/package.nix @@ -47,10 +47,12 @@ # sequence = "+>" # ''; extraParameters ? null, - # Custom font set name. Required if any custom settings above. - set ? null, + # Custom font set name. Required if `extraParameters` is used and/or + # if `privateBuildPlan` is a TOML string. + set ? privateBuildPlan.family or null, }: +assert (builtins.isAttrs privateBuildPlan) -> builtins.hasAttr "family" privateBuildPlan; assert (privateBuildPlan != null) -> set != null; assert (extraParameters != null) -> set != null; From a4aa79d13fdadec5f8f8068d60b956b268fe45a1 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 19 Aug 2025 21:28:25 +0200 Subject: [PATCH 002/129] cudaPackages.fabricmanager: deprecate phases --- pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix index 9880425393dd..4d4e61a5942f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix +++ b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix @@ -26,11 +26,6 @@ stdenv.mkDerivation rec { inherit sha256; }; - phases = [ - "unpackPhase" - "installPhase" - ]; - installPhase = '' mkdir -p $out/{bin,share/nvidia-fabricmanager} for bin in nv{-fabricmanager,switch-audit};do From 69972cd34d8e074d8c0d8d74eceb3d193023fc8c Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 10 Oct 2025 17:06:15 -0700 Subject: [PATCH 003/129] distro-info-data: init at 0.67 Signed-off-by: Anders Kaseorg --- pkgs/by-name/di/distro-info-data/package.nix | 29 ++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pkgs/by-name/di/distro-info-data/package.nix diff --git a/pkgs/by-name/di/distro-info-data/package.nix b/pkgs/by-name/di/distro-info-data/package.nix new file mode 100644 index 000000000000..bb8f4edc7747 --- /dev/null +++ b/pkgs/by-name/di/distro-info-data/package.nix @@ -0,0 +1,29 @@ +{ + fetchFromGitLab, + lib, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "distro-info-data"; + version = "0.67"; + + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "debian"; + repo = "distro-info-data"; + tag = "debian/${finalAttrs.version}"; + hash = "sha256-xm/ajsPKtnmuyEkVxM1AxV7Tl0njkqjOmhE5rKRQ36Q="; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "Information about Debian and Ubuntu releases"; + homepage = "https://salsa.debian.org/debian/distro-info-data"; + changelog = "https://salsa.debian.org/debian/distro-info-data/-/blob/${finalAttrs.src.tag}/debian/changelog"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ andersk ]; + platforms = lib.platforms.all; + }; +}) From 96eca034d0b7b397ad4c89c299f07e2d5f738a91 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 10 Oct 2025 17:04:39 -0700 Subject: [PATCH 004/129] python3Packages.distro-info: init at 1.14 Signed-off-by: Anders Kaseorg --- .../python-modules/distro-info/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/distro-info/default.nix diff --git a/pkgs/development/python-modules/distro-info/default.nix b/pkgs/development/python-modules/distro-info/default.nix new file mode 100644 index 000000000000..debef819aef3 --- /dev/null +++ b/pkgs/development/python-modules/distro-info/default.nix @@ -0,0 +1,45 @@ +{ + buildPythonPackage, + distro-info-data, + fetchurl, + lib, + setuptools, + unittestCheckHook, +}: + +buildPythonPackage rec { + pname = "distro-info"; + version = "1.14"; + pyproject = true; + + # Not using fetchFromGitLab because it incorrectly sets + # SOURCE_DATE_EPOCH=315619200 (1980-01-02) and breaks tests. + src = fetchurl { + url = "https://salsa.debian.org/debian/distro-info/-/archive/debian/${version}/distro-info-debian-${version}.tar.gz"; + hash = "sha256-nRLTlDPnll1jvwfg9FSxs9TmImvQkn9DVqSRSOKTAGI="; + }; + + postPatch = '' + substituteInPlace python/distro_info.py \ + --replace-fail /usr/share/distro-info ${distro-info-data}/share/distro-info + ''; + + build-system = [ setuptools ]; + pypaBuildFlags = "python"; + nativeCheckInputs = [ + unittestCheckHook + ]; + preCheck = '' + cd python + rm distro_info_test/test_flake8.py distro_info_test/test_pylint.py + ''; + + meta = { + description = "Information about Debian and Ubuntu releases"; + homepage = "https://salsa.debian.org/debian/distro-info"; + changelog = "https://salsa.debian.org/debian/distro-info/-/blob/debian/${version}/debian/changelog"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ andersk ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ee283b41fc4..44fa60ab8683 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3645,6 +3645,8 @@ self: super: with self; { distro = callPackage ../development/python-modules/distro { }; + distro-info = callPackage ../development/python-modules/distro-info { }; + distutils = if pythonOlder "3.12" then null else callPackage ../development/python-modules/distutils { }; From a47c384c31e79bc80bc695ba121d407f8b82d3ef Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 16 Jun 2025 13:01:52 -0700 Subject: [PATCH 005/129] dput-ng: Add missing dependency python3Packages.distro-info Signed-off-by: Anders Kaseorg --- pkgs/by-name/dp/dput-ng/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/dp/dput-ng/package.nix b/pkgs/by-name/dp/dput-ng/package.nix index c73978a3f496..e5f65a71bfa8 100644 --- a/pkgs/by-name/dp/dput-ng/package.nix +++ b/pkgs/by-name/dp/dput-ng/package.nix @@ -31,6 +31,7 @@ python3.pkgs.buildPythonApplication { coverage xdg python-debian + distro-info ]; postInstall = '' From ffdcfb6c5ccfb29f2c279ba998581ce6e3108c6c Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 16 Jun 2025 13:02:34 -0700 Subject: [PATCH 006/129] dput-ng: Install required configuration files Signed-off-by: Anders Kaseorg --- pkgs/by-name/dp/dput-ng/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/dp/dput-ng/package.nix b/pkgs/by-name/dp/dput-ng/package.nix index e5f65a71bfa8..60ea99b969a3 100644 --- a/pkgs/by-name/dp/dput-ng/package.nix +++ b/pkgs/by-name/dp/dput-ng/package.nix @@ -20,6 +20,10 @@ python3.pkgs.buildPythonApplication { hash = "sha256-zrH4h4C4y3oTiOXsidFv/rIJNzCdV2lqzNEg0SOkX4w="; }; + postPatch = '' + substituteInPlace dput/core.py --replace-fail /usr/share/dput-ng "$out/share/dput-ng" + ''; + build-system = with python3.pkgs; [ setuptools ]; @@ -36,6 +40,8 @@ python3.pkgs.buildPythonApplication { postInstall = '' cp -r bin $out/ + mkdir -p "$out/share/dput-ng" + cp -r skel/* "$out/share/dput-ng/" ''; pythonImportsCheck = [ "dput" ]; From fc2902e627fb25a27400f26b4c7d1ca6fa0efb69 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 12 Oct 2025 07:59:31 +0200 Subject: [PATCH 007/129] windows: fix eval of some packages on linux This makes those packages appear in search --- pkgs/os-specific/windows/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix index 98f438554ac0..137a948960b7 100644 --- a/pkgs/os-specific/windows/default.nix +++ b/pkgs/os-specific/windows/default.nix @@ -28,8 +28,12 @@ lib.makeScope newScope ( buildPackages.gccWithoutTargetLibc.override (old: { bintools = old.bintools.override { libc = pkgs.libc; + noLibc = pkgs.libc == null; + nativeLibc = false; }; libc = pkgs.libc; + noLibc = pkgs.libc == null; + nativeLibc = false; }) ); From 37743688ccc5b044667ae1a79f8d70a6f158183c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Oct 2025 07:56:40 +0000 Subject: [PATCH 008/129] vscode-extensions.ltex-plus.vscode-ltex-plus: 15.5.1 -> 15.6.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 4cf6570771c5..83077534b37c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2847,8 +2847,8 @@ let mktplcRef = { name = "vscode-ltex-plus"; publisher = "ltex-plus"; - version = "15.5.1"; - hash = "sha256-BzIJ7gsjcMimLYeVxcvdP0fyIEmwCXxTxqil5o+810w="; + version = "15.6.1"; + hash = "sha256-UOiYjA11P7xqPFgdR7eS63wOQl9dqWAqBxz3nklapqo="; }; meta = { description = "VS Code extension for grammar/spell checking using LanguageTool with support for LaTeX, Markdown, and others"; From 89934abf504355ffd642bec46f467291f386d851 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Tue, 21 Oct 2025 10:35:26 -0300 Subject: [PATCH 009/129] hypr: fix build with cmake4 --- pkgs/applications/window-managers/hyprwm/hypr/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix index 3a83551b6e51..c8b3fcbfa762 100644 --- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix @@ -67,6 +67,11 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.4)" "cmake_minimum_required(VERSION 3.10)" + ''; + postFixup = '' wrapProgram $out/bin/Hypr --prefix PATH : ${lib.makeBinPath [ xmodmap ]} ''; From a14c83cdebefe94b2e1457c0733ba743b35681b6 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 22 Oct 2025 08:45:40 -0300 Subject: [PATCH 010/129] maia-icon-theme: fix build with cmake4 --- pkgs/data/icons/maia-icon-theme/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix index e0558ce70c38..295f595a57b1 100644 --- a/pkgs/data/icons/maia-icon-theme/default.nix +++ b/pkgs/data/icons/maia-icon-theme/default.nix @@ -39,6 +39,13 @@ stdenv.mkDerivation { dontWrapQtApps = true; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace {icons,icons-dark}/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" + ''; + postInstall = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme From dacb222c4bd18164436aca370a1f53ea496dc321 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 22 Oct 2025 09:51:45 -0300 Subject: [PATCH 011/129] marl: fix build with cmake4 --- pkgs/by-name/ma/marl/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ma/marl/package.nix b/pkgs/by-name/ma/marl/package.nix index ae5e576bc9c7..b2e338d11bca 100644 --- a/pkgs/by-name/ma/marl/package.nix +++ b/pkgs/by-name/ma/marl/package.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation { # Turn on the flag to install after building the library. cmakeFlags = [ "-DMARL_INSTALL=ON" ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { homepage = "https://github.com/google/marl"; description = "Hybrid thread / fiber task scheduler written in C++ 11"; From 18fbd0d1d30d7094b59ce4edbf79e79cf9a14c5d Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 22 Oct 2025 12:27:10 -0300 Subject: [PATCH 012/129] megaglest: fix build with cmake4 --- pkgs/by-name/me/megaglest/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/me/megaglest/package.nix b/pkgs/by-name/me/megaglest/package.nix index 18b3923132cd..59ff8c9a7306 100644 --- a/pkgs/by-name/me/megaglest/package.nix +++ b/pkgs/by-name/me/megaglest/package.nix @@ -144,6 +144,11 @@ stdenv.mkDerivation { "-DBUILD_MEGAGLEST_MODEL_VIEWER=On" ]; + postPatch = '' + substituteInPlace {data/glest_game,.}/CMakeLists.txt \ + --replace-fail "CMAKE_MINIMUM_REQUIRED( VERSION 2.8.2 )" "cmake_minimum_required(VERSION 3.10)" + ''; + postInstall = '' for i in $out/bin/*; do wrapProgram $i \ From 5e37460bba0fd3a0e2092eb0a8e7f935f0936fd9 Mon Sep 17 00:00:00 2001 From: drafolin Date: Thu, 23 Oct 2025 20:18:07 +0200 Subject: [PATCH 013/129] teamspeak6-client: 6.0.0-beta3.1 -> 6.0.0-beta3.2 --- pkgs/by-name/te/teamspeak6-client/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/teamspeak6-client/package.nix b/pkgs/by-name/te/teamspeak6-client/package.nix index 3f3b138a948f..582f2a470e40 100644 --- a/pkgs/by-name/te/teamspeak6-client/package.nix +++ b/pkgs/by-name/te/teamspeak6-client/package.nix @@ -30,11 +30,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "teamspeak6-client"; - version = "6.0.0-beta3.1"; + version = "6.0.0-beta3.2"; src = fetchurl { url = "https://files.teamspeak-services.com/pre_releases/client/${finalAttrs.version}/teamspeak-client.tar.gz"; - hash = "sha256-CWKyn49DSWgrkJyYcPwKUz2PBykvFQc1f7G/yvrHbWU="; + hash = "sha256-sZrYGonBw3BgUSExovs8GW5E54vhr3i/VR9eH9/qjWM="; }; sourceRoot = "."; From 528569533c72b10440e0de1b786f2828c9f85c30 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Thu, 23 Oct 2025 16:34:22 -0300 Subject: [PATCH 014/129] oatpp: fix build with cmake4 --- pkgs/by-name/oa/oatpp/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/oa/oatpp/package.nix b/pkgs/by-name/oa/oatpp/package.nix index 92c52aa4a992..a0daeafbd9d0 100644 --- a/pkgs/by-name/oa/oatpp/package.nix +++ b/pkgs/by-name/oa/oatpp/package.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation rec { # Tests fail on darwin. See https://github.com/NixOS/nixpkgs/pull/105419#issuecomment-735826894 doCheck = !stdenv.hostPlatform.isDarwin; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.1 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { homepage = "https://oatpp.io/"; description = "Light and powerful C++ web framework for highly scalable and resource-efficient web applications"; From b72e3b389d0be6c32fc25c69e7f202ca590f5b07 Mon Sep 17 00:00:00 2001 From: drafolin Date: Thu, 23 Oct 2025 22:15:49 +0200 Subject: [PATCH 015/129] teamspeak6-client: added drafolin to maintainers list --- pkgs/by-name/te/teamspeak6-client/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/te/teamspeak6-client/package.nix b/pkgs/by-name/te/teamspeak6-client/package.nix index 582f2a470e40..fb7ca2a4be55 100644 --- a/pkgs/by-name/te/teamspeak6-client/package.nix +++ b/pkgs/by-name/te/teamspeak6-client/package.nix @@ -119,6 +119,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { license = lib.licenses.teamspeak; mainProgram = "TeamSpeak"; maintainers = with lib.maintainers; [ + drafolin gepbird jojosch ]; From 58db6be1d8d74ca0b181ae90dd277cde9b8736e2 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Fri, 24 Oct 2025 00:59:17 -0300 Subject: [PATCH 016/129] romdirfs: fix build with cmake4 --- pkgs/by-name/ro/romdirfs/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ro/romdirfs/package.nix b/pkgs/by-name/ro/romdirfs/package.nix index 00b6543cc1ac..11ef69a039e6 100644 --- a/pkgs/by-name/ro/romdirfs/package.nix +++ b/pkgs/by-name/ro/romdirfs/package.nix @@ -24,6 +24,11 @@ gccStdenv.mkDerivation rec { ]; buildInputs = [ fuse ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "FUSE for access Playstation 2 IOP IOPRP images and BIOS dumps"; homepage = "https://github.com/mlafeldt/romdirfs"; From 19b93bd09ea2221f7b4893e5ac857634add7f129 Mon Sep 17 00:00:00 2001 From: Yifei Sun Date: Fri, 24 Oct 2025 11:11:43 +0200 Subject: [PATCH 017/129] ocamlPackages.mirage-ptime: 5.1.0 -> 5.2.0 --- pkgs/development/ocaml-modules/mirage-ptime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-ptime/default.nix b/pkgs/development/ocaml-modules/mirage-ptime/default.nix index 8d981684899a..fddd9a832657 100644 --- a/pkgs/development/ocaml-modules/mirage-ptime/default.nix +++ b/pkgs/development/ocaml-modules/mirage-ptime/default.nix @@ -3,7 +3,7 @@ buildDunePackage, fetchurl, ptime, - version ? "5.1.0", + version ? "5.2.0", }: buildDunePackage { @@ -13,7 +13,7 @@ buildDunePackage { src = fetchurl { url = "https://github.com/mirage/mirage-ptime/releases/download/v${version}/mirage-ptime-${version}.tbz"; - hash = "sha256-6bPbMTZeGolRMMN4nmrc+ZZ3HqjnAWtj4V7L4fOKKfY="; + hash = "sha256-YOWpJrfQKG9khCwPb5lZXtf+fip4N0B1AAn2Y9zRLyg="; }; propagatedBuildInputs = [ ptime ]; From 6741751801286f5b32073a1229b4fdcf97b22d0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 21 Oct 2025 17:02:43 +0200 Subject: [PATCH 018/129] nixos/facter: add networking configuration This adds automatic network configuration based on detected hardware: - networking/default.nix: Auto-configure DHCP on physical interfaces Detects Ethernet, WLAN, USB-Link, and generic network interfaces, automatically enabling DHCP on each. Excludes loopback and mainframe interfaces. Sets networking.useDHCP and per-interface useDHCP. - networking/intel.nix: Intel WiFi firmware detection Auto-enables firmware for Intel 2200BG and 3945ABG wireless cards based on PCI vendor/device IDs. - networking/initrd.nix: Network drivers in initrd Loads network controller drivers when boot.initrd.network.enable is set, enabling network boot scenarios. Builds on PR #454847 (boot & storage). Part of incremental upstreaming from nixos-facter-modules. --- nixos/modules/hardware/facter/default.nix | 1 + .../hardware/facter/networking/default.nix | 69 +++++++++++++++++++ .../hardware/facter/networking/initrd.nix | 20 ++++++ .../hardware/facter/networking/intel.nix | 57 +++++++++++++++ 4 files changed, 147 insertions(+) create mode 100644 nixos/modules/hardware/facter/networking/default.nix create mode 100644 nixos/modules/hardware/facter/networking/initrd.nix create mode 100644 nixos/modules/hardware/facter/networking/intel.nix diff --git a/nixos/modules/hardware/facter/default.nix b/nixos/modules/hardware/facter/default.nix index 324471b16e70..f2719b55b8ce 100644 --- a/nixos/modules/hardware/facter/default.nix +++ b/nixos/modules/hardware/facter/default.nix @@ -7,6 +7,7 @@ imports = [ ./disk.nix ./keyboard.nix + ./networking ./system.nix ]; diff --git a/nixos/modules/hardware/facter/networking/default.nix b/nixos/modules/hardware/facter/networking/default.nix new file mode 100644 index 000000000000..dfbc54c8396d --- /dev/null +++ b/nixos/modules/hardware/facter/networking/default.nix @@ -0,0 +1,69 @@ +{ config, lib, ... }: +let + # Filter network interfaces from facter report to only those suitable for DHCP + physicalInterfaces = lib.filter ( + iface: + # Only include network interfaces suitable for DHCP: + # - Ethernet (most common) + # - WLAN (WiFi) + # - USB-Link (USB network adapters, tethering) + # - Network Interface (generic/unknown type) + # This implicitly excludes: Loopback, mainframe-specific interfaces (CTC, IUCV, HSI, ESCON) + # See: https://github.com/numtide/hwinfo/blob/ea251a74b88dcd53aebdd381194ab43d10fbbd79/src/ids/src/class#L817-L874 + let + validTypes = [ + "Ethernet" + "WLAN" + "USB-Link" + "Network Interface" + ]; + in + lib.elem (iface.sub_class.name or "") validTypes + ) (config.hardware.facter.report.hardware.network_interface or [ ]); + + # Extract interface names from unix_device_names + detectedInterfaceNames = lib.concatMap (iface: iface.unix_device_names or [ ]) physicalInterfaces; + + # Get the interface names from the configuration (which defaults to detectedInterfaceNames) + interfaceNames = config.hardware.facter.detected.dhcp.interfaces; + + # Generate per-interface DHCP config + perInterfaceConfig = lib.listToAttrs ( + lib.map (name: { + inherit name; + value = { + useDHCP = lib.mkDefault true; + }; + }) interfaceNames + ); +in +{ + imports = [ + ./initrd.nix + ./intel.nix + ]; + + options.hardware.facter.detected.dhcp = { + enable = lib.mkEnableOption "Facter dhcp module" // { + default = builtins.length config.hardware.facter.report.hardware.network_interface or [ ] > 0; + defaultText = "hardware dependent"; + }; + + interfaces = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = detectedInterfaceNames; + defaultText = lib.literalExpression "automatically detected from facter report"; + description = "List of network interface names to configure with DHCP. Defaults to auto-detected physical interfaces."; + example = [ + "eth0" + "wlan0" + ]; + }; + }; + config = lib.mkIf config.hardware.facter.detected.dhcp.enable { + networking.useDHCP = lib.mkDefault true; + + # Per-interface DHCP configuration + networking.interfaces = perInterfaceConfig; + }; +} diff --git a/nixos/modules/hardware/facter/networking/initrd.nix b/nixos/modules/hardware/facter/networking/initrd.nix new file mode 100644 index 000000000000..56be802b7cd9 --- /dev/null +++ b/nixos/modules/hardware/facter/networking/initrd.nix @@ -0,0 +1,20 @@ +{ lib, config, ... }: +let + facterLib = import ../lib.nix lib; + + inherit (config.hardware.facter) report; +in +{ + options.hardware.facter.detected.boot.initrd.networking.kernelModules = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = lib.uniqueStrings (facterLib.collectDrivers (report.hardware.network_controller or [ ])); + defaultText = "hardware dependent"; + description = '' + List of kernel modules to include in the initrd to support networking. + ''; + }; + + config = lib.mkIf config.boot.initrd.network.enable { + boot.initrd.kernelModules = config.hardware.facter.detected.boot.initrd.networking.kernelModules; + }; +} diff --git a/nixos/modules/hardware/facter/networking/intel.nix b/nixos/modules/hardware/facter/networking/intel.nix new file mode 100644 index 000000000000..4ae693a3c636 --- /dev/null +++ b/nixos/modules/hardware/facter/networking/intel.nix @@ -0,0 +1,57 @@ +{ lib, config, ... }: +let + inherit (config.hardware.facter) report; + cfg = config.hardware.facter.detected.networking.intel; +in +{ + options.hardware.facter.detected.networking.intel = with lib; { + _2200BG.enable = mkEnableOption "the Facter Intel 2200BG module" // { + + default = lib.any ( + { + vendor ? { }, + device ? { }, + ... + }: + # vendor (0x8086) Intel Corp. + (vendor.value or 0) == 32902 + && (lib.elem (device.value or 0) [ + 4163 # 0x1043 + 4175 # 0x104f + 16928 # 0x4220 + 16929 # 0x4221 + 16931 # 0x4223 + 16932 # 0x4224 + ]) + ) (report.hardware.network_controller or [ ]); + + defaultText = "hardware dependent"; + }; + _3945ABG.enable = mkEnableOption "the Facter Intel 3945ABG module" // { + + default = lib.any ( + { + vendor ? { }, + device ? { }, + ... + }: + # vendor (0x8086) Intel Corp. + (vendor.value or 0) == 32902 + && (lib.elem (device.value or 0) [ + 16937 # 0x4229 + 16938 # 0x4230 + 16930 # 0x4222 + 16935 # 0x4227 + ]) + ) (report.hardware.network_controller or [ ]); + + defaultText = "hardware dependent"; + }; + }; + + config = { + networking.enableIntel2200BGFirmware = lib.mkIf cfg._2200BG.enable (lib.mkDefault true); + hardware.enableRedistributableFirmware = lib.mkIf cfg._3945ABG.enable (lib.mkDefault true); + }; + +} From 0e6c2a2595ad24da85b1086cb228ae931daabcec Mon Sep 17 00:00:00 2001 From: Zhaith Izaliel Date: Fri, 24 Oct 2025 14:22:58 +0200 Subject: [PATCH 019/129] nixos/iio-niri: move from programs to services/misc The module was wrongly put in programs following PR #454551 and we didn't catch it during review. This commit fixes that issue so the path is compliant to the guidelines. --- nixos/modules/module-list.nix | 2 +- nixos/modules/{programs => services/misc}/iio-niri.nix | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename nixos/modules/{programs => services/misc}/iio-niri.nix (100%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2f84328f30d4..4d37bdd41875 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -240,7 +240,6 @@ ./programs/iay.nix ./programs/iftop.nix ./programs/iio-hyprland.nix - ./programs/iio-niri.nix ./programs/immersed.nix ./programs/iotop.nix ./programs/java.nix @@ -857,6 +856,7 @@ ./services/misc/heisenbridge.nix ./services/misc/homepage-dashboard.nix ./services/misc/ihaskell.nix + ./services/misc/iio-niri.nix ./services/misc/input-remapper.nix ./services/misc/invidious-router.nix ./services/misc/irkerd.nix diff --git a/nixos/modules/programs/iio-niri.nix b/nixos/modules/services/misc/iio-niri.nix similarity index 100% rename from nixos/modules/programs/iio-niri.nix rename to nixos/modules/services/misc/iio-niri.nix From 27413a10fe147777f250d34c50080c88d5777061 Mon Sep 17 00:00:00 2001 From: Yifei Sun Date: Fri, 24 Oct 2025 11:15:32 +0200 Subject: [PATCH 020/129] ocamlPackages.http-mirage-client: fix test on darwin, migrate source --- .../ocaml-modules/http-mirage-client/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/http-mirage-client/default.nix b/pkgs/development/ocaml-modules/http-mirage-client/default.nix index 58f9852e8c86..4689be5ce7f0 100644 --- a/pkgs/development/ocaml-modules/http-mirage-client/default.nix +++ b/pkgs/development/ocaml-modules/http-mirage-client/default.nix @@ -12,14 +12,16 @@ mirage-crypto-rng, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "http-mirage-client"; version = "0.0.10"; minimalOCamlVersion = "4.08"; + __darwinAllowLocalNetworking = true; + src = fetchurl { - url = "https://github.com/roburio/http-mirage-client/releases/download/v${version}/http-mirage-client-${version}.tbz"; + url = "https://github.com/robur-coop/http-mirage-client/releases/download/v${finalAttrs.version}/http-mirage-client-${finalAttrs.version}.tbz"; hash = "sha256-AXEIH1TIAayD4LkFv0yGD8OYvcdC/AJnGudGlkjcWLY="; }; @@ -40,9 +42,9 @@ buildDunePackage rec { meta = { description = "HTTP client for MirageOS"; - homepage = "https://github.com/roburio/http-mirage-client"; + homepage = "https://github.com/robur-coop/http-mirage-client"; + changelog = "https://github.com/robur-coop/http-mirage-client/blob/v${finalAttrs.version}/CHANGES.md"; license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; - -} +}) From 0dd1a07886192139b60ce8d3b4a97f8057c3cac8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Oct 2025 15:40:28 +0000 Subject: [PATCH 021/129] tigerbeetle: 0.16.61 -> 0.16.62 --- pkgs/by-name/ti/tigerbeetle/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix index d0b465fa8b17..ec13d6d2b992 100644 --- a/pkgs/by-name/ti/tigerbeetle/package.nix +++ b/pkgs/by-name/ti/tigerbeetle/package.nix @@ -10,14 +10,14 @@ let platform = if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system; hash = builtins.getAttr platform { - "universal-macos" = "sha256-m/T1Ns8mmifODTLoQ426Co/07rg/kpq/XewNKozDStE="; - "x86_64-linux" = "sha256-ClQLzae+8xd9Jb9fGRJ3u/SAYSlk/bxgSITDxSIbS7U="; - "aarch64-linux" = "sha256-G2l2636rhXbhegdehSJj6VQpOYHe1Lp8jsBaG53kzUk="; + "universal-macos" = "sha256-4lpJxXRwngBUdImBrIeuLVU6GJr6n6g/71bueuZTFj8="; + "x86_64-linux" = "sha256-5rJHyFRrU5N5wYIohISBRuwH7WfrSDUyHHmCppSvcfM="; + "aarch64-linux" = "sha256-CSB6PGr/EGV/ZdxfWMwY/R9/pObQRSASYE3Cp4cm1/E="; }; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "tigerbeetle"; - version = "0.16.61"; + version = "0.16.62"; src = fetchzip { url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip"; From 514f43f77c269e4476e19acd1b0b32bde13f9b35 Mon Sep 17 00:00:00 2001 From: Tim Brooks Date: Thu, 23 Oct 2025 22:34:09 +0200 Subject: [PATCH 022/129] onedrive: 2.5.6 -> 2.5.7 --- pkgs/by-name/on/onedrive/package.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/on/onedrive/package.nix b/pkgs/by-name/on/onedrive/package.nix index 64a0077d23b1..5b0199afa241 100644 --- a/pkgs/by-name/on/onedrive/package.nix +++ b/pkgs/by-name/on/onedrive/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "onedrive"; - version = "2.5.6"; + version = "2.5.7"; src = fetchFromGitHub { owner = "abraunegg"; repo = "onedrive"; - rev = "v${finalAttrs.version}"; - hash = "sha256-AFaz1RkrtsdTZfaWobdcADbzsAhbdCzJPkQX6Pa7hN8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-IllPh4YJvoAAyXDmSNwWDHN/EUtUuUqS7TOnBpr3Yts="; }; outputs = [ @@ -68,10 +68,8 @@ stdenv.mkDerivation (finalAttrs: { --fish contrib/completions/complete.fish \ --zsh contrib/completions/complete.zsh - for s in $out/lib/systemd/user/onedrive.service $out/lib/systemd/system/onedrive@.service; do - substituteInPlace $s \ - --replace-fail "/usr/bin/sleep" "${coreutils}/bin/sleep" - done + substituteInPlace $out/lib/systemd/user/onedrive.service $out/lib/systemd/system/onedrive@.service \ + --replace-fail "/bin/sh -c 'sleep 15'" "${coreutils}/bin/sleep 15" ''; passthru = { From 869de83cc42e356851f2e21a604607440ed5bf9c Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Fri, 24 Oct 2025 13:30:58 -0700 Subject: [PATCH 023/129] modules/image/repart: fixup partitions example `fat` is not a valid value for `Format` See https://www.freedesktop.org/software/systemd/man/latest/repart.d.html#Format= --- nixos/modules/image/repart.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/image/repart.nix b/nixos/modules/image/repart.nix index 1f276590f9c2..8f892b96438b 100644 --- a/nixos/modules/image/repart.nix +++ b/nixos/modules/image/repart.nix @@ -223,7 +223,7 @@ in } repartConfig = { Type = "esp"; - Format = "fat"; + Format = "vfat"; }; }; "20-root" = { From e162c391c127cd2129bba71b936ec366d8553e74 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 24 Oct 2025 22:58:36 +0200 Subject: [PATCH 024/129] ycmd: escape python in description --- pkgs/by-name/yc/ycmd/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/yc/ycmd/package.nix b/pkgs/by-name/yc/ycmd/package.nix index 520dd5f23461..6978a1b60085 100644 --- a/pkgs/by-name/yc/ycmd/package.nix +++ b/pkgs/by-name/yc/ycmd/package.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation { ... then set something similar to following in `programs.vim.extraConfig`; - let g:ycm_server_python_interpreter = "${python3.interpreter}" + let g:ycm_server_python_interpreter = "''${python3.interpreter}" ''; mainProgram = "ycmd"; homepage = "https://github.com/ycm-core/ycmd"; From 973e844252bb7154613204aa1e471a866c676d5d Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Fri, 24 Oct 2025 23:50:16 -0300 Subject: [PATCH 025/129] rttr: fix build with cmake4 --- pkgs/by-name/rt/rttr/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/rt/rttr/package.nix b/pkgs/by-name/rt/rttr/package.nix index 9cf8dee8a877..da0822946ccc 100644 --- a/pkgs/by-name/rt/rttr/package.nix +++ b/pkgs/by-name/rt/rttr/package.nix @@ -28,6 +28,11 @@ stdenv.mkDerivation rec { "-DBUILD_PACKAGE=OFF" ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { broken = stdenv.hostPlatform.isDarwin; description = "C++ Reflection Library"; From ba90933f6e88b572332bb1383e115dcba1712c9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Oct 2025 10:39:49 +0000 Subject: [PATCH 026/129] comaps: 2025.10.16-1 -> 2025.10.20-1 --- pkgs/by-name/co/comaps/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/comaps/package.nix b/pkgs/by-name/co/comaps/package.nix index be08d8e2d773..5667c5231ed1 100644 --- a/pkgs/by-name/co/comaps/package.nix +++ b/pkgs/by-name/co/comaps/package.nix @@ -36,14 +36,14 @@ let in organicmaps.overrideAttrs (oldAttrs: rec { pname = "comaps"; - version = "2025.10.16-1"; + version = "2025.10.20-1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "comaps"; repo = "comaps"; tag = "v${version}"; - hash = "sha256-2pnAYc5Ru1OK7ecCN1kKryAPPdxUIGQp9x2y4MosRl8="; + hash = "sha256-9L7wyIXieKkKSrudnmPyiLPu4Jfp10xWi5o5lGslLWc="; fetchSubmodules = true; }; From 71bac67d54fb5760b26e89127bb45082ce4b3203 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sat, 25 Oct 2025 09:56:28 -0300 Subject: [PATCH 027/129] qpid-cpp: fix build with cmake4 --- pkgs/by-name/qp/qpid-cpp/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/qp/qpid-cpp/package.nix b/pkgs/by-name/qp/qpid-cpp/package.nix index 61f415e6480b..53e52140f2ae 100644 --- a/pkgs/by-name/qp/qpid-cpp/package.nix +++ b/pkgs/by-name/qp/qpid-cpp/package.nix @@ -43,6 +43,11 @@ stdenv.mkDerivation rec { sed -i '/managementgen/d' CMakeLists.txt sed -i '/ENV/d' src/CMakeLists.txt sed -i '/management/d' CMakeLists.txt + + substituteInPlace {./,examples/}CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8.7 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_policy(SET CMP0022 OLD)" "" ''; env.NIX_CFLAGS_COMPILE = toString ( From d854715ef9934a44d4897cf49094f761ffd83389 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Oct 2025 13:42:43 +0000 Subject: [PATCH 028/129] python3Packages.roadrecon: 1.7.0 -> 1.7.1 --- pkgs/development/python-modules/roadrecon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/roadrecon/default.nix b/pkgs/development/python-modules/roadrecon/default.nix index 3eb00bdd7ec2..c7bf9a716579 100644 --- a/pkgs/development/python-modules/roadrecon/default.nix +++ b/pkgs/development/python-modules/roadrecon/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "roadrecon"; - version = "1.7.0"; + version = "1.7.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JJJPQcgZOdqyAXYgLmCQuNBhSGwg8WIDW8+2jfVyvyc="; + hash = "sha256-v8IUnJlREtKMnhJtdKtChcxM/IKNKRuHA79V38zxLGY="; }; pythonRelaxDeps = [ "flask" ]; From b4f7340116c962d959a34ae26379a822aeaa2c42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Oct 2025 14:13:20 +0000 Subject: [PATCH 029/129] pyradio: 0.9.3.11.19 -> 0.9.3.11.20 --- pkgs/by-name/py/pyradio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/py/pyradio/package.nix b/pkgs/by-name/py/pyradio/package.nix index 38f39b35f89e..f294c5138555 100644 --- a/pkgs/by-name/py/pyradio/package.nix +++ b/pkgs/by-name/py/pyradio/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.9.3.11.19"; + version = "0.9.3.11.20"; pyproject = true; src = fetchFromGitHub { owner = "coderholic"; repo = "pyradio"; tag = version; - hash = "sha256-fjTaURYY2pSb3mod4Vffbczmyxsn0/4SAXkb68mRhQA="; + hash = "sha256-dcs9kwuS1/pNtBPhj6Z1VAHFJw/ajwzc2aTWGU/h4W0="; }; nativeBuildInputs = [ From 8a88da361816391180f311512703972ca4c94bca Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sat, 25 Oct 2025 11:15:47 -0300 Subject: [PATCH 030/129] lxqt.compton-conf: fix build with cmake4 --- pkgs/desktops/lxqt/compton-conf/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index fdb5fa86417d..f7fb175bcbd7 100644 --- a/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix @@ -43,6 +43,11 @@ stdenv.mkDerivation rec { --replace-fail "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \ ''; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" + ''; + passthru.updateScript = gitUpdater { }; meta = with lib; { From 660b533b7ab1f707939a73a24c7e91bf8e59adfa Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sat, 25 Oct 2025 11:39:45 -0300 Subject: [PATCH 031/129] lxqt.libfm-qt_1_4: fix build with cmake4 --- pkgs/desktops/lxqt/libfm-qt/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index 222b4e839514..1bbec0fcda3b 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -67,6 +67,11 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = gitUpdater { }; + postPatch = lib.optionals (version == "1.4.0") '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = { homepage = "https://github.com/lxqt/libfm-qt"; description = "Core library of PCManFM-Qt (Qt binding for libfm)"; From 838c1fde159893b8fd59fac25318c3982831d739 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Fri, 24 Oct 2025 23:24:33 -0300 Subject: [PATCH 032/129] t4kcommon: fix build with cmake4 Co-authored-by: Michael Daniels --- pkgs/by-name/t4/t4kcommon/linebreak-fix.patch | 17 +++++++++++++++++ pkgs/by-name/t4/t4kcommon/package.nix | 7 +++++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/by-name/t4/t4kcommon/linebreak-fix.patch diff --git a/pkgs/by-name/t4/t4kcommon/linebreak-fix.patch b/pkgs/by-name/t4/t4kcommon/linebreak-fix.patch new file mode 100644 index 000000000000..a13cdd4a917e --- /dev/null +++ b/pkgs/by-name/t4/t4kcommon/linebreak-fix.patch @@ -0,0 +1,17 @@ +--- a/src/linebreak/CMakeLists.txt ++++ b/src/linebreak/CMakeLists.txt +@@ -72,12 +72,12 @@ + ${LINEBREAK_BINARY_DIR} + ${LINEBREAK_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR}) +- ++add_library(linebreak STATIC ${LINEBREAK_SOURCES} ${LINEBREAK_HEADERS}) + if (ICONV_FOUND) + include_directories(${ICONV_INCLUDE_DIR}) + target_link_libraries(linebreak ${ICONV_LIBRARY}) + endif (ICONV_FOUND) +-add_library(linebreak STATIC ${LINEBREAK_SOURCES} ${LINEBREAK_HEADERS}) ++ + + #project_source_group("${GROUP_CODE}" LINEBREAK_SOURCES LINEBREAK_HEADERS) + diff --git a/pkgs/by-name/t4/t4kcommon/package.nix b/pkgs/by-name/t4/t4kcommon/package.nix index 956002f5a0e7..f59e0309260d 100644 --- a/pkgs/by-name/t4/t4kcommon/package.nix +++ b/pkgs/by-name/t4/t4kcommon/package.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/tux4kids-pkg-team/t4kcommon/raw/f7073fa384f5a725139f54844e59b57338b69dc7/debian/patches/libpng16.patch"; hash = "sha256-auQ8VvOyvLE1PD2dfeHZJV+MzIt1OtUa7OcOqsXTAYI="; }) + # Fix "Cannot specify link libraries for target "linebreak" which is not built by this project." + ./linebreak-fix.patch ]; # Workaround build failure on -fno-common toolchains like upstream @@ -55,6 +57,11 @@ stdenv.mkDerivation rec { libxml2 ]; + postPatch = '' + substituteInPlace {src/,./}CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "Library of code shared between tuxmath and tuxtype"; homepage = "https://github.com/tux4kids/t4kcommon"; From e2bc41caa23ef4feb337c063a5e71e1a0008ece7 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sat, 25 Oct 2025 13:38:27 -0300 Subject: [PATCH 033/129] lxqt.libqtxdg_3_12: fix build with cmake4 --- pkgs/desktops/lxqt/libqtxdg/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index b5b23b1569a8..891ab5149f5a 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -57,6 +57,11 @@ stdenv.mkDerivation (finalAttrs: { ) ''; + postPatch = lib.optionals (version == "3.12.0") '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" + ''; + passthru.updateScript = gitUpdater { }; meta = { From 2a142c2c3103d8ebeeb96004fad862f3c2415a71 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sat, 25 Oct 2025 13:43:37 -0300 Subject: [PATCH 034/129] lxqt.qtermwidget_1_4: fix build with cmake4 --- pkgs/desktops/lxqt/qtermwidget/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index 9cf2f488b91d..594665c1b20a 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -40,6 +40,11 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; + postPatch = lib.optionals (version == "1.4.0") '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/lxqt/qtermwidget"; From 3b2174d91d6d586eb009fef11681013a0afbb60d Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sat, 25 Oct 2025 15:41:35 -0300 Subject: [PATCH 035/129] nanodbc: fix build with cmake4 --- pkgs/by-name/na/nanodbc/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/na/nanodbc/package.nix b/pkgs/by-name/na/nanodbc/package.nix index dcad1610d292..38e4ca34ad4d 100644 --- a/pkgs/by-name/na/nanodbc/package.nix +++ b/pkgs/by-name/na/nanodbc/package.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation rec { postPatch = '' cp ${catch2}/include/catch2/catch.hpp test/catch/catch.hpp + + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.0.0)" "cmake_minimum_required(VERSION 3.10)" ''; nativeBuildInputs = [ cmake ]; From b466f5f870f891b40399ca394f48e73adb21f819 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sat, 25 Oct 2025 16:01:42 -0300 Subject: [PATCH 036/129] nanodbc: mark as broken on darwin --- pkgs/by-name/na/nanodbc/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/na/nanodbc/package.nix b/pkgs/by-name/na/nanodbc/package.nix index 38e4ca34ad4d..8c50f2bfd68f 100644 --- a/pkgs/by-name/na/nanodbc/package.nix +++ b/pkgs/by-name/na/nanodbc/package.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { description = "Small C++ wrapper for the native C ODBC API"; license = lib.licenses.mit; maintainers = [ lib.maintainers.bzizou ]; + broken = stdenv.hostPlatform.isDarwin; }; } From da39deb6731eb17a04388c06156c78c791236e06 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 25 Oct 2025 15:53:45 -0400 Subject: [PATCH 037/129] ocamlPackages.dns: 10.2.1 -> 10.2.2 Diff: https://github.com/mirage/ocaml-dns/compare/v10.2.1...v10.2.2 --- pkgs/development/ocaml-modules/dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix index 1c44a92bf2a1..539005aac186 100644 --- a/pkgs/development/ocaml-modules/dns/default.nix +++ b/pkgs/development/ocaml-modules/dns/default.nix @@ -18,13 +18,13 @@ buildDunePackage (finalAttrs: { pname = "dns"; - version = "10.2.1"; + version = "10.2.2"; minimalOCamlVersion = "4.13"; src = fetchurl { url = "https://github.com/mirage/ocaml-dns/releases/download/v${finalAttrs.version}/dns-${finalAttrs.version}.tbz"; - hash = "sha256-tIjPTFFP1X1KLLKbmdQjSuaEXv8NXnmxBZ93n3NCR4o="; + hash = "sha256-USPXFn9fs6WrcM8LPMyWUInsRA3Aft6r+MBWjuc3p/A="; }; propagatedBuildInputs = [ From 70c7d6b44ce12bd1600810fa989cea78b2d39c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 23 Oct 2025 16:57:47 -0700 Subject: [PATCH 038/129] python3Packages.mat2: 0.13.5 -> 0.14.0 Diff: https://github.com/jvoisin/mat2/compare/0.13.5...0.14.0 Changelog: https://github.com/jvoisin/mat2/blob/0.14.0/CHANGELOG.md --- .../python-modules/mat2/bubblewrap-path.patch | 35 ------------- .../python-modules/mat2/default.nix | 52 +++++++------------ 2 files changed, 20 insertions(+), 67 deletions(-) delete mode 100644 pkgs/development/python-modules/mat2/bubblewrap-path.patch diff --git a/pkgs/development/python-modules/mat2/bubblewrap-path.patch b/pkgs/development/python-modules/mat2/bubblewrap-path.patch deleted file mode 100644 index 2c71930b6df8..000000000000 --- a/pkgs/development/python-modules/mat2/bubblewrap-path.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/libmat2/bubblewrap.py b/libmat2/bubblewrap.py -index 970d5dd..5d3c0b7 100644 ---- a/libmat2/bubblewrap.py -+++ b/libmat2/bubblewrap.py -@@ -22,11 +22,7 @@ CalledProcessError = subprocess.CalledProcessError - - - def _get_bwrap_path() -> str: -- which_path = shutil.which('bwrap') -- if which_path: -- return which_path -- -- raise RuntimeError("Unable to find bwrap") # pragma: no cover -+ return '@bwrap@' - - - def _get_bwrap_args(tempdir: str, -@@ -37,16 +33,11 @@ def _get_bwrap_args(tempdir: str, - - # XXX: use --ro-bind-try once all supported platforms - # have a bubblewrap recent enough to support it. -- ro_bind_dirs = ['/usr', '/lib', '/lib64', '/bin', '/sbin', '/etc/alternatives', cwd] -+ ro_bind_dirs = ['/nix/store', cwd] - for bind_dir in ro_bind_dirs: - if os.path.isdir(bind_dir): # pragma: no cover - ro_bind_args.extend(['--ro-bind', bind_dir, bind_dir]) - -- ro_bind_files = ['/etc/ld.so.cache'] -- for bind_file in ro_bind_files: -- if os.path.isfile(bind_file): # pragma: no cover -- ro_bind_args.extend(['--ro-bind', bind_file, bind_file]) -- - args = ro_bind_args + \ - ['--dev', '/dev', - '--proc', '/proc', diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 19ec148450c4..f91a9e412482 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -3,18 +3,19 @@ stdenv, buildPythonPackage, pytestCheckHook, - fetchFromGitLab, + fetchFromGitHub, fetchpatch, replaceVars, - bubblewrap, exiftool, ffmpeg, setuptools, wrapGAppsHook3, gdk-pixbuf, + gnome, gobject-introspection, librsvg, poppler_gi, + webp-pixbuf-loader, mutagen, pygobject3, pycairo, @@ -24,33 +25,17 @@ buildPythonPackage rec { pname = "mat2"; - version = "0.13.5"; + version = "0.14.0"; pyproject = true; - src = fetchFromGitLab { - domain = "0xacab.org"; + src = fetchFromGitHub { owner = "jvoisin"; repo = "mat2"; tag = version; - hash = "sha256-ivFgH/88DBucZRaO/OMsLlwJCjv/VQXb6AiKWhZ8XH0="; + hash = "sha256-JTt2/PuSxOXXHUuRP42y8jxw09mNMMz1piJM4ldnjq0="; }; patches = [ - (fetchpatch { - name = "exiftool-13.25-compat.patch"; - url = "https://0xacab.org/jvoisin/mat2/-/commit/473903b70e1b269a6110242a9c098a10c18554e2.patch"; - hash = "sha256-vxxjAFwiTDlcTT3ZlfhOG4rlzBJS+LhLoA++8y2hEok="; - }) - (fetchpatch { - name = "fix-test-on-python313.patch"; - url = "https://0xacab.org/jvoisin/mat2/-/commit/f07344444d6d2f04a1f93e2954f4910b194bee0c.patch"; - hash = "sha256-y756sKkjGO11A2lrRsXAwWgupOZ00u0cDypvkbsiNbY="; - }) - (fetchpatch { - name = "fix-test-on-python312.patch"; - url = "https://0xacab.org/jvoisin/mat2/-/commit/7a8ea224bc327b8ee929379d577c74968ea1c352.patch"; - hash = "sha256-pPiYhoql5WhjhLKvd6y3OnvxORSbXIGCsZMc7UH3i1Q="; - }) # hardcode paths to some binaries (replaceVars ./paths.patch { exiftool = lib.getExe exiftool; @@ -64,11 +49,6 @@ buildPythonPackage rec { ./executable-name.patch # hardcode path to mat2 executable ./tests.patch - ] - ++ lib.optionals (stdenv.hostPlatform.isLinux) [ - (replaceVars ./bubblewrap-path.patch { - bwrap = lib.getExe bubblewrap; - }) ]; postPatch = '' @@ -86,7 +66,6 @@ buildPythonPackage rec { buildInputs = [ gdk-pixbuf - librsvg poppler_gi ]; @@ -97,6 +76,15 @@ buildPythonPackage rec { ]; postInstall = '' + export GDK_PIXBUF_MODULE_FILE="${ + gnome._gdkPixbufCacheBuilder_DO_NOT_USE { + extraLoaders = [ + librsvg + webp-pixbuf-loader + ]; + } + }" + install -Dm 444 data/mat2.svg -t "$out/share/icons/hicolor/scalable/apps" install -Dm 444 doc/mat2.1 -t "$out/share/man/man1" '' @@ -106,12 +94,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { + meta = { description = "Handy tool to trash your metadata"; - homepage = "https://0xacab.org/jvoisin/mat2"; - changelog = "https://0xacab.org/jvoisin/mat2/-/blob/${version}/CHANGELOG.md"; - license = licenses.lgpl3Plus; + homepage = "https://github.com/jvoisin/mat2"; + changelog = "https://github.com/jvoisin/mat2/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.lgpl3Plus; mainProgram = "mat2"; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with lib.maintainers; [ dotlambda ]; }; } From e3ea0e3229336f5843de7e71d94c19ae44aaa717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 15:50:06 -0700 Subject: [PATCH 039/129] python3Packages.mat2: run versionCheckHook --- pkgs/development/python-modules/mat2/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index f91a9e412482..f6ff184eb2c0 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -21,6 +21,7 @@ pycairo, dolphinIntegration ? false, kdePackages, + versionCheckHook, }: buildPythonPackage rec { @@ -94,6 +95,9 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + meta = { description = "Handy tool to trash your metadata"; homepage = "https://github.com/jvoisin/mat2"; From f6ba5043257eacb20851be1ff438aa7efcad49c5 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sun, 26 Oct 2025 03:21:50 +0200 Subject: [PATCH 040/129] azahar: fix build with qt 6.10 --- pkgs/by-name/az/azahar/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index 723afbd6da93..5bf7c063134b 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -44,6 +44,7 @@ nix-update-script, darwinMinVersionHook, apple-sdk_12, + fetchpatch2, }: let inherit (lib) @@ -65,6 +66,12 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # https://github.com/azahar-emu/azahar/pull/1305 ./fix-zstd-seekable-include.patch + + # TODO: Remove in next release + (fetchpatch2 { + url = "https://github.com/azahar-emu/azahar/commit/1f483e1d335374482845d0325ac8b13af3162c53.patch?full_index=1"; + hash = "sha256-9rmRbv7VFMhHly5qTGaeBLpvtWMu6HkCGUUM+t78Meg="; + }) ]; strictDeps = true; From e46241b93341277cd382b92560fe50255c7ed54f Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Tue, 21 Oct 2025 19:27:59 -0300 Subject: [PATCH 041/129] libsnark: fix build with cmake4 --- pkgs/by-name/li/libsnark/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/li/libsnark/package.nix b/pkgs/by-name/li/libsnark/package.nix index 52871ae2f69b..319efa5e155b 100644 --- a/pkgs/by-name/li/libsnark/package.nix +++ b/pkgs/by-name/li/libsnark/package.nix @@ -41,6 +41,13 @@ stdenv.mkDerivation { fetchSubmodules = true; }; + postPatch = '' + substituteInPlace {,depends/{libff,libfqfft}/}CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace depends/gtest/{,googlemock/,googletest/}CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.6.4)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = { broken = withProcps; # Despite procps having a valid pkg-config file, CMake doesn't seem to be able to find it. description = "C++ library for zkSNARKs"; From a01ac0648cce549c8ea4d2741b0f0a7781d1c766 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 09:27:48 +0200 Subject: [PATCH 042/129] nixos/i18n: lib.filterAttrs -> lib.removeAttrs --- nixos/modules/config/i18n.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index 1e6c35a4ea31..60ccc6dcfe55 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -12,7 +12,7 @@ let ] ++ lib.pipe config.i18n.extraLocaleSettings [ # See description of extraLocaleSettings for why is this ignored here. - (lib.filterAttrs (n: v: n != "LANGUAGE")) + (x: lib.removeAttrs x [ "LANGUAGE" ]) (lib.mapAttrs (n: v: (sanitizeUTF8Capitalization v))) (lib.mapAttrsToList (LCRole: lang: lang + "/" + (config.i18n.localeCharsets.${LCRole} or "UTF-8"))) ] From e090d24809f42ecb4d3f50f7239352aaa1471321 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 09:30:31 +0200 Subject: [PATCH 043/129] nixos/thinkfan: lib.filterAttrs -> lib.removeAttrs --- nixos/modules/services/hardware/thinkfan.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix index d5d1f23f1d98..daf865252653 100644 --- a/nixos/modules/services/hardware/thinkfan.nix +++ b/nixos/modules/services/hardware/thinkfan.nix @@ -101,14 +101,12 @@ let # removes NixOS special and unused attributes sensorToConf = { type, query, ... }@args: - (lib.filterAttrs ( - k: v: - v != null - && !(lib.elem k [ + (lib.filterAttrs (k: v: v != null) ( + lib.removeAttrs args [ "type" "query" - ]) - ) args) + ] + )) // { "${type}" = query; }; From 5bf55cee1fe411a33d96492abc55c5de3a56fd30 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 09:33:37 +0200 Subject: [PATCH 044/129] nixos/public-inbox: lib.filterAttrs -> lib.removeAttrs --- nixos/modules/services/mail/public-inbox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/public-inbox.nix b/nixos/modules/services/mail/public-inbox.nix index 0933d2dd535d..353db2e2207c 100644 --- a/nixos/modules/services/mail/public-inbox.nix +++ b/nixos/modules/services/mail/public-inbox.nix @@ -403,7 +403,7 @@ in } ]; services.public-inbox.settings = filterAttrsRecursive (n: v: v != null) { - publicinbox = mapAttrs (n: filterAttrs (n: v: n != "description")) cfg.inboxes; + publicinbox = mapAttrs (n: v: removeAttrs v [ "description" ]) cfg.inboxes; }; users = { users.public-inbox = { From e3366549da1d62b3d4e516ad3ac9824b7ea05c5c Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 09:36:55 +0200 Subject: [PATCH 045/129] nixos/grafana: lib.filterAttrs -> lib.removeAttrs --- nixos/modules/services/monitoring/grafana.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 9aad9e21fa6e..46da20bec8ad 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -126,7 +126,7 @@ let ''; # Get a submodule without any embedded metadata: - _filter = x: filterAttrs (k: v: k != "_module") x; + _filter = x: removeAttrs x [ "_module" ]; # https://grafana.com/docs/grafana/latest/administration/provisioning/#datasources grafanaTypes.datasourceConfig = types.submodule { From 71644ede59a910ebddc207458031faca4e6c1111 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 09:38:21 +0200 Subject: [PATCH 046/129] nixos/authelia: lib.filterAttrs -> lib.removeAttrs --- nixos/modules/services/security/authelia.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/authelia.nix b/nixos/modules/services/security/authelia.nix index 5dc438473a1d..059337e3a425 100644 --- a/nixos/modules/services/security/authelia.nix +++ b/nixos/modules/services/security/authelia.nix @@ -270,7 +270,7 @@ let lib.updateManyAttrsByPath [ { path = lib.init pathList; - update = old: lib.filterAttrs (n: v: n != (lib.last pathList)) old; + update = old: lib.removeAttrs old [ (lib.last pathList) ]; } ] set; in From dbe03e152ce5fb1cabaf59d24cd5f80bd471b018 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 09:39:41 +0200 Subject: [PATCH 047/129] nixos/prometheus-exporters/mail: lib.filterAttrs -> lib.removeAttrs --- .../modules/services/monitoring/prometheus/exporters/mail.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix index 7dc40293d464..61ca738fdd31 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix @@ -15,6 +15,7 @@ let nameValuePair toLower filterAttrs + removeAttrs escapeShellArg literalExpression mkIf @@ -41,7 +42,7 @@ let ) else nameValuePair (toLower name) value - ) (filterAttrs (n: _: !(n == "_module")) cfg.configuration) + ) (removeAttrs cfg.configuration [ "_module" ]) ) ); From 77bd06103070b993b5045f9aaf1a01bba9641bf4 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 09:40:48 +0200 Subject: [PATCH 048/129] nixos/systemd: lib.filterAttrs -> lib.removeAttrs --- nixos/modules/system/boot/systemd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index c7e81bb44335..3c827c3d6627 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -592,7 +592,7 @@ in ''; enabledUpstreamSystemUnits = filter (n: !elem n cfg.suppressedSystemUnits) upstreamSystemUnits; - enabledUnits = filterAttrs (n: v: !elem n cfg.suppressedSystemUnits) cfg.units; + enabledUnits = removeAttrs cfg.units cfg.suppressedSystemUnits; in { From b9daf908d9a0b38ff35fdebe2c29f0b7199450ec Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 12:31:45 +0200 Subject: [PATCH 049/129] maubot/plugins: builtins.any -> builtins.elem --- pkgs/tools/networking/maubot/plugins/generated.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/maubot/plugins/generated.nix b/pkgs/tools/networking/maubot/plugins/generated.nix index dbaee26f8853..9e7bf10ac8c3 100644 --- a/pkgs/tools/networking/maubot/plugins/generated.nix +++ b/pkgs/tools/networking/maubot/plugins/generated.nix @@ -69,7 +69,7 @@ lib.flip builtins.mapAttrs json ( ); in spdxLicenses.${spdx}; - broken = builtins.any (x: x == null) reqDeps; + broken = builtins.elem null reqDeps; }; } // lib.optionalAttrs (entry.isPoetry or false) { From d25929342857a2d893f407f0ae3860b35c4cb4c1 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 12:32:36 +0200 Subject: [PATCH 050/129] ruby-modules/testing: lib.any -> lib.elem --- pkgs/development/ruby-modules/testing/stubs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/testing/stubs.nix b/pkgs/development/ruby-modules/testing/stubs.nix index b0258988888f..614dcd822f4a 100644 --- a/pkgs/development/ruby-modules/testing/stubs.nix +++ b/pkgs/development/ruby-modules/testing/stubs.nix @@ -14,7 +14,7 @@ let builtins.toJSON ( lib.filterAttrs ( n: v: - builtins.any (x: x == n) [ + builtins.elem n [ "name" "system" ] From c9a5d0c51fe05fff9754b5967292027716528da8 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 12:33:12 +0200 Subject: [PATCH 051/129] sleek-grub-theme: lib.any -> lib.elem --- pkgs/by-name/sl/sleek-grub-theme/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sl/sleek-grub-theme/package.nix b/pkgs/by-name/sl/sleek-grub-theme/package.nix index 186993f6fbd2..e7ae9353fbb4 100644 --- a/pkgs/by-name/sl/sleek-grub-theme/package.nix +++ b/pkgs/by-name/sl/sleek-grub-theme/package.nix @@ -6,7 +6,7 @@ withStyle ? "light", # use override to specify one of "dark" / "orange" / "bigSur" }: -assert builtins.any (s: withStyle == s) [ +assert builtins.elem withStyle [ "light" "dark" "orange" From b0196cc429d3efe4c2248523a0cd520ed69aa719 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 12:34:21 +0200 Subject: [PATCH 052/129] otb: builtins.any -> builtins.elem --- pkgs/by-name/ot/otb/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ot/otb/package.nix b/pkgs/by-name/ot/otb/package.nix index 4de37605c62c..5febf925ebfc 100644 --- a/pkgs/by-name/ot/otb/package.nix +++ b/pkgs/by-name/ot/otb/package.nix @@ -59,7 +59,7 @@ let # https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/issues/2454#note_112821 "fftw" ]; - itkIsInDepsToRemove = dep: builtins.any (d: d == dep.name) itkDepsToRemove; + itkIsInDepsToRemove = dep: builtins.elem dep.name itkDepsToRemove; # remove after https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/issues/2451 otbSwig = swig.overrideAttrs (oldArgs: { From 1da7dfe371b4aa51539e42664c3c608eb596ee77 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 12:35:44 +0200 Subject: [PATCH 053/129] inspircd: lib.any -> lib.elem --- pkgs/by-name/in/inspircd/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix index 6245b34a2a7d..1980e8707107 100644 --- a/pkgs/by-name/in/inspircd/package.nix +++ b/pkgs/by-name/in/inspircd/package.nix @@ -24,7 +24,7 @@ let # libcs in nixpkgs (musl and glibc). compatible = lib: drv: - lib.any (lic: lic == (drv.meta.license or { })) [ + lib.elem (drv.meta.license or { }) [ lib.licenses.mit # musl lib.licenses.lgpl2Plus # glibc ]; From ff17d6952f83d33bade139c9644f894edfeec93f Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 12:36:41 +0200 Subject: [PATCH 054/129] pypy: lib.any -> lib.elem --- pkgs/development/interpreters/python/pypy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index c030a464e133..7c8ef2fbfb80 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals - (lib.any (l: l == optimizationLevel) [ + (lib.elem optimizationLevel [ "0" "1" "2" From ae61c38e7b662d51bca294f03a30f764da284d39 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 12:43:41 +0200 Subject: [PATCH 055/129] jupyter: lib.any -> lib.elem --- pkgs/applications/editors/jupyter/kernel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/jupyter/kernel.nix b/pkgs/applications/editors/jupyter/kernel.nix index 4496b943997b..2a72d84c47f7 100644 --- a/pkgs/applications/editors/jupyter/kernel.nix +++ b/pkgs/applications/editors/jupyter/kernel.nix @@ -62,7 +62,7 @@ in "logo64" "extraPaths" ]; - kernel = lib.filterAttrs (n: v: (lib.any (x: x == n) allowedKernelKeys)) unfilteredKernel; + kernel = lib.filterAttrs (n: v: (lib.elem n allowedKernelKeys)) unfilteredKernel; config = builtins.toJSON ( kernel // { From bab26e47e6031c67092a4ffdb7b873d80d9142f8 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 12:44:46 +0200 Subject: [PATCH 056/129] zynaddsubfx: lib.any -> lib.elem --- pkgs/applications/audio/zynaddsubfx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index da5abd1baccb..9cde53585717 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -48,7 +48,7 @@ ctestCheckHook, }: -assert builtins.any (g: guiModule == g) [ +assert builtins.elem guiModule [ "fltk" "ntk" "zest" From 09cedbd72e28780f35078ce4be06ff9de4b931f4 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 12:45:33 +0200 Subject: [PATCH 057/129] wordpress: lib.any -> lib.elem --- pkgs/servers/web-apps/wordpress/packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/wordpress/packages/default.nix b/pkgs/servers/web-apps/wordpress/packages/default.nix index 5fafdd153413..c7630cbeb1a5 100644 --- a/pkgs/servers/web-apps/wordpress/packages/default.nix +++ b/pkgs/servers/web-apps/wordpress/packages/default.nix @@ -43,7 +43,7 @@ let license, ... }@args: - assert lib.any (x: x == type) [ + assert lib.elem type [ "plugin" "theme" "language" From aab15d28a721b4b2a112f69298da5a9240dd8ad1 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 12:46:31 +0200 Subject: [PATCH 058/129] nixos/tests/sftpgo: lib.any -> lib.elem --- nixos/tests/sftpgo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/sftpgo.nix b/nixos/tests/sftpgo.nix index c2090c8bb180..6d18c1c5581f 100644 --- a/nixos/tests/sftpgo.nix +++ b/nixos/tests/sftpgo.nix @@ -25,7 +25,7 @@ let groupName: # users.users attrset user: - lib.any (x: x == user.name) config.users.groups.${groupName}.members; + lib.elem user.name config.users.groups.${groupName}.members; # Generates a valid SFTPGo user configuration for a given user # Will be converted to JSON and loaded on application startup. From 36baa254b473f3038640f27180ef0aeb26bf57e3 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 12:47:42 +0200 Subject: [PATCH 059/129] nixos/i18n: lib.any -> lib.elem --- nixos/modules/config/i18n.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index 1e6c35a4ea31..4a022b3aaa6f 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -30,12 +30,12 @@ in glibcLocales = lib.mkOption { type = lib.types.path; default = pkgs.glibcLocales.override { - allLocales = lib.any (x: x == "all") config.i18n.supportedLocales; + allLocales = lib.elem "all" config.i18n.supportedLocales; locales = config.i18n.supportedLocales; }; defaultText = lib.literalExpression '' pkgs.glibcLocales.override { - allLocales = lib.any (x: x == "all") config.i18n.supportedLocales; + allLocales = lib.elem "all" config.i18n.supportedLocales; locales = config.i18n.supportedLocales; } ''; From 271514bd188987c00e6bdc3085857537abd14a89 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 12:48:58 +0200 Subject: [PATCH 060/129] nixos/mpdscribble: lib.any -> lib.elem --- nixos/modules/services/audio/mpdscribble.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/audio/mpdscribble.nix b/nixos/modules/services/audio/mpdscribble.nix index 967853ffc85c..39dab7105968 100644 --- a/nixos/modules/services/audio/mpdscribble.nix +++ b/nixos/modules/services/audio/mpdscribble.nix @@ -130,7 +130,7 @@ in passwordFile = lib.mkOption { default = if localMpd then - (lib.findFirst (c: lib.any (x: x == "read") c.permissions) { + (lib.findFirst (c: lib.elem "read" c.permissions) { passwordFile = null; } mpdCfg.credentials).passwordFile else From 487d055482ce487ed143f6d6dab5f543abde7cef Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 24 Oct 2025 12:58:48 +0900 Subject: [PATCH 061/129] uwsgi: builtins.any -> lib.elem --- pkgs/by-name/uw/uwsgi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/uw/uwsgi/package.nix b/pkgs/by-name/uw/uwsgi/package.nix index 6886ba53cae8..bab49fb7b286 100644 --- a/pkgs/by-name/uw/uwsgi/package.nix +++ b/pkgs/by-name/uw/uwsgi/package.nix @@ -145,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: { # this is a hack to make the php plugin link with session.so (which on nixos is a separate package) # the hack works in coordination with ./additional-php-ldflags.patch - UWSGICONFIG_PHP_LDFLAGS = lib.optionalString (builtins.any (x: x.name == "php") needed) ( + UWSGICONFIG_PHP_LDFLAGS = lib.optionalString (lib.elem "php" needed) ( lib.concatStringsSep "," [ "-Wl" "-rpath=${php-embed.extensions.session}/lib/php/extensions/" @@ -176,7 +176,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - postFixup = lib.optionalString (builtins.any (x: x.name == "php") needed) '' + postFixup = lib.optionalString (lib.elem "php" needed) '' wrapProgram $out/bin/uwsgi --set PHP_INI_SCAN_DIR ${php-embed}/lib ''; From 40136127024391e92d9b0a0eeca32b7b87a639fb Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 24 Oct 2025 13:00:21 +0900 Subject: [PATCH 062/129] distrho-ports: lib.any -> lib.elem --- pkgs/by-name/di/distrho-ports/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/di/distrho-ports/package.nix b/pkgs/by-name/di/distrho-ports/package.nix index f0271b3555ad..366b6960f415 100644 --- a/pkgs/by-name/di/distrho-ports/package.nix +++ b/pkgs/by-name/di/distrho-ports/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ]; - postFixup = lib.optionalString (lib.any (x: x == "vitalium") plugins || plugins == [ ]) '' + postFixup = lib.optionalString (lib.elem "vitalium" plugins || plugins == [ ]) '' for file in \ $out/lib/lv2/vitalium.lv2/vitalium.so \ $out/lib/vst/vitalium.so \ From e9785d201744534423725c832a0be4110e9db96f Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 24 Oct 2025 13:00:57 +0900 Subject: [PATCH 063/129] libvgm: lib.lists.any -> lib.lists.elem --- pkgs/by-name/li/libvgm/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libvgm/package.nix b/pkgs/by-name/li/libvgm/package.nix index 6c39efabcb72..d500f0d9a8e5 100644 --- a/pkgs/by-name/li/libvgm/package.nix +++ b/pkgs/by-name/li/libvgm/package.nix @@ -106,9 +106,7 @@ stdenv.mkDerivation (finalAttrs: { description = "More modular rewrite of most components from VGMPlay"; homepage = "https://github.com/ValleyBell/libvgm"; license = - if - (enableEmulation && (withAllEmulators || (lib.lists.any (core: core == "WSWAN_ALL") emulators))) - then + if (enableEmulation && (withAllEmulators || (lib.lists.elem "WSWAN_ALL" emulators))) then lib.licenses.unfree # https://github.com/ValleyBell/libvgm/issues/43 else lib.licenses.gpl2Only; From ec7699106bc26a24a0d15eb5ad73d9e0f4ff406f Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 24 Oct 2025 13:01:33 +0900 Subject: [PATCH 064/129] calibre: lib.lists.any -> lib.lists.elem --- pkgs/by-name/ca/calibre/package.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix index 56642f9be070..b2a79c1e18ed 100644 --- a/pkgs/by-name/ca/calibre/package.nix +++ b/pkgs/by-name/ca/calibre/package.nix @@ -142,14 +142,12 @@ stdenv.mkDerivation (finalAttrs: { # the following are distributed with calibre, but we use upstream instead odfpy ] - ++ - lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms) - [ - # much of calibre's functionality is usable without a web - # browser, so we enable building on platforms which qtwebengine - # does not support by simply omitting qtwebengine. - pyqt6-webengine - ] + ++ lib.optionals (lib.lists.elem stdenv.hostPlatform.system pyqt6-webengine.meta.platforms) [ + # much of calibre's functionality is usable without a web + # browser, so we enable building on platforms which qtwebengine + # does not support by simply omitting qtwebengine. + pyqt6-webengine + ] ++ lib.optional unrarSupport unrardll )) piper-tts From 574cb2c5411dddf3df5b9309e04bd8a6bc78b643 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 24 Oct 2025 13:04:18 +0900 Subject: [PATCH 065/129] nixos/i18n: lib.any -> lib.elem --- nixos/modules/config/i18n.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index 4a022b3aaa6f..6d8a7289b238 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -149,7 +149,7 @@ in ( !( (lib.subtractLists config.i18n.supportedLocales aggregatedLocales) == [ ] - || lib.any (x: x == "all") config.i18n.supportedLocales + || lib.elem "all" config.i18n.supportedLocales ) ) '' From 428342cce1a1726ba6555d1d76885e516733dcf7 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 24 Oct 2025 13:07:48 +0900 Subject: [PATCH 066/129] nixos/ifstate: builtins.any -> builtins.elem --- nixos/modules/services/networking/ifstate.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ifstate.nix b/nixos/modules/services/networking/ifstate.nix index ddd95d33d131..41997a039ec0 100644 --- a/nixos/modules/services/networking/ifstate.nix +++ b/nixos/modules/services/networking/ifstate.nix @@ -198,7 +198,7 @@ in { assertion = initrdCfg.package.passthru.features.withWireguard - || !(builtins.any (kind: kind == "wireguard") initrdInterfaceTypes); + || !(builtins.elem "wireguard" initrdInterfaceTypes); message = "IfState initrd package is configured without the `wireguard` feature, but wireguard interfaces are configured. Please see the `boot.initrd.network.ifstate.package` option."; } { From 9842083cd0dc66cfb60f4dc4f27ec548620b6fe2 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 24 Oct 2025 13:09:16 +0900 Subject: [PATCH 067/129] nixos/prometheus-exporters/node: lib.any -> lib.elem --- .../services/monitoring/prometheus/exporters/node.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix index c543ac9a206e..2c4a82f0e044 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/node.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix @@ -13,11 +13,11 @@ let types concatStringsSep concatMapStringsSep - any + elem optionals ; - collectorIsEnabled = final: any (collector: (final == collector)) cfg.enabledCollectors; - collectorIsDisabled = final: any (collector: (final == collector)) cfg.disabledCollectors; + collectorIsEnabled = final: elem final cfg.enabledCollectors; + collectorIsDisabled = final: elem final cfg.disabledCollectors; in { port = 9100; From 2ec989b32271f25780da23c634c6c9acf18e28a9 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 24 Oct 2025 13:10:12 +0900 Subject: [PATCH 068/129] nixos/librespeed: lib.any -> lib.elem --- nixos/modules/services/web-apps/librespeed.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/librespeed.nix b/nixos/modules/services/web-apps/librespeed.nix index 1ffc382a3d8e..2f7658339751 100644 --- a/nixos/modules/services/web-apps/librespeed.nix +++ b/nixos/modules/services/web-apps/librespeed.nix @@ -338,10 +338,10 @@ in proxy_buffering off; proxy_request_buffering off; '' - + lib.optionalString (lib.any (m: m.name == "brotli") config.services.nginx.additionalModules) '' + + lib.optionalString (lib.elem "brotli" config.services.nginx.additionalModules) '' brotli off; '' - + lib.optionalString (lib.any (m: m.name == "zstd") config.services.nginx.additionalModules) '' + + lib.optionalString (lib.elem "zstd" config.services.nginx.additionalModules) '' zstd off; ''; }; From 6992ef3a7f429899075a04226aafa4c215ec9c05 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 24 Oct 2025 13:13:34 +0900 Subject: [PATCH 069/129] nixos/kernel_config: lib.any -> lib.elem --- nixos/modules/system/boot/kernel_config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/kernel_config.nix b/nixos/modules/system/boot/kernel_config.nix index 8ca9c96006a4..2cf34e899cae 100644 --- a/nixos/modules/system/boot/kernel_config.nix +++ b/nixos/modules/system/boot/kernel_config.nix @@ -6,7 +6,7 @@ let locs: defs: if defs == [ ] then abort "This case should never happen." - else if any (x: x == false) (getValues defs) then + else if elem false (getValues defs) then false else true; From b827f37cb83f65f7199902dc6b3f9436aaf75991 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 24 Oct 2025 13:16:20 +0900 Subject: [PATCH 070/129] nixos/dolibarr: lib.any -> lib.elem --- nixos/modules/services/web-apps/dolibarr.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/dolibarr.nix b/nixos/modules/services/web-apps/dolibarr.nix index 0a669ccad2a7..2ed5bbccd6e2 100644 --- a/nixos/modules/services/web-apps/dolibarr.nix +++ b/nixos/modules/services/web-apps/dolibarr.nix @@ -6,9 +6,9 @@ }: let inherit (lib) - any boolToString concatStringsSep + elem isBool isString mapAttrsToList @@ -46,7 +46,7 @@ let toStr = k: v: - if (any (str: k == str) secretKeys) then + if (elem k secretKeys) then v else if isString v then "'${v}'" From a0546493c1497a1b53489bdb382ff7869b8e2267 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 24 Oct 2025 13:21:12 +0900 Subject: [PATCH 071/129] nixos/tests/kubernetes: lib.any -> lib.elem --- nixos/tests/kubernetes/base.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix index ff943ef17763..8a6756b8f9e5 100644 --- a/nixos/tests/kubernetes/base.nix +++ b/nixos/tests/kubernetes/base.nix @@ -18,9 +18,7 @@ let }: let masterName = head ( - filter (machineName: any (role: role == "master") machines.${machineName}.roles) ( - attrNames machines - ) + filter (machineName: lib.elem "master" machines.${machineName}.roles) (attrNames machines) ); master = machines.${masterName}; extraHosts = '' From 6c05d7bb17283232f4ff6c99fd796017e0c76ac9 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 24 Oct 2025 13:22:30 +0900 Subject: [PATCH 072/129] zfs: lib.any -> lib.elem --- pkgs/os-specific/linux/zfs/generic.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index 457d4cb144e6..9513e3e7a85d 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -57,7 +57,7 @@ let let inherit (lib) - any + elem optionalString optionals optional @@ -66,11 +66,11 @@ let smartmon = smartmontools.override { inherit enableMail; }; - buildKernel = any (n: n == configFile) [ + buildKernel = elem configFile [ "kernel" "all" ]; - buildUser = any (n: n == configFile) [ + buildUser = elem configFile [ "user" "all" ]; From 021192c0bfd963766c0a6548a8f23fdf7c3605a5 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 24 Oct 2025 13:25:14 +0900 Subject: [PATCH 073/129] make-derivation: lib.any -> builtins.elem --- pkgs/stdenv/generic/make-derivation.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index b27e59860e39..d00df6ff4139 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -426,7 +426,7 @@ let concretizeFlagImplications = flag: impliesFlags: list: - if any (x: x == flag) list then (list ++ impliesFlags) else list; + if builtins.elem flag list then (list ++ impliesFlags) else list; hardeningDisable' = unique ( pipe hardeningDisable [ From 06a27e2fca7bf1d4a913392a2b9d8d4aab35199f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 26 Oct 2025 17:50:34 +0800 Subject: [PATCH 074/129] mate.mate-notification-daemon: 1.28.3 -> 1.28.5 https://github.com/mate-desktop/mate-notification-daemon/compare/v1.28.3...v1.28.5 --- .../mate/mate-notification-daemon/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 2d71ec226d46..027faa67898f 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,7 +1,9 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + autoconf-archive, + autoreconfHook, pkg-config, gettext, glib, @@ -11,6 +13,7 @@ gtk-layer-shell, gtk3, libxml2, + mate-common, mate-desktop, mate-panel, wrapGAppsHook3, @@ -19,17 +22,22 @@ stdenv.mkDerivation rec { pname = "mate-notification-daemon"; - version = "1.28.3"; + version = "1.28.5"; - src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-4Azssf+fdbnMwmRFWORDQ7gJQe20A3fdgQDtOSKt9BM="; + src = fetchFromGitHub { + owner = "mate-desktop"; + repo = "mate-notification-daemon"; + tag = "v${version}"; + hash = "sha256-6N6lD63JL9xAtALn9URjYiCEhMZBC9TfIsrdalyY3YY="; }; nativeBuildInputs = [ + autoconf-archive + autoreconfHook pkg-config gettext libxml2 # for xmllint + mate-common # mate-common.m4 macros wrapGAppsHook3 ]; From 111f1c9f7fa86bf23b5379f767dc593c70f4e86a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Oct 2025 17:21:59 +0000 Subject: [PATCH 075/129] docfx: 2.78.3 -> 2.78.4 --- pkgs/by-name/do/docfx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/docfx/package.nix b/pkgs/by-name/do/docfx/package.nix index e1d14f4f4f61..c54ab12aabf3 100644 --- a/pkgs/by-name/do/docfx/package.nix +++ b/pkgs/by-name/do/docfx/package.nix @@ -6,12 +6,12 @@ buildDotnetGlobalTool { pname = "docfx"; - version = "2.78.3"; + version = "2.78.4"; dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; - nugetHash = "sha256-hLb6OmxqXOOxFaq/N+aZ0sAzEYjU0giX3c1SWQtKDbs="; + nugetHash = "sha256-VvrKQjOnQ7RGp1hP+Bldi7CaM6qpfp4InB5rESISqEg="; meta = { description = "Build your technical documentation site with docfx, with landing pages, markdown, API reference docs for .NET, REST API and more"; From eedef5d79c0d8a6f1b69527fcc3092ad4d829477 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 26 Oct 2025 18:26:20 +0100 Subject: [PATCH 076/129] pdns-recursor: 5.2.5 -> 5.2.6 Fixes CVE-2025-59023 and CVE-2025-59024. https://doc.powerdns.com/recursor/security-advisories/powerdns-advisory-2025-06.html Changes: https://doc.powerdns.com/recursor/changelog/5.2.html#change-5.2.6 --- pkgs/by-name/pd/pdns-recursor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pd/pdns-recursor/package.nix b/pkgs/by-name/pd/pdns-recursor/package.nix index bf5c07b37059..30bdb7190cad 100644 --- a/pkgs/by-name/pd/pdns-recursor/package.nix +++ b/pkgs/by-name/pd/pdns-recursor/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdns-recursor"; - version = "5.2.5"; + version = "5.2.6"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.bz2"; - hash = "sha256-qKZXp6vW6dI3zdJnU/fc9czVuMSKyBILCNK41XodhWo="; + hash = "sha256-INt/KcULGvsensXF6LIZ0RKtrPK4rPPaQW/yR+JaxAc="; }; cargoDeps = rustPlatform.fetchCargoVendor { From 188d1c79ee8d918d0eb188597f9e280ee7837101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 26 Oct 2025 09:44:13 -0700 Subject: [PATCH 077/129] spotdl: 4.4.2 -> 4.4.3 Diff: https://github.com/spotDL/spotify-downloader/compare/v4.4.2...v4.4.3 Changelog: https://github.com/spotDL/spotify-downloader/releases/tag/v4.4.3 --- pkgs/by-name/sp/spotdl/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/spotdl/package.nix b/pkgs/by-name/sp/spotdl/package.nix index faff6ff7b5e8..e1b2e3984899 100644 --- a/pkgs/by-name/sp/spotdl/package.nix +++ b/pkgs/by-name/sp/spotdl/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "spotdl"; - version = "4.4.2"; + version = "4.4.3"; pyproject = true; src = fetchFromGitHub { owner = "spotDL"; repo = "spotify-downloader"; tag = "v${version}"; - hash = "sha256-guQ8fIA20wtCkB5CkU7zg/INE+g8/fvQfIs5TNteQGo="; + hash = "sha256-opbbcYjsR+xuo2uQ7Ic/2+BfkiwdEe1xD/whRonDBWo="; }; build-system = with python3Packages; [ hatchling ]; @@ -50,8 +50,8 @@ python3Packages.buildPythonApplication rec { pyfakefs pytest-mock pytest-subprocess - pytest-vcr pytestCheckHook + vcrpy writableTmpDirAsHomeHook ]; @@ -65,6 +65,8 @@ python3Packages.buildPythonApplication rec { "tests/utils/test_m3u.py" "tests/utils/test_metadata.py" "tests/utils/test_search.py" + # TypeError: 'LocalPath' object is not subscriptable + "tests/utils/test_config.py" ]; disabledTests = [ From e7e429d2b86ccd2e3dfbadcfc66c663126306213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 26 Oct 2025 12:15:28 -0700 Subject: [PATCH 078/129] imagemagick: 7.1.2-7 -> 7.1.2-8 Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.2-7...7.1.2-8 Changelog: https://github.com/ImageMagick/Website/blob/main/ChangeLog.md --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 5d294fc73a28..47ac7b7b66d6 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -85,13 +85,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.2-7"; + version = "7.1.2-8"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; tag = finalAttrs.version; - hash = "sha256-9ARCYftoXiilpJoj+Y+aLCEqLmhHFYSrHfgA5DQHbGo="; + hash = "sha256-2jSQ59Wi6/1dbS/AgM1DfW6WlwoYuJlnTLoM8Mc6Ji8="; }; outputs = [ From b574e175e39bdadc3836b278d40116d4e5a45b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9-Paul=20D=2E?= <44802527+godelized@users.noreply.github.com> Date: Sun, 21 Sep 2025 19:15:11 +0200 Subject: [PATCH 079/129] nixos/anubis: add support for a dedicated RuntimeDirectory per instance --- nixos/modules/services/networking/anubis.md | 28 ++ nixos/modules/services/networking/anubis.nix | 58 +++- nixos/tests/anubis.nix | 282 ++++++++++++++----- 3 files changed, 288 insertions(+), 80 deletions(-) diff --git a/nixos/modules/services/networking/anubis.md b/nixos/modules/services/networking/anubis.md index 533ece7bfbd3..af5d3cf997bc 100644 --- a/nixos/modules/services/networking/anubis.md +++ b/nixos/modules/services/networking/anubis.md @@ -8,6 +8,34 @@ between a reverse proxy and the service to be protected. This module is designed to use Unix domain sockets as the socket paths can be automatically configured for multiple instances, but TCP sockets are also supported. +Configuring multiple instances may look like the following. + +Notes: + +- Each instance as its runtime directory set to `anubis/anubis-`. +- When a single instance is declared with unix sockets, the runtime directory `anubis` is allowed for backward + compatibility. + +```nix +{ + services.anubis.instances."instance-1" = { + # Runtime directory: "anubis/anubis-instance-1". + settings = { + BIND = "/run/anubis/anubis-instance-1/anubis.sock"; + TARGET = "http://localhost:8001"; + }; + }; + + services.anubis.instances."instance-2" = { + # Runtime directory: "anubis/anubis-instance-2". + settings = { + BIND = "/run/anubis/anubis-instance-2/anubis.sock"; + TARGET = "http://localhost:8002"; + }; + }; +} +``` + A minimal configuration with [nginx](#opt-services.nginx.enable) may look like the following: ```nix diff --git a/nixos/modules/services/networking/anubis.nix b/nixos/modules/services/networking/anubis.nix index 968595d303d1..cb1ca0ee293e 100644 --- a/nixos/modules/services/networking/anubis.nix +++ b/nixos/modules/services/networking/anubis.nix @@ -12,6 +12,28 @@ let enabledInstances = lib.filterAttrs (_: conf: conf.enable) cfg.instances; instanceName = name: if name == "" then "anubis" else "anubis-${name}"; + unixAddr = network: addr: lib.strings.optionalString (network == "unix") addr; + unixSocketAddrs = + settings: + lib.filter (x: x != "") [ + (unixAddr settings.BIND_NETWORK settings.BIND) + (unixAddr settings.METRICS_BIND_NETWORK settings.METRICS_BIND) + ]; + + runtimeDirectoryPrefix = name: "/run/anubis/${instanceName name}/"; + instanceUsesUnixSockets = instance: lib.length (unixSocketAddrs instance.settings) > 0; + instanceUsesDedicatedRuntimeDirectory = + name: instance: + lib.any (lib.hasPrefix (runtimeDirectoryPrefix name)) (unixSocketAddrs instance.settings); + useDedicatedRuntimeDirectory = + # Set when: + # - Multiple instances are configured to use unix sockets. + # - At least one instance uses the new runtime directory prefix: /run/anubis/anubis-. + lib.count instanceUsesUnixSockets (lib.attrValues enabledInstances) > 1 + || lib.any (attrs: instanceUsesDedicatedRuntimeDirectory attrs.name attrs.value) ( + lib.attrsToList enabledInstances + ); + commonSubmodule = isDefault: let @@ -185,6 +207,7 @@ let default = "/run/anubis/${instanceName name}.sock"; description = '' The address that Anubis listens to. See Go's [`net.Listen`](https://pkg.go.dev/net#Listen) for syntax. + Use the prefix ${runtimeDirectoryPrefix ""} when configuring multiple instances. Defaults to Unix domain sockets. To use TCP sockets, set this to a TCP address and `BIND_NETWORK` to `"tcp"`. ''; @@ -196,6 +219,7 @@ let description = '' The address Anubis' metrics server listens to. See Go's [`net.Listen`](https://pkg.go.dev/net#Listen) for syntax. + Use the prefix ${runtimeDirectoryPrefix ""} when configuring multiple instances. The metrics server is enabled by default and may be disabled. However, due to implementation details, this is only possible by setting a command line flag. See {option}`services.anubis.defaultOptions.extraFlags` for an @@ -245,6 +269,25 @@ in }; config = lib.mkIf (enabledInstances != { }) { + warnings = [ + "RuntimeDirectory is going to be migrated from `anubis` to `anubis/anubis-`, update BIND and METRICS_BIND to ${runtimeDirectoryPrefix ""} if using unix sockets" + ]; + + assertions = + let + validInstanceUnixSocketAddrs = + { name, value }: + lib.all (lib.hasPrefix (runtimeDirectoryPrefix name)) (unixSocketAddrs value.settings); + in + [ + { + assertion = + !useDedicatedRuntimeDirectory + || lib.all validInstanceUnixSocketAddrs (lib.attrsToList enabledInstances); + message = "use the prefix ${runtimeDirectoryPrefix ""} in BIND and METRICS_BIND when configuring multiple instances"; + } + ]; + users.users = lib.mkIf (cfg.defaultOptions.user == "anubis") { anubis = { isSystemUser = true; @@ -288,19 +331,14 @@ in (lib.singleton (lib.getExe cfg.package)) ++ instance.extraFlags ); RuntimeDirectory = - if - lib.any (lib.hasPrefix "/run/anubis") ( - with instance.settings; - [ - BIND - METRICS_BIND - ] - ) - then + if useDedicatedRuntimeDirectory then + "anubis/${instanceName name}" + else if instanceUsesUnixSockets instance then + # `dedicatedRuntimeDirectory = false`: /run/anubis may still be used. + # Warning: `anubis` will be deprecated eventually. "anubis" else null; - # hardening NoNewPrivileges = true; CapabilityBoundingSet = null; diff --git a/nixos/tests/anubis.nix b/nixos/tests/anubis.nix index 761c31d6b8c6..b2b3b2f8fa82 100644 --- a/nixos/tests/anubis.nix +++ b/nixos/tests/anubis.nix @@ -1,4 +1,36 @@ { lib, ... }: +let + legacyBotPolicyJSON = '' + { + "bots": [ + { + "import": "(data)/bots/_deny-pathological.yaml" + }, + { + "import": "(data)/meta/ai-block-aggressive.yaml" + }, + { + "import": "(data)/crawlers/_allow-good.yaml" + }, + { + "import": "(data)/bots/aggressive-brazilian-scrapers.yaml" + }, + { + "import": "(data)/common/keep-internet-working.yaml" + }, + { + "name": "generic-browser", + "user_agent_regex": "Mozilla|Opera", + "action": "CHALLENGE" + } + ], + "dnsbl": false, + "status_codes": { + "CHALLENGE": 200, + "DENY": 200 + } + }''; +in { name = "anubis"; meta.maintainers = with lib.maintainers; [ @@ -7,57 +39,75 @@ ryand56 ]; - nodes.machine = + nodes.machineLegacy = { config, pkgs, ... }: { services.anubis = { defaultOptions = { - # Get default botPolicy - botPolicy = lib.importJSON "${config.services.anubis.package.src}/data/botPolicies.json"; + botPolicy = builtins.fromJSON legacyBotPolicyJSON; settings = { DIFFICULTY = 3; USER_DEFINED_DEFAULT = true; }; }; - instances = { - "".settings = { + + instances."".settings = { + TARGET = "http://localhost:8080"; + DIFFICULTY = 5; + USER_DEFINED_INSTANCE = true; + }; + + instances."tcp" = { + user = "anubis-tcp"; + group = "anubis-tcp"; + settings = { TARGET = "http://localhost:8080"; - DIFFICULTY = 5; - USER_DEFINED_INSTANCE = true; - }; - - "tcp" = { - user = "anubis-tcp"; - group = "anubis-tcp"; - settings = { - TARGET = "http://localhost:8080"; - BIND = ":9000"; - BIND_NETWORK = "tcp"; - METRICS_BIND = ":9001"; - METRICS_BIND_NETWORK = "tcp"; - }; - }; - - "unix-upstream" = { - group = "nginx"; - settings.TARGET = "unix:///run/nginx/nginx.sock"; - }; - - "botPolicy-default" = { - botPolicy = null; - settings.TARGET = "http://localhost:8080"; - }; - - "botPolicy-file" = { - settings = { - TARGET = "http://localhost:8080"; - POLICY_FNAME = "/etc/anubis-botPolicy.json"; - }; + BIND = "127.0.0.1:9000"; + BIND_NETWORK = "tcp"; + METRICS_BIND = "127.0.0.1:9001"; + METRICS_BIND_NETWORK = "tcp"; }; }; }; - # Empty json for testing + users.users.nginx.extraGroups = [ config.users.groups.anubis.name ]; + services.nginx = { + enable = true; + recommendedProxySettings = true; + virtualHosts."basic.localhost".locations = { + "/".proxyPass = "http://unix:${config.services.anubis.instances."".settings.BIND}"; + "/metrics".proxyPass = "http://unix:${config.services.anubis.instances."".settings.METRICS_BIND}"; + }; + + virtualHosts."tcp.localhost".locations = { + "/".proxyPass = "http://${config.services.anubis.instances."tcp".settings.BIND}"; + "/metrics".proxyPass = "http://${config.services.anubis.instances."tcp".settings.METRICS_BIND}"; + }; + + # emulate an upstream with nginx, listening on tcp and unix sockets. + virtualHosts."upstream.localhost" = { + default = true; # make nginx match this vhost for `localhost` + listen = [ + { addr = "unix:/run/nginx/nginx.sock"; } + { + addr = "localhost"; + port = 8080; + } + ]; + locations."/" = { + tryFiles = "$uri $uri/index.html =404"; + root = pkgs.runCommand "anubis-test-upstream" { } '' + mkdir $out + echo "it works" >> $out/index.html + ''; + }; + }; + }; + }; + + nodes.machine = + { config, pkgs, ... }: + { environment.etc."anubis-botPolicy.json".text = lib.generators.toJSON { } { bots = [ { @@ -68,8 +118,73 @@ ]; }; + services.anubis = { + defaultOptions = { + botPolicy = builtins.fromJSON legacyBotPolicyJSON; + settings = { + DIFFICULTY = 3; + USER_DEFINED_DEFAULT = true; + }; + }; + + instances."".settings = { + TARGET = "http://localhost:8080"; + DIFFICULTY = 5; + USER_DEFINED_INSTANCE = true; + BIND = "/run/anubis/anubis/anubis.sock"; + METRICS_BIND = "/run/anubis/anubis/anubis-metrics.sock"; + }; + + instances."tcp" = { + user = "anubis-tcp"; + group = "anubis-tcp"; + settings = { + TARGET = "http://localhost:8080"; + BIND = "127.0.0.1:9000"; + BIND_NETWORK = "tcp"; + METRICS_BIND = "127.0.0.1:9001"; + METRICS_BIND_NETWORK = "tcp"; + }; + }; + + instances."another-unix-listen" = { + settings = { + TARGET = "http://localhost:8080"; + BIND = "/run/anubis/anubis-another-unix-listen/anubis.sock"; + METRICS_BIND = "/run/anubis/anubis-another-unix-listen/anubis-metrics.sock"; + }; + }; + + instances."unix-upstream" = { + group = "nginx"; + settings = { + BIND = "/run/anubis/anubis-unix-upstream/anubis.sock"; + METRICS_BIND = "/run/anubis/anubis-unix-upstream/anubis-metrics.sock"; + TARGET = "unix:///run/nginx/nginx.sock"; + }; + }; + + instances."botPolicy-default" = { + botPolicy = null; + settings = { + TARGET = "http://localhost:8080"; + BIND = "/run/anubis/anubis-botPolicy-default/anubis.sock"; + METRICS_BIND = "/run/anubis/anubis-botPolicy-default/anubis-metrics.sock"; + }; + }; + + instances."botPolicy-file" = { + settings = { + TARGET = "http://localhost:8080"; + POLICY_FNAME = "/etc/anubis-botPolicy.json"; + BIND = "/run/anubis/anubis-botPolicy-file/anubis.sock"; + METRICS_BIND = "/run/anubis/anubis-botPolicy-file/anubis-metrics.sock"; + }; + }; + }; + # support - users.users.nginx.extraGroups = [ config.services.anubis.defaultOptions.group ]; + users.users.nginx.extraGroups = [ config.users.groups.anubis.name ]; services.nginx = { enable = true; recommendedProxySettings = true; @@ -79,12 +194,21 @@ }; virtualHosts."tcp.localhost".locations = { - "/".proxyPass = "http://localhost:9000"; - "/metrics".proxyPass = "http://localhost:9001"; + "/".proxyPass = "http://${config.services.anubis.instances."tcp".settings.BIND}"; + "/metrics".proxyPass = "http://${config.services.anubis.instances."tcp".settings.METRICS_BIND}"; + }; + + virtualHosts."another-unix-listen".locations = { + "/".proxyPass = "http://unix:${ + config.services.anubis.instances."another-unix-listen".settings.BIND + }"; + "/metrics".proxyPass = "http://unix:${ + config.services.anubis.instances."another-unix-listen".settings.METRICS_BIND + }"; }; virtualHosts."unix.localhost".locations = { - "/".proxyPass = "http://unix:${config.services.anubis.instances.unix-upstream.settings.BIND}"; + "/".proxyPass = "http://unix:${config.services.anubis.instances."unix-upstream".settings.BIND}"; }; # emulate an upstream with nginx, listening on tcp and unix sockets. @@ -109,43 +233,61 @@ }; testScript = '' - for unit in ["nginx", "anubis", "anubis-tcp", "anubis-unix-upstream"]: - machine.wait_for_unit(unit + ".service") + with subtest("Legacy anubis service configuration: supports only a single RuntimeDirectory"): + for unit in ["nginx", "anubis", "anubis-tcp"]: + machineLegacy.wait_for_unit(unit + ".service") - for port in [9000, 9001]: - machine.wait_for_open_port(port) + machineLegacy.wait_for_open_unix_socket("/run/anubis/anubis.sock") + machineLegacy.wait_for_open_unix_socket("/run/anubis/anubis-metrics.sock") - for instance in ["anubis", "anubis-unix-upstream"]: - machine.wait_for_open_unix_socket(f"/run/anubis/{instance}.sock") - machine.wait_for_open_unix_socket(f"/run/anubis/{instance}-metrics.sock") + # Default unix socket mode with 1 instance listening on unix sockets. + machineLegacy.succeed('curl -f http://localhost:8080 | grep "it works"') + machineLegacy.succeed('curl -f http://basic.localhost | grep "it works"') + machineLegacy.succeed('curl -f http://basic.localhost -H "User-Agent: Mozilla" | grep anubis') + machineLegacy.succeed('curl -f http://basic.localhost/metrics | grep anubis_challenges_issued') - # Default unix socket mode - machine.succeed('curl -f http://basic.localhost | grep "it works"') - machine.succeed('curl -f http://basic.localhost -H "User-Agent: Mozilla" | grep anubis') - machine.succeed('curl -f http://basic.localhost/metrics | grep anubis_challenges_issued') + # TCP mode. + machineLegacy.succeed('curl -f http://tcp.localhost -H "User-Agent: Mozilla" | grep anubis') + machineLegacy.succeed('curl -f http://tcp.localhost/metrics | grep anubis_challenges_issued') - # TCP mode - machine.succeed('curl -f http://tcp.localhost -H "User-Agent: Mozilla" | grep anubis') - machine.succeed('curl -f http://tcp.localhost/metrics | grep anubis_challenges_issued') + with subtest("Dedicated RuntimeDirectory"): + for unit in ["nginx", "anubis", "anubis-another-unix-listen", "anubis-tcp", "anubis-unix-upstream"]: + machine.wait_for_unit(unit + ".service") - # Upstream is a unix socket mode - machine.succeed('curl -f http://unix.localhost/index.html | grep "it works"') + for port in [9000, 9001]: + machine.wait_for_open_port(port) - # Default user-defined environment variables - machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "USER_DEFINED_DEFAULT"') - machine.succeed('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "USER_DEFINED_DEFAULT"') + machine.wait_for_open_unix_socket("/run/anubis/anubis/anubis.sock") + machine.wait_for_open_unix_socket("/run/anubis/anubis/anubis-metrics.sock") + for instance in ["another-unix-listen", "unix-upstream"]: + machine.wait_for_open_unix_socket(f"/run/anubis/anubis-{instance}/anubis.sock") + machine.wait_for_open_unix_socket(f"/run/anubis/anubis-{instance}/anubis-metrics.sock") - # Instance-specific user-specified environment variables - machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "USER_DEFINED_INSTANCE"') - machine.fail('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "USER_DEFINED_INSTANCE"') + machine.succeed('curl -f http://basic.localhost | grep "it works"') + machine.succeed('curl -f http://basic.localhost -H "User-Agent: Mozilla" | grep anubis') + machine.succeed('curl -f http://basic.localhost/metrics | grep anubis_challenges_issued') - # Make sure defaults don't overwrite themselves - machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "DIFFICULTY=5"') - machine.succeed('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "DIFFICULTY=3"') + machine.succeed('curl -f http://another-unix-listen.localhost -H "User-Agent: Mozilla" | grep anubis') + machine.succeed('curl -f http://another-unix-listen.localhost/metrics | grep anubis_challenges_issued') - # Check correct BotPolicy settings are applied - machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "POLICY_FNAME=/nix/store"') - machine.fail('cat /run/current-system/etc/systemd/system/anubis-botPolicy-default.service | grep "POLICY_FNAME="') - machine.succeed('cat /run/current-system/etc/systemd/system/anubis-botPolicy-file.service | grep "POLICY_FNAME=/etc/anubis-botPolicy.json"') + # Upstream is a unix socket mode. + machine.succeed('curl -f http://unix.localhost/index.html | grep "it works"') + + # Default user-defined environment variables. + machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "USER_DEFINED_DEFAULT"') + machine.succeed('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "USER_DEFINED_DEFAULT"') + + # Instance-specific user-specified environment variables. + machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "USER_DEFINED_INSTANCE"') + machine.fail('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "USER_DEFINED_INSTANCE"') + + # Make sure defaults don't overwrite themselves. + machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "DIFFICULTY=5"') + machine.succeed('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "DIFFICULTY=3"') + + # Check correct BotPolicy settings are applied + machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "POLICY_FNAME=/nix/store"') + machine.fail('cat /run/current-system/etc/systemd/system/anubis-botPolicy-default.service | grep "POLICY_FNAME="') + machine.succeed('cat /run/current-system/etc/systemd/system/anubis-botPolicy-file.service | grep "POLICY_FNAME=/etc/anubis-botPolicy.json"') ''; } From 99d206c976135c28d3c0da7e895da5be93a38347 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Oct 2025 21:28:54 +0000 Subject: [PATCH 080/129] klipper: 0.13.0-unstable-2025-09-26 -> 0.13.0-unstable-2025-10-23 --- pkgs/servers/klipper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index acd755224619..81c297d1b898 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "0.13.0-unstable-2025-09-26"; + version = "0.13.0-unstable-2025-10-23"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "af17c8c238ba8cdeaaabb87b25a3ca2375b47c11"; - sha256 = "sha256-n3t58gsPXxlf2DnrofI28/0ZRC4EwnZvoFKxgxZ9vYA="; + rev = "6465921a5adb3a3335494598463066a6c3540cb5"; + sha256 = "sha256-UKLJ+sf2g6BSbF+aNZ+QGcqVjFkV5GX9Sei6BCdqQL4="; }; sourceRoot = "${src.name}/klippy"; From 51f85f77c0864f5a72887b929875b42384e70727 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Oct 2025 22:21:07 +0000 Subject: [PATCH 081/129] zoom-us: 6.6.0.4410 -> 6.6.5.5215 --- pkgs/by-name/zo/zoom-us/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 54bcc294ed12..a2c41fd90d4a 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -54,25 +54,25 @@ let # Zoom versions are released at different times per platform and often with different versions. # We write them on three lines like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "6.6.0.64511"; - versions.x86_64-darwin = "6.6.0.64511"; + versions.aarch64-darwin = "6.6.5.67181"; + versions.x86_64-darwin = "6.6.5.67181"; # This is the fallback version so that evaluation can produce a meaningful result. - versions.x86_64-linux = "6.6.0.4410"; + versions.x86_64-linux = "6.6.5.5215"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-2GdiJ/2K3TDF6nvVaIBVLJHgasx1e22aS4rhP30L2/o="; + hash = "sha256-u8jRZNtVM6QdFcrBK5BcO4yPCAMNmKUv1aGRGqdORGw="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-td0EltgpfSGlyo9Pg/4qS8qUdELP+A97iY9z3g19MW8="; + hash = "sha256-pKCzrW4Y9YFTS2FyLQR9WA+6oC2hdzzExpEN/VH3PnA="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-KTg6VO1GT/8ppXFevGDx0br9JGl9rdUtuBzHmnjiOuk="; + hash = "sha256-sh1PbAxLGd5zsBO6lsIJV7Z22o9A15xAdopdJZ17ZUw="; }; }; From c2dc892cbd568d5b1ec9b329295cc7a3f59c8e1d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Oct 2025 22:55:57 +0000 Subject: [PATCH 082/129] sscg: 3.0.8 -> 4.0.0 --- pkgs/by-name/ss/sscg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ss/sscg/package.nix b/pkgs/by-name/ss/sscg/package.nix index b9c1f004d7df..5e31229127d7 100644 --- a/pkgs/by-name/ss/sscg/package.nix +++ b/pkgs/by-name/ss/sscg/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sscg"; - version = "3.0.8"; + version = "4.0.0"; src = fetchFromGitHub { owner = "sgallagher"; repo = "sscg"; tag = "sscg-${finalAttrs.version}"; - hash = "sha256-vHZuBjFs7sGIMGFWyqaW0SzzDDsrszlLmLREJtjLH2g="; + hash = "sha256-Z/Cea9m2v+M+t69gx/Y6IGAUZ/p5ZsTA80+fvUvqvYc="; }; nativeBuildInputs = [ From 441028ed560c79ffd1e0142f2a22b83a74f24258 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Oct 2025 23:12:00 +0000 Subject: [PATCH 083/129] python3Packages.python-snoo: 0.9.0 -> 0.10.0 --- pkgs/development/python-modules/python-snoo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-snoo/default.nix b/pkgs/development/python-modules/python-snoo/default.nix index 05239538a597..044b5491edab 100644 --- a/pkgs/development/python-modules/python-snoo/default.nix +++ b/pkgs/development/python-modules/python-snoo/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "python-snoo"; - version = "0.9.0"; + version = "0.10.0"; pyproject = true; src = fetchFromGitHub { owner = "Lash-L"; repo = "python-snoo"; tag = "v${version}"; - hash = "sha256-HLX8eVhAZbydZNbBAwi7F4qloZImPZlts4CDyFLIeGE="; + hash = "sha256-p0cKIDdSQwryagvHGjydSTR4O5lAPO7UMhw+tSIxZrY="; }; postPatch = '' From 3d1883b693f41fcc02f2bc85460399c503e5bc38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Oct 2025 23:45:58 +0000 Subject: [PATCH 084/129] python3Packages.pylint-odoo: 9.3.21 -> 9.3.22 --- pkgs/development/python-modules/pylint-odoo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint-odoo/default.nix b/pkgs/development/python-modules/pylint-odoo/default.nix index c9a6d80ed969..6e67fa12b5ea 100644 --- a/pkgs/development/python-modules/pylint-odoo/default.nix +++ b/pkgs/development/python-modules/pylint-odoo/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { pname = "pylint-odoo"; - version = "9.3.21"; + version = "9.3.22"; pyproject = true; src = fetchFromGitHub { owner = "OCA"; repo = "pylint-odoo"; tag = "v${version}"; - hash = "sha256-qNZHk8bl1mxaLzS55oV29iKGDfIKumQgME1V9PIx4vQ="; + hash = "sha256-qSeDnfZCdEtXAXeAJ+mEbDH5Fbxj9ghiucwlz1mIMnI="; }; pythonRelaxDeps = [ From b9e518470a0b86791808bebf94b6818ce3f360e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Oct 2025 00:22:31 +0000 Subject: [PATCH 085/129] postfix: 3.10.4 -> 3.10.5 --- pkgs/by-name/po/postfix/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/postfix/package.nix b/pkgs/by-name/po/postfix/package.nix index e615ebd3568e..e801abfa0c04 100644 --- a/pkgs/by-name/po/postfix/package.nix +++ b/pkgs/by-name/po/postfix/package.nix @@ -74,11 +74,11 @@ let in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.10.4"; + version = "3.10.5"; src = fetchurl { url = "https://de.postfix.org/ftpmirror/official/postfix-${version}.tar.gz"; - hash = "sha256-z7ZoYf6PlkeH3a6rFfPKPn7z3nMPlxca/EpeyjOMpEQ="; + hash = "sha256-apJr9wIXOGGwjkm8tR/KOi8mn5ozf3LvFZv0YFIIfjU="; }; nativeBuildInputs = [ From 68e12d566ff212d0c5624a147b3d456cc84c303c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Oct 2025 00:27:07 +0000 Subject: [PATCH 086/129] der-ascii: 0.6.0 -> 0.7.0 --- pkgs/by-name/de/der-ascii/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/der-ascii/package.nix b/pkgs/by-name/de/der-ascii/package.nix index af2bb299196f..85b8e13fbb90 100644 --- a/pkgs/by-name/de/der-ascii/package.nix +++ b/pkgs/by-name/de/der-ascii/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "der-ascii"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "google"; repo = "der-ascii"; rev = "v${version}"; - sha256 = "sha256-xGzxq5AHvzLUOp9VUcI9JMwrCpVIrpDvenWUOEBP6pA="; + sha256 = "sha256-i4rNeNDE7bIsO04haMKsbJmyvQRhhEt3I7UxmfTtL78="; }; vendorHash = null; From 594420d4ef97cfcb86dfdd3c7ede5e1fc4802d0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Oct 2025 01:35:13 +0000 Subject: [PATCH 087/129] pocketbase: 0.30.4 -> 0.31.0 --- pkgs/by-name/po/pocketbase/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix index 5eab2ef9c561..b9b3d2c0eab5 100644 --- a/pkgs/by-name/po/pocketbase/package.nix +++ b/pkgs/by-name/po/pocketbase/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.30.4"; + version = "0.31.0"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-n2xBwonQOEk2LVQePxdO/PraM75FFDmOqZ9fIL2xd+I="; + hash = "sha256-YCYihhPq24JdJKAU8zr4h4z131zj4BN3Qh/y5tHmyRs="; }; - vendorHash = "sha256-Zo0b0MTIRpLGPIg288ROFPIdHfMzZdFLbFZPAffWPxU="; + vendorHash = "sha256-wsPJIlsq4Q26cce69a0oqEalfDrNIMVFt8ufdj+WId4="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; From 08bd155e0a2b29c6ef6d6c8ec73064d4bfc4b1b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Oct 2025 03:07:03 +0000 Subject: [PATCH 088/129] kibi: 0.2.2 -> 0.3.0 --- pkgs/by-name/ki/kibi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ki/kibi/package.nix b/pkgs/by-name/ki/kibi/package.nix index cb2512e7e0cf..dd8b58ce5ea5 100644 --- a/pkgs/by-name/ki/kibi/package.nix +++ b/pkgs/by-name/ki/kibi/package.nix @@ -7,15 +7,15 @@ rustPlatform.buildRustPackage rec { pname = "kibi"; - version = "0.2.2"; + version = "0.3.0"; - cargoHash = "sha256-7SOkREsGiolT5LxLAbjZe3aAYBT/AlhlOXDlDmoei9w="; + cargoHash = "sha256-gXkwqmmFGNEJY7an3KWlRuLL5WuCH4P0n7BrLNsZ9/A="; src = fetchFromGitHub { owner = "ilai-deutel"; repo = "kibi"; rev = "v${version}"; - sha256 = "sha256-ox1qKWxJlUIFzEqeyzG2kqZix3AHnOKFrlpf6O5QM+k="; + sha256 = "sha256-6uDpTQ97eNgM1lCiYPWS5QPxMNcPF3Ix14VaGiTY4Kc="; }; nativeBuildInputs = [ makeWrapper ]; From 74aaeb373c0638bec9889d073d4b9f1e135812f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Oct 2025 04:01:33 +0000 Subject: [PATCH 089/129] taskwarrior-tui: 0.26.3 -> 0.26.4 --- pkgs/by-name/ta/taskwarrior-tui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/taskwarrior-tui/package.nix b/pkgs/by-name/ta/taskwarrior-tui/package.nix index b595a4b8ee27..9ca19b9b21d2 100644 --- a/pkgs/by-name/ta/taskwarrior-tui/package.nix +++ b/pkgs/by-name/ta/taskwarrior-tui/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.26.3"; + version = "0.26.4"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "sha256-8PFGlsm9B6qHRrY7YIPwknmGS+Peg5MWd0kMT173wIQ="; + sha256 = "sha256-Ubl2xSFb5ZJ/5JqNI0In3hX6SxZd4g/AEq+CLdN2FsE="; }; - cargoHash = "sha256-y5tHZIsbHLU9acIUM/QUx1T0eLK/E/jR+XXys5JnGjU="; + cargoHash = "sha256-lq2mqMrhcRX2gX7youx8NrZEKmEOJYuhIsHHixuQmmk="; nativeBuildInputs = [ installShellFiles ]; From 5bf1bfdab4bb235c4bde1c6116ec6e03c5417b4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Oct 2025 04:44:34 +0000 Subject: [PATCH 090/129] flameshot: 13.1.0 -> 13.2.0 --- pkgs/by-name/fl/flameshot/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix index 021707044ad7..7eeda3cd9147 100644 --- a/pkgs/by-name/fl/flameshot/package.nix +++ b/pkgs/by-name/fl/flameshot/package.nix @@ -18,13 +18,13 @@ assert stdenv.hostPlatform.isDarwin -> (!enableWlrSupport); stdenv.mkDerivation (finalAttrs: { pname = "flameshot"; - version = "13.1.0"; + version = "13.2.0"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; tag = "v${finalAttrs.version}"; - hash = "sha256-Wg0jc1AqgetaESmTyhzAHx3zal/5DMDum7fzhClqeck="; + hash = "sha256-oQMM2BUY6gpBjSRboR1YMZLIi6p0EmrHps7Y6YI7ytU="; }; cmakeFlags = [ From aa339c586718b1ecf33b395dacac85844d3467a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Oct 2025 05:57:53 +0000 Subject: [PATCH 091/129] vacuum-go: 0.18.9 -> 0.19.1 --- pkgs/by-name/va/vacuum-go/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix index 1f08a8b343fd..c34a640aeead 100644 --- a/pkgs/by-name/va/vacuum-go/package.nix +++ b/pkgs/by-name/va/vacuum-go/package.nix @@ -7,17 +7,17 @@ buildGoModule (finalAttrs: { pname = "vacuum-go"; - version = "0.18.9"; + version = "0.19.1"; src = fetchFromGitHub { owner = "daveshanley"; repo = "vacuum"; # using refs/tags because simple version gives: 'the given path has multiple possibilities' error tag = "v${finalAttrs.version}"; - hash = "sha256-uXNSwp+Qqw8drSt+SN20AjoJG9Pmaz0WCozFq8jEv2o="; + hash = "sha256-MJM8gwSMwdr83NN2Rt6hGf2tJUrmMdhUp5QtylsldtM="; }; - vendorHash = "sha256-+GkxN20mZD/ZBTCjmjiDcEAJix2Ssn9HsNrUtQkrI18="; + vendorHash = "sha256-w3TSTM0WezYuajMPSy5OIWb5coE+SgIRuJISe1kYokg="; env.CGO_ENABLED = 0; ldflags = [ From e8a255e6ae8f91621dc3ffd51c7208a8437fbadf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Oct 2025 07:16:48 +0000 Subject: [PATCH 092/129] supabase-cli: 2.53.5 -> 2.54.8 --- pkgs/by-name/su/supabase-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix index 4554d70990a3..67bd8b05d94c 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "2.53.5"; + version = "2.54.8"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-U91G/5eWj+ZHCq9GU9R+gSYhwez99xi6t4VWsnYpjtI="; + hash = "sha256-iU2NFb97458ouDYuTwgCIYtBpM11MXPWS4hV/Q4IDMs="; }; - vendorHash = "sha256-ST1j+UXGs3mBf5NYe+sp+QXjHsey9ATOFdriIEBJpKM="; + vendorHash = "sha256-JhPKfSFQxFwH5nIYIO3mACdDfURIhuISs1tANiCfWSk="; ldflags = [ "-s" From 52f305407cc41dfd5cd9238b8d192cd570ad7b84 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 27 Oct 2025 11:41:56 +0400 Subject: [PATCH 093/129] kibi: modernize --- pkgs/by-name/ki/kibi/package.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ki/kibi/package.nix b/pkgs/by-name/ki/kibi/package.nix index dd8b58ce5ea5..268ba30f54a7 100644 --- a/pkgs/by-name/ki/kibi/package.nix +++ b/pkgs/by-name/ki/kibi/package.nix @@ -5,7 +5,7 @@ makeWrapper, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "kibi"; version = "0.3.0"; @@ -14,22 +14,27 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "ilai-deutel"; repo = "kibi"; - rev = "v${version}"; - sha256 = "sha256-6uDpTQ97eNgM1lCiYPWS5QPxMNcPF3Ix14VaGiTY4Kc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-6uDpTQ97eNgM1lCiYPWS5QPxMNcPF3Ix14VaGiTY4Kc="; }; nativeBuildInputs = [ makeWrapper ]; postInstall = '' install -Dm644 syntax.d/* -t $out/share/kibi/syntax.d + install -Dm644 kibi.desktop -t $out/share/applications + install -Dm0644 assets/logo.svg $out/share/icons/hicolor/scalable/apps/kibi.svg wrapProgram $out/bin/kibi --prefix XDG_DATA_DIRS : "$out/share" ''; - meta = with lib; { + meta = { description = "Text editor in ≤1024 lines of code, written in Rust"; homepage = "https://github.com/ilai-deutel/kibi"; - license = licenses.mit; - maintainers = with maintainers; [ robertodr ]; + license = with lib.licenses; [ + asl20 + mit + ]; + maintainers = with lib.maintainers; [ robertodr ]; mainProgram = "kibi"; }; -} +}) From c499a89db4c6748bbd0453012d13c0f8e1fc065c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Oct 2025 08:17:44 +0000 Subject: [PATCH 094/129] slint-lsp: 1.13.1 -> 1.14.1 --- pkgs/by-name/sl/slint-lsp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sl/slint-lsp/package.nix b/pkgs/by-name/sl/slint-lsp/package.nix index 2edeb1b5674e..ff24feebaa9b 100644 --- a/pkgs/by-name/sl/slint-lsp/package.nix +++ b/pkgs/by-name/sl/slint-lsp/package.nix @@ -15,14 +15,14 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "slint-lsp"; - version = "1.13.1"; + version = "1.14.1"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-XEs7zJWocRZgVPPDM/IxOOwE7ofh+b7A/TJrQw/mMOo="; + hash = "sha256-gVRoca4u1TVArDF226JWzLQJhUAIWA2JDyQ3Wo87AkA="; }; - cargoHash = "sha256-DAoqfnis95oEPBgYeOdR3zUVdoKbay780iJ6zVkxdDU="; + cargoHash = "sha256-f3RLJnxoEUm7gsfqj86wXgfOj9woGmisONv0RZAQCGc="; rpathLibs = [ fontconfig From 3e459bd9d9d2922917c4f39d4b35fac3ca0df6e9 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Mon, 27 Oct 2025 06:32:21 +0000 Subject: [PATCH 095/129] letterpress: 2.1 -> 2.2 Changelog: https://gitlab.gnome.org/World/Letterpress/-/releases/2.2 Diff: https://gitlab.gnome.org/World/Letterpress/-/compare/2.1..2.2 --- pkgs/by-name/le/letterpress/package.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/le/letterpress/package.nix b/pkgs/by-name/le/letterpress/package.nix index e83eaa0811cf..89092dd68145 100644 --- a/pkgs/by-name/le/letterpress/package.nix +++ b/pkgs/by-name/le/letterpress/package.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitLab, - fetchpatch, wrapGAppsHook4, appstream, blueprint-compiler, @@ -18,25 +17,16 @@ }: python3Packages.buildPythonApplication rec { pname = "letterpress"; - version = "2.1"; + version = "2.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "letterpress"; rev = version; - hash = "sha256-9U8iH3V4WMljdtWLmb0RlexLeAN5StJ0c9RlEB2E7Xs="; + hash = "sha256-cqLodI6UjdLCKLGGcSIbXu1+LOcq2DE00V+lVS7OBMg="; }; - patches = [ - # Fix application segmentation fault on file chooser dialog opening - # https://gitlab.gnome.org/World/Letterpress/-/merge_requests/16 - (fetchpatch { - url = "https://gitlab.gnome.org/World/Letterpress/-/commit/15059eacca14204d1092a6e32ef30c6ce4df6d36.patch"; - hash = "sha256-pjg/O9advtkZ0l73GQtL/GYcTWeOs5l3VGOdnsZCWI0="; - }) - ]; - runtimeDeps = [ jp2a ]; @@ -81,6 +71,7 @@ python3Packages.buildPythonApplication rec { High-res output can still be viewed comfortably by lowering the zoom factor. ''; homepage = "https://apps.gnome.org/Letterpress/"; + changelog = "https://gitlab.gnome.org/World/Letterpress/-/releases/${version}"; license = licenses.gpl3Plus; maintainers = [ maintainers.dawidd6 ]; teams = [ teams.gnome-circle ]; From cc949077f04ac3d33f24b9057e14b1109ee5b8d7 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Mon, 27 Oct 2025 08:59:01 +0000 Subject: [PATCH 096/129] tahoe-lafs: 1.20.0 -> 1.20.0-unstable-2025-10-12 https://github.com/tahoe-lafs/tahoe-lafs/compare/refs/tags/tahoe-lafs-1.20.0...7b96d16aba511fd34dcc0c14c9db754229e19531 --- pkgs/by-name/ta/tahoe-lafs/package.nix | 44 +++++++------------------- 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/ta/tahoe-lafs/package.nix b/pkgs/by-name/ta/tahoe-lafs/package.nix index 7d8f4d3a089c..5ff134b95b73 100644 --- a/pkgs/by-name/ta/tahoe-lafs/package.nix +++ b/pkgs/by-name/ta/tahoe-lafs/package.nix @@ -1,47 +1,25 @@ { lib, - python3, + python3Packages, fetchFromGitHub, texinfo, versionCheckHook, }: -let - python = python3.override { - self = python; - packageOverrides = self: super: { - # tahoe-lafs is incompatible with magic-wormhole >= 0.19.0 - # TODO: unpin, when https://tahoe-lafs.org/trac/tahoe-lafs/ticket/4180 is fixed - magic-wormhole = super.magic-wormhole.overridePythonAttrs (oldAttrs: rec { - version = "0.18.0"; - - src = fetchFromGitHub { - owner = "magic-wormhole"; - repo = "magic-wormhole"; - tag = version; - hash = "sha256-FQ7m6hkJcFZaE+ptDALq/gijn/RcAM1Zvzi2+xpoXBU="; - }; - - nativeCheckInputs = lib.filter ( - input: (input.pname or null) != "pytest-twisted" - ) oldAttrs.nativeCheckInputs; - - doCheck = false; - }); - }; - }; - python3Packages = python.pkgs; -in python3Packages.buildPythonApplication rec { pname = "tahoe-lafs"; - version = "1.20.0"; + version = "1.20.0-unstable-2025-10-12"; pyproject = true; + # workaround required to build an unstable version + # TODO: when moving to a tagged version, remove this and the workaround for versionCheckHook + env.SETUPTOOLS_SCM_PRETEND_VERSION = builtins.elemAt (builtins.split "-" version) 0; + src = fetchFromGitHub { owner = "tahoe-lafs"; repo = "tahoe-lafs"; - tag = "tahoe-lafs-${version}"; - hash = "sha256-9qaL4GmdjClviKTnwAxaTywvJChQ5cVVgWs1IkFxhIY="; + rev = "7b96d16aba511fd34dcc0c14c9db754229e19531"; + hash = "sha256-7qMeyL0j0D6Yos7qDhhplinKPV87Vu72dbE4eWql/g4="; }; outputs = [ @@ -89,8 +67,8 @@ python3Packages.buildPythonApplication rec { eliot filelock foolscap - future klein + legacy-cgi magic-wormhole netifaces psutil @@ -139,13 +117,13 @@ python3Packages.buildPythonApplication rec { ++ [ versionCheckHook ]; - versionCheckProgram = "${placeholder "out"}/bin/tahoe"; + versionCheckProgramArg = "--version"; checkPhase = '' runHook preCheck - runHook versionCheckHook + version=$SETUPTOOLS_SCM_PRETEND_VERSION runHook versionCheckHook trial --rterrors allmydata runHook postCheck From 5ef030a22cd4651b45f6d71c7fe3bb157a252967 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Mon, 27 Oct 2025 08:59:01 +0000 Subject: [PATCH 097/129] tahoe-lafs: install man pages --- pkgs/by-name/ta/tahoe-lafs/package.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ta/tahoe-lafs/package.nix b/pkgs/by-name/ta/tahoe-lafs/package.nix index 5ff134b95b73..0850840ca3fb 100644 --- a/pkgs/by-name/ta/tahoe-lafs/package.nix +++ b/pkgs/by-name/ta/tahoe-lafs/package.nix @@ -2,6 +2,7 @@ lib, python3Packages, fetchFromGitHub, + installShellFiles, texinfo, versionCheckHook, }: @@ -26,6 +27,7 @@ python3Packages.buildPythonApplication rec { "out" "doc" "info" + "man" ]; # Remove broken and expensive tests. @@ -46,13 +48,16 @@ python3Packages.buildPythonApplication rec { hatchling ]; - nativeBuildInputs = with python3Packages; [ - # docs + nativeBuildInputs = # docs + [ + installShellFiles + texinfo + ] + ++ (with python3Packages; [ recommonmark sphinx sphinx-rtd-theme - texinfo - ]; + ]); dependencies = with python3Packages; @@ -99,6 +104,8 @@ python3Packages.buildPythonApplication rec { make info mkdir -p "$info/share/info" cp -rv _build/texinfo/*.info "$info/share/info" + + installManPage man/man*/* ) ''; From ed5a409899b3f21a0d680892f306ef35ff8d9668 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Oct 2025 10:47:44 +0100 Subject: [PATCH 098/129] python313Packages.roadrecon: modernize Removed pythonOlder dependency and updated build inputs. --- .../development/python-modules/roadrecon/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/roadrecon/default.nix b/pkgs/development/python-modules/roadrecon/default.nix index c7bf9a716579..81e137aae936 100644 --- a/pkgs/development/python-modules/roadrecon/default.nix +++ b/pkgs/development/python-modules/roadrecon/default.nix @@ -10,7 +10,6 @@ marshmallow, marshmallow-sqlalchemy, openpyxl, - pythonOlder, roadlib, setuptools, sqlalchemy, @@ -21,8 +20,6 @@ buildPythonPackage rec { version = "1.7.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { inherit pname version; hash = "sha256-v8IUnJlREtKMnhJtdKtChcxM/IKNKRuHA79V38zxLGY="; @@ -30,11 +27,9 @@ buildPythonPackage rec { pythonRelaxDeps = [ "flask" ]; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp flask flask-cors @@ -47,6 +42,9 @@ buildPythonPackage rec { sqlalchemy ]; + # Module has no tests + doCheck = false; + pythonImportsCheck = [ "roadtools.roadrecon" ]; meta = with lib; { From d857cda9ec0786765a63ae9a67b034439f13542b Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 09:58:24 +0200 Subject: [PATCH 099/129] quartus-prime-lite: lib.filterAttrs -> lib.removeAttrs --- pkgs/by-name/qu/quartus-prime-lite/quartus.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/qu/quartus-prime-lite/quartus.nix b/pkgs/by-name/qu/quartus-prime-lite/quartus.nix index 2349d765b3cd..68121d1a14ce 100644 --- a/pkgs/by-name/qu/quartus-prime-lite/quartus.nix +++ b/pkgs/by-name/qu/quartus-prime-lite/quartus.nix @@ -35,9 +35,7 @@ let }) supportedDevices ); - unsupportedDeviceIds = lib.filterAttrs ( - name: value: !(lib.hasAttr name supportedDeviceIds) - ) deviceIds; + unsupportedDeviceIds = lib.removeAttrs deviceIds (lib.attrNames supportedDeviceIds); componentHashes = { "arria_lite" = "sha256-ASvi9YX15b4XXabGjkuR5wl9wDwCijl8s750XTR/4XU="; From 82f8caefa346c463f3196fb0cfc6744b4bba0a49 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 10:03:01 +0200 Subject: [PATCH 100/129] haskell-language-server: lib.filterAttrs -> lib.removeAttrs --- .../tools/haskell/haskell-language-server/withWrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 2beaa3ed8e45..600a1acd6de6 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -99,7 +99,7 @@ let let # only formatters that were not requested unwanted = lib.pipe knownFormatters [ - (lib.filterAttrs (fmt: _: !(lib.elem fmt supportedFormatters))) + (fmts: lib.removeAttrs fmts supportedFormatters) lib.attrsToList ]; # all flags to disable From 467464e0cd66e2ef4b37ede14cec56bd360712c7 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 10:19:21 +0200 Subject: [PATCH 101/129] linux: lib.filterAttrs -> lib.removeAttrs --- pkgs/os-specific/linux/kernel/patches.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index ddda525e70b0..6719de2e3468 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -57,7 +57,7 @@ in { name = lib.removeSuffix ".patch" src.name; - patch = fetchurl (lib.filterAttrs (k: v: k != "extra") src); + patch = fetchurl (lib.removeAttrs src [ "extra" ]); extra = src.extra; inherit version sha256; }; From b6625b9f0107efbb2a7f5b030556c5e1c4594ceb Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 7 Apr 2025 12:10:54 +0200 Subject: [PATCH 102/129] stdenv/darwin: lib.filterAttrs -> lib.removeAttrs --- pkgs/stdenv/darwin/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 4fa9b5454aed..d7eb0c453ec4 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -737,7 +737,10 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check (disallowedPackages prevStage) # Only cctools and ld64 are rebuilt from `bintoolsPackages` to avoid rebuilding their dependencies # again in this stage after building them in stage 1. - (lib.filterAttrs (name: _: name != "ld64" && name != "cctools") (bintoolsPackages prevStage)) + (lib.removeAttrs (bintoolsPackages prevStage) [ + "ld64" + "cctools" + ]) (llvmToolsDeps prevStage) (sdkPackages prevStage) (sdkPackagesNoCC prevStage) From e029ab783d8151b12b2b7ec58c0001966b276774 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 8 Sep 2025 21:37:00 +0200 Subject: [PATCH 103/129] python3Packages.pulsar-client: lib.filterAttrs -> lib.removeAttrs --- pkgs/development/python-modules/pulsar-client/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pulsar-client/default.nix b/pkgs/development/python-modules/pulsar-client/default.nix index 3c9b5303ad7d..2919a84f8e79 100644 --- a/pkgs/development/python-modules/pulsar-client/default.nix +++ b/pkgs/development/python-modules/pulsar-client/default.nix @@ -67,7 +67,7 @@ buildPythonPackage rec { ratelimit ]; avro = [ fastavro ]; - all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies)); + all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ])); }; nativeCheckInputs = [ From d79a2afea101d3a943662814d7e2cd798955cc2d Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sun, 26 Oct 2025 14:53:38 +0900 Subject: [PATCH 104/129] python3Packages.dramatiq-abort: lib.filterAttrs -> lib.removeAttrs --- pkgs/development/python-modules/dramatiq-abort/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dramatiq-abort/default.nix b/pkgs/development/python-modules/dramatiq-abort/default.nix index b4130f701bfe..655d2da4ec0f 100644 --- a/pkgs/development/python-modules/dramatiq-abort/default.nix +++ b/pkgs/development/python-modules/dramatiq-abort/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ]; optional-dependencies = { - all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies)); + all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ])); gevent = [ gevent ]; redis = [ redis ]; }; From 38190d2687fd7c80c9d5351cdcb89c27ab10d00b Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sun, 26 Oct 2025 14:53:48 +0900 Subject: [PATCH 105/129] python3Packages.markdown2: lib.filterAttrs -> lib.removeAttrs --- pkgs/development/python-modules/markdown2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix index d417fb25ca10..e4a6cfd497a0 100644 --- a/pkgs/development/python-modules/markdown2/default.nix +++ b/pkgs/development/python-modules/markdown2/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { code_syntax_highlighting = [ pygments ]; wavedrom = [ wavedrom ]; latex = [ latex2mathml ]; - all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies)); + all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ])); }; meta = { From 4376ce331c691780bb1ad30b6b3a3fc6838eaa68 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sun, 26 Oct 2025 14:53:59 +0900 Subject: [PATCH 106/129] python3Packages.odc-loader: lib.filterAttrs -> lib.removeAttrs --- pkgs/development/python-modules/odc-loader/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/odc-loader/default.nix b/pkgs/development/python-modules/odc-loader/default.nix index e97bb7e87dc6..6fb6f3422ca8 100644 --- a/pkgs/development/python-modules/odc-loader/default.nix +++ b/pkgs/development/python-modules/odc-loader/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { optional-dependencies = { botocore = [ botocore ]; zarr = [ zarr ]; - all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies)); + all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ])); }; nativeCheckInputs = [ From da7a71e82428f037d52f6e9504e42989698294be Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sun, 26 Oct 2025 14:54:07 +0900 Subject: [PATCH 107/129] python3Packages.pettingzoo: lib.filterAttrs -> lib.removeAttrs --- pkgs/development/python-modules/pettingzoo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pettingzoo/default.nix b/pkgs/development/python-modules/pettingzoo/default.nix index 1409b29e3633..e8fa3a1ed962 100644 --- a/pkgs/development/python-modules/pettingzoo/default.nix +++ b/pkgs/development/python-modules/pettingzoo/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { ]; optional-dependencies = { - all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies)); + all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ])); atari = [ # multi-agent-ale-py pygame From 1d546cf368572db8c87cc8f0f57ac87162e151ed Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sun, 26 Oct 2025 14:54:18 +0900 Subject: [PATCH 108/129] python3Packages.planetary-computer: lib.filterAttrs -> lib.removeAttrs --- pkgs/development/python-modules/planetary-computer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/planetary-computer/default.nix b/pkgs/development/python-modules/planetary-computer/default.nix index 7014512b6e4c..7bc6d0d61641 100644 --- a/pkgs/development/python-modules/planetary-computer/default.nix +++ b/pkgs/development/python-modules/planetary-computer/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { optional-dependencies = { adlfs = [ adlfs ]; azure = [ azure-storage-blob ]; - all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies)); + all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ])); }; pythonImportsCheck = [ From e953f0d20fe1a5ceb9d7e307f85f3b6d65ff0c67 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sun, 26 Oct 2025 14:54:28 +0900 Subject: [PATCH 109/129] python3Packages.pyproject-parser: lib.filterAttrs -> lib.removeAttrs --- pkgs/development/python-modules/pyproject-parser/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyproject-parser/default.nix b/pkgs/development/python-modules/pyproject-parser/default.nix index f3108c431c3f..95a7a7e4c2c6 100644 --- a/pkgs/development/python-modules/pyproject-parser/default.nix +++ b/pkgs/development/python-modules/pyproject-parser/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { ]; optional-dependencies = { - all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies)); + all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ])); cli = [ click consolekit From d56b377b93807f915c6f6745c179726fe9d53219 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sun, 26 Oct 2025 14:54:38 +0900 Subject: [PATCH 110/129] python3Packages.tianshou: lib.filterAttrs -> lib.removeAttrs --- pkgs/development/python-modules/tianshou/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tianshou/default.nix b/pkgs/development/python-modules/tianshou/default.nix index 7cb9052c2d02..2012e3f360a9 100644 --- a/pkgs/development/python-modules/tianshou/default.nix +++ b/pkgs/development/python-modules/tianshou/default.nix @@ -92,7 +92,7 @@ buildPythonPackage rec { ]; optional-dependencies = { - all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies)); + all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ])); argparse = [ docstring-parser From 6952069832f45e58a2a14959af7163a30f3997ee Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sun, 26 Oct 2025 14:54:45 +0900 Subject: [PATCH 111/129] python3Packages.whey: lib.filterAttrs -> lib.removeAttrs --- pkgs/development/python-modules/whey/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/whey/default.nix b/pkgs/development/python-modules/whey/default.nix index ace0f3fbad75..e07c68a3a423 100644 --- a/pkgs/development/python-modules/whey/default.nix +++ b/pkgs/development/python-modules/whey/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "whey" ]; optional-dependencies = { - all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies)); + all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ])); editable = [ editables ]; From ea826761bb5c39f9ab5e140c256cdc5d095c821c Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Mon, 27 Oct 2025 11:09:07 +0100 Subject: [PATCH 112/129] irods: 5.0.1 -> 5.0.2 --- pkgs/by-name/ir/irods-icommands/package.nix | 2 +- pkgs/by-name/ir/irods/package.nix | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ir/irods-icommands/package.nix b/pkgs/by-name/ir/irods-icommands/package.nix index fd92911ec6a0..624986e5d3e4 100644 --- a/pkgs/by-name/ir/irods-icommands/package.nix +++ b/pkgs/by-name/ir/irods-icommands/package.nix @@ -16,7 +16,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { owner = "irods"; repo = "irods_client_icommands"; tag = finalAttrs.version; - hash = "sha256-lo1eCI/CSzl7BJWdPo7KKVHfznkPN6GwsiQThUGuQdw="; + hash = "sha256-jR7AhWeXYuJKzZRmYQUjiKSwK6PaB4dLQO8GVZwJQXk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ir/irods/package.nix b/pkgs/by-name/ir/irods/package.nix index 98b823f54f77..8c2055ec406e 100644 --- a/pkgs/by-name/ir/irods/package.nix +++ b/pkgs/by-name/ir/irods/package.nix @@ -16,19 +16,19 @@ boost183, nlohmann_json, nanodbc, - fmt_9, + fmt, spdlog, }: llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "irods"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "irods"; repo = "irods"; tag = finalAttrs.version; - hash = "sha256-/mcuqukgDoMc89FL/TfOhHWglsfdLmQbAnQYT8vTFsY="; + hash = "sha256-gYwuXWRf5MZv3CTUq/RDlU9Ekbw4jZJmSgWRBKqdKJo="; }; nativeBuildInputs = [ @@ -54,12 +54,8 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { boost183 nlohmann_json nanodbc - # Tracking issue for `fmt_11`: - # - fmt_9 - (spdlog.override { - fmt = fmt_9; - }) + fmt + spdlog ]; cmakeFlags = finalAttrs.passthru.commonCmakeFlags ++ [ From bc46fa17aea0a1c65a187e50662ee6574e541e6f Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Mon, 27 Oct 2025 10:05:23 +0100 Subject: [PATCH 113/129] python3Packages.stringzilla: 4.2.1 -> 4.2.2 --- .../python-modules/stringzilla/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/stringzilla/default.nix b/pkgs/development/python-modules/stringzilla/default.nix index 35876032eea4..131ce9ae00c6 100644 --- a/pkgs/development/python-modules/stringzilla/default.nix +++ b/pkgs/development/python-modules/stringzilla/default.nix @@ -6,31 +6,20 @@ pytest-repeat, pytestCheckHook, setuptools, - stdenv, }: buildPythonPackage rec { pname = "stringzilla"; - version = "4.2.1"; + version = "4.2.2"; pyproject = true; src = fetchFromGitHub { owner = "ashvardanian"; repo = "stringzilla"; tag = "v${version}"; - hash = "sha256-0CIekVxChvH912vFnBF2FR1YyIpxi3SD7KhBlh7yFGA="; + hash = "sha256-J1k8gYPStnnXHFvbHG6nHuQMQy1+XSiS5ERk/reL/Z4="; }; - # Define _POSIX_C_SOURCE to enable POSIX signal handling for ARM capability detection - # See: https://github.com/ashvardanian/StringZilla/pull/263 - env.NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE=200809L"; - - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - # error: unsupported option '-mfloat-abi=' for target 'aarch64-apple-darwin' - substituteInPlace setup.py \ - --replace-fail '"-mfloat-abi=hard",' "" - ''; - build-system = [ setuptools ]; From b6a8fccd082852c8078ee89531e6bdb5c44fe29d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Oct 2025 11:07:33 +0000 Subject: [PATCH 114/129] google-java-format: 1.30.0 -> 1.31.0 --- pkgs/by-name/go/google-java-format/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/google-java-format/package.nix b/pkgs/by-name/go/google-java-format/package.nix index 084d1674e3f1..481ac508b5e4 100644 --- a/pkgs/by-name/go/google-java-format/package.nix +++ b/pkgs/by-name/go/google-java-format/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "google-java-format"; - version = "1.30.0"; + version = "1.31.0"; src = fetchurl { url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar"; - sha256 = "sha256-8iOaiiNKJApU/f94CdSz5mcCwh9ZDHegts97IMgp6Vo="; + sha256 = "sha256-jUv6Lck4iCASp4nMaEl2ivpK+06wEwjGtx+R8I4sVQg="; }; dontUnpack = true; From 2ba5fb1059386a08bd0df348518f92ee6ba5ebe9 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Mon, 27 Oct 2025 12:13:10 +0100 Subject: [PATCH 115/129] zoom-us: add missing library `libGLU` ...reported missing in `libdvf.so` by `autoPatchelfHook`. --- pkgs/by-name/zo/zoom-us/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index a2c41fd90d4a..b61742fa0849 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -175,6 +175,7 @@ let pkgs.glib.dev pkgs.gtk3 pkgs.libGL + pkgs.libGLU pkgs.libdrm pkgs.libgbm pkgs.libkrb5 From f85df393f03089504f618093c16f024d177cfd24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Oct 2025 11:18:40 +0000 Subject: [PATCH 116/129] models-dev: 0-unstable-2025-10-24 -> 0-unstable-2025-10-25 --- pkgs/by-name/mo/models-dev/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix index 3ddd98aeb6e7..6ada8f55c1ee 100644 --- a/pkgs/by-name/mo/models-dev/package.nix +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -8,12 +8,12 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "models-dev"; - version = "0-unstable-2025-10-24"; + version = "0-unstable-2025-10-25"; src = fetchFromGitHub { owner = "sst"; repo = "models.dev"; - rev = "1548a725f07c2c6113379a8c5566c2e4c4dfc91f"; - hash = "sha256-SgZFdjoSlmRS+eMbAIVPsDnwDEmzA/YFhgdHij3Qq38="; + rev = "6aaec4681f415cd7c87519b4acd61720525cdda1"; + hash = "sha256-77PoCq072udYDsplW1ENQbw/8lQqXrEiPFh2e/oAqVw="; }; node_modules = stdenvNoCC.mkDerivation { From f0e20347873dd741a6749dff6cdff81d9a925fd9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Oct 2025 11:31:29 +0000 Subject: [PATCH 117/129] trzsz-ssh: 0.1.22 -> 0.1.23 --- pkgs/by-name/tr/trzsz-ssh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tr/trzsz-ssh/package.nix b/pkgs/by-name/tr/trzsz-ssh/package.nix index 2a4ba92e82cd..8194ae38e2f1 100644 --- a/pkgs/by-name/tr/trzsz-ssh/package.nix +++ b/pkgs/by-name/tr/trzsz-ssh/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "trzsz-ssh"; - version = "0.1.22"; + version = "0.1.23"; src = fetchFromGitHub { owner = "trzsz"; repo = "trzsz-ssh"; tag = "v${finalAttrs.version}"; - hash = "sha256-VvPdWRP+lrhho+Bk5rT9pktEvKe01512WoDfAu5d868="; + hash = "sha256-Cp5XI7ggpt48llojcmarYPi9mTM+YBqwjG/eNAnKTxc="; }; - vendorHash = "sha256-EllXxDyWI4Dy5E6KnzYFxuYDQcdk9+01v5svpARZU44="; + vendorHash = "sha256-pI9BlttS9a1XrgBBmUd+h529fLbsbwSMwjKn4P50liE="; ldflags = [ "-s" From 63e4b98e091e74c2ea0d2c773442b5e9238e68c1 Mon Sep 17 00:00:00 2001 From: 7c6f434c <7c6f434c@mail.ru> Date: Mon, 27 Oct 2025 12:54:51 +0100 Subject: [PATCH 118/129] badvpn: fix build (w.r.t. CMake version) --- pkgs/by-name/ba/badvpn/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ba/badvpn/package.nix b/pkgs/by-name/ba/badvpn/package.nix index 9f3372510b09..887eb08e4be6 100644 --- a/pkgs/by-name/ba/badvpn/package.nix +++ b/pkgs/by-name/ba/badvpn/package.nix @@ -38,6 +38,9 @@ stdenv.mkDerivation rec { cmakeFlagsArray=("-DCMAKE_BUILD_TYPE=" "-DCMAKE_C_FLAGS=-O3 ${ lib.optionalString (!debug) "-DNDEBUG" }"); + sed -e \ + 's/cmake_minimum_required(VERSION 2[.]8)/cmake_minimum_required(VERSION 3.5)/' \ + -i CMakeLists.txt ''; meta = with lib; { From 19d3996ff7c92c2f3df7b0a0f07d125b3b24441e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Oct 2025 12:00:55 +0000 Subject: [PATCH 119/129] build(deps): bump actions/upload-artifact from 4.6.2 to 5.0.0 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.6.2 to 5.0.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/ea165f8d65b6e75b540449e92b4886f43607fa02...330a01c490aca151604b8cf639adc76d48f6c5d4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- .github/workflows/eval.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 26d71b846369..2062ccd7c14a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -98,7 +98,7 @@ jobs: if: | contains(matrix.builds, 'manual-nixos') && !cancelled() && contains(fromJSON(inputs.baseBranch).type, 'primary') - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 + uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 with: name: nixos-manual-${{ matrix.name }} path: nixos-manual diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 97d5c114acb0..0278213fd555 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -143,7 +143,7 @@ jobs: - name: Upload outpaths diff and stats if: inputs.targetSha - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 + uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 with: name: ${{ matrix.version && format('{0}-', matrix.version) || '' }}diff-${{ matrix.system }} path: diff/* @@ -200,7 +200,7 @@ jobs: cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY" - name: Upload the comparison results - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 + uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 with: name: comparison path: comparison/* From cc8b97e2a2ff6b3dca6a86ecfb8eaa8297ecdf2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Oct 2025 12:10:22 +0000 Subject: [PATCH 120/129] build(deps): bump actions/download-artifact from 5.0.0 to 6.0.0 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 5.0.0 to 6.0.0. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/634f93cb2916e3fdff6788551b99b062d0335ce0...018cc2cf5baa6db3ef3c5f8a56943fffe632ef53) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-version: 6.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/eval.yml | 4 ++-- .github/workflows/reviewers.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 97d5c114acb0..d405bcbceed2 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -167,7 +167,7 @@ jobs: target-as-trusted-at: ${{ inputs.targetSha }} - name: Download output paths and eval stats for all systems - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 + uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0 with: pattern: diff-* path: diff @@ -242,7 +242,7 @@ jobs: needs: [versions, eval] steps: - name: Download output paths and eval stats for all versions - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 + uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0 with: pattern: "*-diff-*" path: versions diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml index 22ac1bb5bcd4..6d23e1dde9b7 100644 --- a/.github/workflows/reviewers.yml +++ b/.github/workflows/reviewers.yml @@ -124,7 +124,7 @@ jobs: run: gh api /rate_limit | jq - name: Download the comparison results - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 + uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0 with: run-id: ${{ steps.eval.outputs.run-id }} github-token: ${{ github.token }} From 213e187dae7cb87e905bbdbc43e4bc2b9faa4459 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Oct 2025 12:26:11 +0000 Subject: [PATCH 121/129] fennel-ls: 0.2.1 -> 0.2.2 --- pkgs/by-name/fe/fennel-ls/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fe/fennel-ls/package.nix b/pkgs/by-name/fe/fennel-ls/package.nix index c2aae5dc7604..f9dfa9e18a17 100644 --- a/pkgs/by-name/fe/fennel-ls/package.nix +++ b/pkgs/by-name/fe/fennel-ls/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "fennel-ls"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromSourcehut { owner = "~xerool"; repo = "fennel-ls"; rev = finalAttrs.version; - hash = "sha256-6ZbGRTBBRktudGVBZ+UMn8l0+wKa8f5dg7UOwLhOT7E="; + hash = "sha256-N1530u8Kq7ljdEdTFk0CJJyMLMVX5huQWXjyoMBJN5E="; }; buildInputs = [ lua From 509ec166735ee016f51f74bea290556a66d58054 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 27 Oct 2025 13:32:43 +0100 Subject: [PATCH 122/129] python3Packages.pysnmp: 7.1.21 -> 7.1.22 https://github.com/lextudio/pysnmp/blob/refs/tags/v7.1.22/CHANGES.rst --- pkgs/development/python-modules/pysnmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix index e979bc82acf0..46b25ee5c45c 100644 --- a/pkgs/development/python-modules/pysnmp/default.nix +++ b/pkgs/development/python-modules/pysnmp/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pysnmp"; - version = "7.1.21"; + version = "7.1.22"; pyproject = true; src = fetchFromGitHub { owner = "lextudio"; repo = "pysnmp"; tag = "v${version}"; - hash = "sha256-IbVs/fjNRDhp4a78ZbgqUOxyrlZjEwsKSlQV3+mmCjo="; + hash = "sha256-uEOhOVXaz4g1Ciun8x2AT8pRBkKR6uEfu4KJ1XSwouY="; }; build-system = [ flit-core ]; From 9e6e3550e3cbdf10d1e72c6708c0f2ea7fe35fed Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Mon, 27 Oct 2025 13:56:57 +0100 Subject: [PATCH 123/129] tinymist: 0.13.28 -> 0.13.30 Changelog: https://github.com/Myriad-Dreamin/tinymist/releases/tag/v0.13.30 Diff: https://github.com/Myriad-Dreamin/tinymist/compare/v0.13.28...v0.13.30 --- .../vscode/extensions/myriad-dreamin.tinymist/default.nix | 2 +- pkgs/by-name/ti/tinymist/package.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index 33c278c911ac..1be8ef9daca7 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-LUJ0e/ndyeeRsC2h7JJL6zymmPDWxW0cPGBceuC7+X0="; + hash = "sha256-Sm2Ij1yHMQzPM9lKtiejHRrdCot/DRzgnxznwlZyyro="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index fecd0217f94b..58f497322ad3 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.13.28"; + version = "0.13.30"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; tag = "v${finalAttrs.version}"; - hash = "sha256-Z2FAlFjFHCzFhlLILcXseynoSdMhRQ30fWC7rW946N4="; + hash = "sha256-7SUr23m+zUHsSmSZGlmKnwI5VUPh53Rxiw2Wx8yy+5k="; }; - cargoHash = "sha256-7p+TNZO+uFqXhhMzmHj0r1X2WgDdg8aonMc0jgsrEnk="; + cargoHash = "sha256-Qvj4xdbKI8PEbJ+N8Ba+sE5hDDHMegzU18gFtx/q/W8="; nativeBuildInputs = [ installShellFiles From 2ebcf2ff9c696d7e78a976eb230bc0fb0d192d15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Oct 2025 13:51:51 +0000 Subject: [PATCH 124/129] github-copilot-cli: 0.0.328 -> 0.0.351 --- pkgs/by-name/gi/github-copilot-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/github-copilot-cli/package.nix b/pkgs/by-name/gi/github-copilot-cli/package.nix index 89d99bd3cd4e..0cea28613e50 100644 --- a/pkgs/by-name/gi/github-copilot-cli/package.nix +++ b/pkgs/by-name/gi/github-copilot-cli/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "github-copilot-cli"; - version = "0.0.328"; + version = "0.0.351"; src = fetchzip { url = "https://registry.npmjs.org/@github/copilot/-/copilot-${finalAttrs.version}.tgz"; - hash = "sha256-9oTaVjvwyS8KY8N5kUEiAs+l6vEd/BZ0AGJI0p9Jie0="; + hash = "sha256-pv2/VTrAOtb2wlOCVbs6qmlb0jbCVl4KpwhlEnVxvP8="; }; nativeBuildInputs = [ makeBinaryWrapper ]; From 8d87bb479de558819a33bb47b89427feddf98794 Mon Sep 17 00:00:00 2001 From: Martin Woods Date: Sat, 11 Oct 2025 12:40:23 +0200 Subject: [PATCH 125/129] tuxedo-drivers: 4.15.4 -> 4.16.0 --- pkgs/os-specific/linux/tuxedo-drivers/default.nix | 6 +++--- .../tuxedo-drivers/{no-cp-etc-usr.patch => no-cp-usr.patch} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/os-specific/linux/tuxedo-drivers/{no-cp-etc-usr.patch => no-cp-usr.patch} (93%) diff --git a/pkgs/os-specific/linux/tuxedo-drivers/default.nix b/pkgs/os-specific/linux/tuxedo-drivers/default.nix index 2023553cd3db..ad86e6220e40 100644 --- a/pkgs/os-specific/linux/tuxedo-drivers/default.nix +++ b/pkgs/os-specific/linux/tuxedo-drivers/default.nix @@ -13,17 +13,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "tuxedo-drivers-${kernel.version}"; - version = "4.15.4"; + version = "4.16.0"; src = fetchFromGitLab { group = "tuxedocomputers"; owner = "development/packages"; repo = "tuxedo-drivers"; rev = "v${finalAttrs.version}"; - hash = "sha256-WJeju+czbCw03ALW7yzGAFENCEAvDdKqHvedchd7NVY="; + hash = "sha256-NjKhr8wsnoKSFx5kEXVaQ2SQzAX8XG8ENpYKOSMB2yc="; }; - patches = [ ./no-cp-etc-usr.patch ]; + patches = [ ./no-cp-usr.patch ]; postInstall = '' echo "Running postInstallhook" diff --git a/pkgs/os-specific/linux/tuxedo-drivers/no-cp-etc-usr.patch b/pkgs/os-specific/linux/tuxedo-drivers/no-cp-usr.patch similarity index 93% rename from pkgs/os-specific/linux/tuxedo-drivers/no-cp-etc-usr.patch rename to pkgs/os-specific/linux/tuxedo-drivers/no-cp-usr.patch index 9e94a43d60c5..124b79c98a17 100644 --- a/pkgs/os-specific/linux/tuxedo-drivers/no-cp-etc-usr.patch +++ b/pkgs/os-specific/linux/tuxedo-drivers/no-cp-usr.patch @@ -6,7 +6,7 @@ index 75a6bc1..6021d42 100644 install: all make -C $(KDIR) M=$(PWD) $(MAKEFLAGS) modules_install -- cp -r etc usr / +- cp -r usr / clean: make -C $(KDIR) M=$(PWD) $(MAKEFLAGS) clean From d41fe6300e934d98848f9ec655746baf78d8b0e8 Mon Sep 17 00:00:00 2001 From: Martin Woods Date: Sun, 12 Oct 2025 11:27:34 +0200 Subject: [PATCH 126/129] tuxedo-drivers: added wetisobe to the maintainers --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/os-specific/linux/tuxedo-drivers/default.nix | 1 + 2 files changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a07d0e41b379..dd14e7916dab 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -27747,6 +27747,12 @@ githubId = 43357387; keys = [ { fingerprint = "F844 80B2 0CA9 D6CC C7F5 2479 A776 D2AD 099E 8BC0"; } ]; }; + wetisobe = { + name = "Martin Woods"; + github = "wetisobe"; + email = "weti.sobe@pen-net.de"; + githubId = 172606048; + }; wetrustinprize = { email = "git@wetrustinprize.com"; github = "wetrustinprize"; diff --git a/pkgs/os-specific/linux/tuxedo-drivers/default.nix b/pkgs/os-specific/linux/tuxedo-drivers/default.nix index ad86e6220e40..db9efc0dc13a 100644 --- a/pkgs/os-specific/linux/tuxedo-drivers/default.nix +++ b/pkgs/os-specific/linux/tuxedo-drivers/default.nix @@ -71,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: { keksgesicht xaverdh XBagon + wetisobe ]; platforms = lib.platforms.linux; }; From d995a6dbf4d7982c88a9c5dfc5f256decd091c85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Oct 2025 15:10:42 +0000 Subject: [PATCH 127/129] solanum: 0-unstable-2025-10-13 -> 0-unstable-2025-10-23 --- pkgs/by-name/so/solanum/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/solanum/package.nix b/pkgs/by-name/so/solanum/package.nix index cb97b39c03d8..3a56b9282291 100644 --- a/pkgs/by-name/so/solanum/package.nix +++ b/pkgs/by-name/so/solanum/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation { pname = "solanum"; - version = "0-unstable-2025-10-13"; + version = "0-unstable-2025-10-23"; src = fetchFromGitHub { owner = "solanum-ircd"; repo = "solanum"; - rev = "2d483c6e3f0d33aef9447c17b3b55d3e86098831"; - hash = "sha256-/84WXUqJTOMldIUJokPBNR4quU9YZM0PhWWWLAKoJsw="; + rev = "4544f823127c59951c7695f0f260128ee0691a67"; + hash = "sha256-x+i4LUImepwIz5H13W5eNYl9GzgFvNGS1OSLVtl9qmE="; }; patches = [ From 1250b8c5ace8282dbd5d53bc8ac85485283aad18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Oct 2025 16:30:54 +0000 Subject: [PATCH 128/129] blint: 3.0.2 -> 3.0.4 --- pkgs/by-name/bl/blint/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bl/blint/package.nix b/pkgs/by-name/bl/blint/package.nix index a3b163760a5d..d8a975996666 100644 --- a/pkgs/by-name/bl/blint/package.nix +++ b/pkgs/by-name/bl/blint/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "blint"; - version = "3.0.2"; + version = "3.0.4"; pyproject = true; src = fetchFromGitHub { owner = "owasp-dep-scan"; repo = "blint"; tag = "v${version}"; - hash = "sha256-ell0/opQso7/qD6d6i18vU55TfTgdcZwVFXD+yZg9/g="; + hash = "sha256-6dBNzBjhcBMX+PQ4NbjM18APqFuURH9/MYxHFZ/x7J8="; }; build-system = [ From 5dac65b65a240442c80523cdcbce7525bc8b9754 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Oct 2025 16:47:06 +0000 Subject: [PATCH 129/129] unciv: 4.18.7 -> 4.18.10 --- pkgs/by-name/un/unciv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix index d9f8949cb4db..da6aec474562 100644 --- a/pkgs/by-name/un/unciv/package.nix +++ b/pkgs/by-name/un/unciv/package.nix @@ -12,7 +12,7 @@ nix-update-script, }: let - version = "4.18.7"; + version = "4.18.10"; desktopItem = makeDesktopItem { name = "unciv"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-bZzF8WUDw2rrF8Qi6PKBA9F5EUDZGwgXegcHDFgQxJY="; + hash = "sha256-8gp4h+fKK+gmwL8OnmfKb5pmO4mehClu8FeQe2KJiDk="; }; dontUnpack = true;