From c704ac02d881640919c4be1032e7176c288798a3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 18 Oct 2025 14:16:06 +0200 Subject: [PATCH 01/23] previewqt: fix build --- pkgs/by-name/pr/previewqt/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pr/previewqt/package.nix b/pkgs/by-name/pr/previewqt/package.nix index cf11c5a3b3aa..ce17ed00c8b3 100644 --- a/pkgs/by-name/pr/previewqt/package.nix +++ b/pkgs/by-name/pr/previewqt/package.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; cmakeFlags = [ + (lib.cmakeBool "WITH_DEVIL" false) (lib.cmakeBool "WITH_FREEIMAGE" false) ]; -- knotmirror 0.0.1 From 620e6e2f3624377f2a5b679bd01faee79f85c9ac Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 23 Oct 2025 20:28:08 +0200 Subject: [PATCH 02/23] panotools: 2.9.22 -> 2.9.23 --- pkgs/by-name/pa/panotools/cmake4.patch | 32 -------------------------- pkgs/by-name/pa/panotools/package.nix | 6 ++--- 2 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 pkgs/by-name/pa/panotools/cmake4.patch diff --git a/pkgs/by-name/pa/panotools/cmake4.patch b/pkgs/by-name/pa/panotools/cmake4.patch deleted file mode 100644 index 13d12cc103f8..000000000000 --- a/pkgs/by-name/pa/panotools/cmake4.patch +++ /dev/null @@ -1,32 +0,0 @@ -Subject: Vendor upstream patches (mercurial/sourceforge) -Author: Andreas Metzler - -From: -- https://sourceforge.net/p/panotools/libpano13/ci/698e20b4d296c1dbde9d010c3fb8d54050e56ddb/ -- https://sourceforge.net/p/panotools/libpano13/ci/6b0f2a5ef7a0490866fb224158d1dfbb8bf5896f/ - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -28,8 +28,7 @@ - ## may need to edit the wxWidgets version number below. - ## - --# require at least cmake 3.0 --cmake_minimum_required(VERSION 3.0) -+cmake_minimum_required(VERSION 3.12...4.0) - if(POLICY CMP0074) - cmake_policy(SET CMP0074 NEW) - endif() -@@ -382,12 +382,12 @@ - endif() - - # create TAGS file --ADD_CUSTOM_COMMAND( OUTPUT ctags POST_BUILD -- COMMAND ctags-exuberant -e *.c *.h tools/*.c -+ADD_CUSTOM_COMMAND( OUTPUT ${PROJECT_SOURCE_DIR}/TAGS -+ COMMAND ctags -e *.c *.h tools/*.c - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/ - COMMENT "Build TAGS file" - ) --ADD_CUSTOM_TARGET( TAGS DEPENDS ctags) -+ADD_CUSTOM_TARGET( TAGS DEPENDS ${PROJECT_SOURCE_DIR}/TAGS) diff --git a/pkgs/by-name/pa/panotools/package.nix b/pkgs/by-name/pa/panotools/package.nix index fe5e41c95c12..a5db44159eb3 100644 --- a/pkgs/by-name/pa/panotools/package.nix +++ b/pkgs/by-name/pa/panotools/package.nix @@ -11,15 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libpano13"; - version = "2.9.22"; + version = "2.9.23"; src = fetchurl { url = "mirror://sourceforge/panotools/libpano13-${finalAttrs.version}.tar.gz"; - hash = "sha256-r/xoMM2+ccKNJzHcv43qKs2m2f/UYJxtvzugxoRAqOM="; + hash = "sha256-58B203oUw5Q0liEV5H3b4YRSyj3lzkDiqu+nz1gV6ig="; }; - patches = [ ./cmake4.patch ]; - strictDeps = true; nativeBuildInputs = [ -- knotmirror 0.0.1 From e4e0b934c7709594fa90c9693f4e752c77ac5869 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 25 Oct 2025 20:45:21 +0200 Subject: [PATCH 03/23] pslib: fix build --- pkgs/by-name/ps/pslib/cmake4.patch | 18 ++++++++++++++++++ pkgs/by-name/ps/pslib/package.nix | 8 ++++---- 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/ps/pslib/cmake4.patch diff --git a/pkgs/by-name/ps/pslib/cmake4.patch b/pkgs/by-name/ps/pslib/cmake4.patch new file mode 100644 index 000000000000..7fe5bc3d94e7 --- /dev/null +++ b/pkgs/by-name/ps/pslib/cmake4.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 58a5b45..b41e6a3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,3 +1,5 @@ ++cmake_minimum_required(VERSION 3.10) ++ + PROJECT(pslib C) + option(ENABLE_BMP "Build with BMP support" ON) + +@@ -73,7 +75,6 @@ INCLUDE(CheckFunctionExists) + INCLUDE(TestBigEndian) + test_big_endian(WORDS_BIGENDIAN) + +-SUBDIRS( src ) + SET(SOURCES + src/pslib.c + src/ps_memory.c \ No newline at end of file diff --git a/pkgs/by-name/ps/pslib/package.nix b/pkgs/by-name/ps/pslib/package.nix index e11d87fc2db3..81bf538df8d9 100644 --- a/pkgs/by-name/ps/pslib/package.nix +++ b/pkgs/by-name/ps/pslib/package.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-gaWNvBLuUUy0o+HWCOyG6KmzxDrYCY6PV3WbA/jjH64="; }; + patches = [ + ./cmake4.patch + ]; + nativeBuildInputs = [ cmake pkg-config @@ -33,10 +37,6 @@ stdenv.mkDerivation rec { libtiff ]; - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; - doCheck = true; outputs = [ -- knotmirror 0.0.1 From a5f9102dcd20203a1afea4d5217ef768f4151158 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 25 Oct 2025 21:24:08 +0200 Subject: [PATCH 04/23] gnudatalanguage: fix build --- .../development/interpreters/gnudatalanguage/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/interpreters/gnudatalanguage/default.nix b/pkgs/development/interpreters/gnudatalanguage/default.nix index 154c23aa18ac..328ecd9dfe02 100644 --- a/pkgs/development/interpreters/gnudatalanguage/default.nix +++ b/pkgs/development/interpreters/gnudatalanguage/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, wrapGAppsHook3, readline, @@ -121,6 +122,14 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + patches = [ + (fetchpatch { + url = "https://github.com/gnudatalanguage/gdl/commit/b648a63c5070f38e90167f858a79ba6f01dad1d3.patch?full_index=1"; + includes = [ "CMakeLists.txt" ]; + hash = "sha256-lYtAstI21Up4RArf6pXnjiTwJ3Omoisw43Ih1H2Wc0s="; + }) + ]; + postPatch = '' substituteInPlace CMakeLists.txt \ --replace-fail 'FATAL_ERROR "The src' 'WARNING "The src' \ -- knotmirror 0.0.1 From a0f652db496fbba51ab114c9937dfc68f78ddfa2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Nov 2025 08:40:50 +0000 Subject: [PATCH 05/23] papermc: 1.21.9-41 -> 1.21.10-91 --- pkgs/games/papermc/versions.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/games/papermc/versions.json b/pkgs/games/papermc/versions.json index 1a6a735d7de1..81377f8dccd0 100644 --- a/pkgs/games/papermc/versions.json +++ b/pkgs/games/papermc/versions.json @@ -88,7 +88,11 @@ "version": "1.21.8-60" }, "1.21.9": { - "hash": "sha256-YXZVx7iTC3EViKM8r4SKBLgArd0JcZ9jziZuBtWBYOc=", - "version": "1.21.9-41" + "hash": "sha256-rsAC53x1ZuSUlP3wVDC5YHj/0ddDDmUtTzOP75UeehA=", + "version": "1.21.9-59" + }, + "1.21.10": { + "hash": "sha256-9tjYDSWmh8xSoCodBMsl8We7OoqCgnGiY74vRK2pEsw=", + "version": "1.21.10-91" } } -- knotmirror 0.0.1 From 8cd6da015178c5f25f2317c17cf655c81284dbf6 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sat, 1 Nov 2025 10:28:01 -0700 Subject: [PATCH 06/23] python3Packages.psycopg: disable flaky test --- pkgs/development/python-modules/psycopg/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index c360a08e7791..b6558b5ff693 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -199,6 +199,8 @@ buildPythonPackage rec { "test_connect_error_multi_hosts_each_message_preserved" # Flaky, fails intermittently "test_break_attempts" + # ConnectionResetError: [Errno 104] Connection reset by peer + "test_wait_r" ]; disabledTestPaths = [ -- knotmirror 0.0.1 From cabace071c787cd4b2eadf3cae94ded0fd2b8d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 1 Nov 2025 18:32:33 -0700 Subject: [PATCH 07/23] python3Packages.flake8-deprecated: 2.2.1 -> 2.3.0 Diff: https://github.com/gforcada/flake8-deprecated/compare/2.2.1...2.3.0 Changelog: https://github.com/gforcada/flake8-deprecated/blob/2.3.0/CHANGES.rst --- .../flake8-deprecated/default.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/flake8-deprecated/default.nix b/pkgs/development/python-modules/flake8-deprecated/default.nix index e7601e6190bf..1c7fd6615d48 100644 --- a/pkgs/development/python-modules/flake8-deprecated/default.nix +++ b/pkgs/development/python-modules/flake8-deprecated/default.nix @@ -1,7 +1,6 @@ { lib, - pythonOlder, - fetchPypi, + fetchFromGitHub, buildPythonPackage, hatchling, flake8, @@ -10,15 +9,14 @@ buildPythonPackage rec { pname = "flake8-deprecated"; - version = "2.2.1"; + version = "2.3.0"; pyproject = true; - disabled = pythonOlder "3.8"; - - src = fetchPypi { - pname = "flake8_deprecated"; - inherit version; - hash = "sha256-7pbKAB0coFYfqORvI+LSRgsYqGaWNzyrZE4QKuD/KqI="; + src = fetchFromGitHub { + owner = "gforcada"; + repo = "flake8-deprecated"; + tag = version; + hash = "sha256-KF0hWhMZEWuSPUyfStayNa5Nfss9NpTvMXPeemWbQXU="; }; build-system = [ hatchling ]; @@ -31,10 +29,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "flake8_deprecated" ]; - meta = with lib; { + meta = { + changelog = "https://github.com/gforcada/flake8-deprecated/blob/${src.tag}/CHANGES.rst"; description = "Flake8 plugin that warns about deprecated method calls"; homepage = "https://github.com/gforcada/flake8-deprecated"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ lopsided98 ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ lopsided98 ]; }; } -- knotmirror 0.0.1 From eaf80a754462f7df023cc232d2900bda067c85e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 29 Oct 2025 18:42:39 -0700 Subject: [PATCH 08/23] udisks: modernize --- pkgs/os-specific/linux/udisks/2-default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index e3b9ea635d73..0514dac00904 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -47,8 +47,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "storaged-project"; repo = "udisks"; - rev = "${pname}-${version}"; - sha256 = "sha256-W0vZY6tYxAJbqxNF3F6F6J6h6XxLT+Fon+LqR6jwFUQ="; + tag = "udisks-${version}"; + hash = "sha256-W0vZY6tYxAJbqxNF3F6F6J6h6XxLT+Fon+LqR6jwFUQ="; }; outputs = [ @@ -154,15 +154,15 @@ stdenv.mkDerivation rec { tests.vm = nixosTests.udisks2; }; - meta = with lib; { + meta = { description = "Daemon, tools and libraries to access and manipulate disks, storage devices and technologies"; homepage = "https://www.freedesktop.org/wiki/Software/udisks/"; - license = with licenses; [ + license = with lib.licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the tools & daemon - maintainers = with maintainers; [ johnazoidberg ]; - teams = [ teams.freedesktop ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ johnazoidberg ]; + teams = [ lib.teams.freedesktop ]; + platforms = lib.platforms.linux; }; } -- knotmirror 0.0.1 From 772dc221ae01f5de99f24d55b3692178937ddf6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 29 Oct 2025 18:45:24 -0700 Subject: [PATCH 09/23] udisks: move to pkgs/by-name --- pkgs/{os-specific/linux => by-name/ud}/udisks/fix-paths.patch | 0 pkgs/{os-specific/linux => by-name/ud}/udisks/force-path.patch | 0 .../udisks/2-default.nix => by-name/ud/udisks/package.nix} | 0 pkgs/top-level/all-packages.nix | 3 +-- 4 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{os-specific/linux => by-name/ud}/udisks/fix-paths.patch (100%) rename pkgs/{os-specific/linux => by-name/ud}/udisks/force-path.patch (100%) rename pkgs/{os-specific/linux/udisks/2-default.nix => by-name/ud/udisks/package.nix} (100%) diff --git a/pkgs/os-specific/linux/udisks/fix-paths.patch b/pkgs/by-name/ud/udisks/fix-paths.patch similarity index 100% rename from pkgs/os-specific/linux/udisks/fix-paths.patch rename to pkgs/by-name/ud/udisks/fix-paths.patch diff --git a/pkgs/os-specific/linux/udisks/force-path.patch b/pkgs/by-name/ud/udisks/force-path.patch similarity index 100% rename from pkgs/os-specific/linux/udisks/force-path.patch rename to pkgs/by-name/ud/udisks/force-path.patch diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/by-name/ud/udisks/package.nix similarity index 100% rename from pkgs/os-specific/linux/udisks/2-default.nix rename to pkgs/by-name/ud/udisks/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27a3db1de03a..5c32a5a4f265 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10337,8 +10337,7 @@ with pkgs; util-linux = util-linuxMinimal; }; - udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { }; - udisks = udisks2; + udisks2 = udisks; usbrelay = callPackage ../os-specific/linux/usbrelay { }; usbrelayd = callPackage ../os-specific/linux/usbrelay/daemon.nix { }; -- knotmirror 0.0.1 From 702ded4de3c915bcbb49c82ad11388efa743873a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 30 Oct 2025 10:09:15 -0700 Subject: [PATCH 10/23] udisks2: turn into alias --- nixos/modules/services/hardware/udisks2.nix | 2 +- nixos/modules/services/misc/devmon.nix | 2 +- pkgs/applications/misc/cubocore-packages/libcsys/default.nix | 4 ++-- pkgs/by-name/bu/budgie-control-center/package.nix | 4 ++-- pkgs/by-name/ca/cantata/package.nix | 4 ++-- pkgs/by-name/gn/gnome-control-center/package.nix | 4 ++-- pkgs/by-name/gn/gnome-disk-utility/package.nix | 4 ++-- pkgs/by-name/gv/gvfs/package.nix | 4 ++-- pkgs/by-name/me/mediawriter/package.nix | 4 ++-- pkgs/by-name/sp/spaceFM/package.nix | 4 ++-- pkgs/by-name/ud/udiskie/package.nix | 4 ++-- pkgs/by-name/us/usermount/package.nix | 4 ++-- pkgs/by-name/vi/vifm/package.nix | 4 ++-- pkgs/desktops/enlightenment/enlightenment/default.nix | 4 ++-- pkgs/desktops/mate/mate-control-center/default.nix | 4 ++-- pkgs/desktops/mate/mate-utils/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-monitor/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/about/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 +--- 20 files changed, 36 insertions(+), 37 deletions(-) diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix index cbde9ca600d0..02edf5c8c259 100644 --- a/nixos/modules/services/hardware/udisks2.nix +++ b/nixos/modules/services/hardware/udisks2.nix @@ -25,7 +25,7 @@ in enable = lib.mkEnableOption "udisks2, a DBus service that allows applications to query and manipulate storage devices"; - package = lib.mkPackageOption pkgs "udisks2" { }; + package = lib.mkPackageOption pkgs "udisks" { }; mountOnMedia = lib.mkOption { type = lib.types.bool; diff --git a/nixos/modules/services/misc/devmon.nix b/nixos/modules/services/misc/devmon.nix index 7bf801c6a4f5..64b356daae00 100644 --- a/nixos/modules/services/misc/devmon.nix +++ b/nixos/modules/services/misc/devmon.nix @@ -22,7 +22,7 @@ in path = [ pkgs.udevil pkgs.procps - pkgs.udisks2 + pkgs.udisks pkgs.which ]; serviceConfig.ExecStart = "${pkgs.udevil}/bin/devmon"; diff --git a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix index 0a028ddb8351..6948ca925f1e 100644 --- a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix +++ b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitLab, - udisks2, + udisks, qt6, cmake, ninja, @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ qt6.qtbase - udisks2 + udisks ]; dontWrapQtApps = true; diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix index b638f9246ba0..0ac083351767 100644 --- a/pkgs/by-name/bu/budgie-control-center/package.nix +++ b/pkgs/by-name/bu/budgie-control-center/package.nix @@ -61,7 +61,7 @@ shared-mime-info, testers, tzdata, - udisks2, + udisks, upower, webp-pixbuf-loader, wrapGAppsHook3, @@ -145,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: { networkmanager polkit samba - udisks2 + udisks upower ]; diff --git a/pkgs/by-name/ca/cantata/package.nix b/pkgs/by-name/ca/cantata/package.nix index 35482d168b9d..7f64c6c1d881 100644 --- a/pkgs/by-name/ca/cantata/package.nix +++ b/pkgs/by-name/ca/cantata/package.nix @@ -32,7 +32,7 @@ libmtp, withOnlineServices ? true, withDevices ? true, - udisks2, + udisks, withDynamic ? true, withHttpServer ? true, withLibVlc ? true, @@ -156,7 +156,7 @@ let { names = [ "UDISKS2" ]; enable = withUdisks; - pkgs = [ udisks2 ]; + pkgs = [ udisks ]; } ]; diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix index 2d5710716277..9b54758a8489 100644 --- a/pkgs/by-name/gn/gnome-control-center/package.nix +++ b/pkgs/by-name/gn/gnome-control-center/package.nix @@ -63,7 +63,7 @@ tinysparql, localsearch, tzdata, - udisks2, + udisks, upower, wayland-scanner, libepoxy, @@ -147,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: { samba tinysparql localsearch # for search locations dialog - udisks2 + udisks upower # For animations in Mouse panel. gst_all_1.gst-plugins-base diff --git a/pkgs/by-name/gn/gnome-disk-utility/package.nix b/pkgs/by-name/gn/gnome-disk-utility/package.nix index 5231521e2431..5d0e571627ae 100644 --- a/pkgs/by-name/gn/gnome-disk-utility/package.nix +++ b/pkgs/by-name/gn/gnome-disk-utility/package.nix @@ -24,7 +24,7 @@ ninja, pkg-config, systemd, - udisks2, + udisks, wrapGAppsHook3, xz, }: @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { libpwquality libsecret systemd - udisks2 + udisks xz ]; diff --git a/pkgs/by-name/gv/gvfs/package.nix b/pkgs/by-name/gv/gvfs/package.nix index e1d23355789c..e8e383077aee 100644 --- a/pkgs/by-name/gv/gvfs/package.nix +++ b/pkgs/by-name/gv/gvfs/package.nix @@ -11,7 +11,7 @@ glib, udevSupport ? stdenv.hostPlatform.isLinux, libgudev, - udisks2, + udisks, libgcrypt, libcap, polkit, @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals udevSupport [ libgudev - udisks2 + udisks fuse3 libcdio samba diff --git a/pkgs/by-name/me/mediawriter/package.nix b/pkgs/by-name/me/mediawriter/package.nix index 4f6cee140794..fdcf965a896c 100644 --- a/pkgs/by-name/me/mediawriter/package.nix +++ b/pkgs/by-name/me/mediawriter/package.nix @@ -6,7 +6,7 @@ cmake, fetchFromGitHub, qt6, - udisks2, + udisks, xz, }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { qt6.qtbase qt6.qtdeclarative qt6.qtsvg - udisks2 + udisks xz ]; diff --git a/pkgs/by-name/sp/spaceFM/package.nix b/pkgs/by-name/sp/spaceFM/package.nix index e7180c74a156..7a00979d9b47 100644 --- a/pkgs/by-name/sp/spaceFM/package.nix +++ b/pkgs/by-name/sp/spaceFM/package.nix @@ -16,7 +16,7 @@ ifuseSupport ? false, ifuse ? null, lsof, - udisks2, + udisks, }: stdenv.mkDerivation rec { @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { ffmpegthumbnailer jmtpfs lsof - udisks2 + udisks ] ++ (lib.optionals ifuseSupport [ ifuse ]); # Introduced because ifuse doesn't build due to CVEs in libplist diff --git a/pkgs/by-name/ud/udiskie/package.nix b/pkgs/by-name/ud/udiskie/package.nix index 1fa8d58a5c8c..eeb66d548513 100644 --- a/pkgs/by-name/ud/udiskie/package.nix +++ b/pkgs/by-name/ud/udiskie/package.nix @@ -9,7 +9,7 @@ libnotify, librsvg, python3Packages, - udisks2, + udisks, wrapGAppsHook3, testers, udiskie, @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec { libappindicator-gtk3 libnotify librsvg # SVG icons - udisks2 + udisks ]; dependencies = with python3Packages; [ diff --git a/pkgs/by-name/us/usermount/package.nix b/pkgs/by-name/us/usermount/package.nix index 3c8478000037..f1d02de14496 100644 --- a/pkgs/by-name/us/usermount/package.nix +++ b/pkgs/by-name/us/usermount/package.nix @@ -5,7 +5,7 @@ pkg-config, dbus, libnotify, - udisks2, + udisks, gdk-pixbuf, }: @@ -24,7 +24,7 @@ stdenv.mkDerivation { buildInputs = [ dbus libnotify - udisks2 + udisks gdk-pixbuf ]; diff --git a/pkgs/by-name/vi/vifm/package.nix b/pkgs/by-name/vi/vifm/package.nix index 542cd901e8c6..b7b828443966 100644 --- a/pkgs/by-name/vi/vifm/package.nix +++ b/pkgs/by-name/vi/vifm/package.nix @@ -13,7 +13,7 @@ # adds support for handling removable media (vifm-media). Linux only! mediaSupport ? false, python3 ? null, - udisks2 ? null, + udisks ? null, lib ? null, gitUpdater, }: @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { postFixup = let path = lib.makeBinPath [ - udisks2 + udisks (python3.withPackages (p: [ p.dbus-python ])) ]; diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix index 8521e6ff85cd..cbbe5d32c719 100644 --- a/pkgs/desktops/enlightenment/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/enlightenment/default.nix @@ -14,7 +14,7 @@ libexif, pam, xkeyboard_config, - udisks2, + udisks, waylandSupport ? false, wayland-protocols, xwayland, @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { libexif pam xkeyboard_config - udisks2 # for removable storage mounting/unmounting + udisks # for removable storage mounting/unmounting ] ++ lib.optional bluetoothSupport bluez5 # for bluetooth configuration and control ++ lib.optional pulseSupport libpulseaudio # for proper audio device control and redirection diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 4a4126538b12..0ff0deef6bc3 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -28,7 +28,7 @@ mate-menus, mate-panel, mate-settings-daemon, - udisks2, + udisks, systemd, hicolor-icon-theme, wrapGAppsHook3, @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { mate-menus mate-panel # for org.mate.panel schema, see m-c-c#678 mate-settings-daemon - udisks2 + udisks systemd ]; diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index ced2cfb68fb5..ac75a4848548 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -12,7 +12,7 @@ libgtop, libcanberra-gtk3, inkscape, - udisks2, + udisks, mate-desktop, mate-panel, hicolor-icon-theme, @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { libgtop libcanberra-gtk3 libxml2 - udisks2 + udisks mate-desktop mate-panel hicolor-icon-theme diff --git a/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix b/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix index 0bcd1ea66166..bc03018529f3 100644 --- a/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix @@ -22,7 +22,7 @@ linuxPackages, live-chart, pciutils, - udisks2, + udisks, wingpanel, nix-update-script, }: @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { linuxPackages.nvidia_x11.settings.libXNVCtrl live-chart pciutils - udisks2 + udisks wingpanel ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index 91d7fb794fb0..fe14c2553960 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -19,7 +19,7 @@ packagekit, polkit, switchboard, - udisks2, + udisks, fwupd, appstream, elementary-settings-daemon, @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { packagekit polkit switchboard - udisks2 + udisks ]; passthru = { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ba2b7755c455..47bc57b53499 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1524,6 +1524,7 @@ mapAliases { uade123 = throw "'uade123' has been renamed to/replaced by 'uade'"; # Converted to throw 2025-10-27 uae = throw "'uae' has been removed due to lack of upstream maintenance. Consider using 'fsuae' instead."; # Added 2025-06-11 ubuntu_font_family = throw "'ubuntu_font_family' has been renamed to/replaced by 'ubuntu-classic'"; # Converted to throw 2025-10-27 + udisks2 = udisks; # added 2025-10-30 unicap = throw "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17 unifi-poller = throw "'unifi-poller' has been renamed to/replaced by 'unpoller'"; # Converted to throw 2025-10-27 unzoo = throw "'unzoo' has been removed since it is unmaintained upstream and doesn't compile with newer versions of GCC anymore"; # Removed 2025-05-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c32a5a4f265..47d28220b825 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1419,7 +1419,7 @@ with pkgs; vifm-full = vifm.override { mediaSupport = true; - inherit lib udisks2 python3; + inherit lib udisks python3; }; xfe = callPackage ../by-name/xf/xfe/package.nix { @@ -10337,8 +10337,6 @@ with pkgs; util-linux = util-linuxMinimal; }; - udisks2 = udisks; - usbrelay = callPackage ../os-specific/linux/usbrelay { }; usbrelayd = callPackage ../os-specific/linux/usbrelay/daemon.nix { }; -- knotmirror 0.0.1 From 14ccade9389abaf2fba60659d634ac201eabfaed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Nov 2025 23:43:25 +0000 Subject: [PATCH 11/23] python3Packages.typst: 0.13.7 -> 0.14.1 --- pkgs/development/python-modules/typst/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/typst/default.nix b/pkgs/development/python-modules/typst/default.nix index bbeed6182aea..8f820d103f02 100644 --- a/pkgs/development/python-modules/typst/default.nix +++ b/pkgs/development/python-modules/typst/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "typst"; - version = "0.13.7"; + version = "0.14.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,12 +22,12 @@ buildPythonPackage rec { owner = "messense"; repo = "typst-py"; tag = "v${version}"; - hash = "sha256-kbdYiWix1gDZPTkmjtrSRV/g60bLKxGbv776ezPaSCA="; + hash = "sha256-O6pjw0rVdpVn4PooKjI0deQ+upzL0E7uHTA6wUz40UY="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-IhTrGAgGgSPCD1d3pblCOME0AHv5GMV9xRUNSGTXEws="; + hash = "sha256-LHaAHoF/7znQ6WFJyxEFo7TRBtqAlPBuSCfOe6GhjQ0="; }; build-system = [ -- knotmirror 0.0.1 From a64a5a06301fd874b7da99d9a7c1991be89ffa04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 2 Nov 2025 20:10:03 -0800 Subject: [PATCH 12/23] python3Packages.librehardwaremonitor-api: init at 1.4.0 --- .../librehardwaremonitor-api/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/librehardwaremonitor-api/default.nix diff --git a/pkgs/development/python-modules/librehardwaremonitor-api/default.nix b/pkgs/development/python-modules/librehardwaremonitor-api/default.nix new file mode 100644 index 000000000000..8e41c7041328 --- /dev/null +++ b/pkgs/development/python-modules/librehardwaremonitor-api/default.nix @@ -0,0 +1,40 @@ +{ + aiohttp, + buildPythonPackage, + fetchFromGitHub, + lib, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "librehardwaremonitor-api"; + version = "1.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Sab44"; + repo = "librehardwaremonitor-api"; + tag = "v${version}"; + hash = "sha256-yYJOizO6blfwRBWD9oFnaein7DK1F8Kl744ErehXU0Q="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + ]; + + pythonImportsCheck = [ "librehardwaremonitor_api" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Python API client for LibreHardwareMonitor"; + homepage = "https://github.com/Sab44/librehardwaremonitor-api"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 96b412d8e7a5..d644bb62eb65 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8377,6 +8377,8 @@ self: super: with self; { } ); + librehardwaremonitor-api = callPackage ../development/python-modules/librehardwaremonitor-api { }; + librepo = lib.pipe pkgs.librepo [ toPythonModule ( -- knotmirror 0.0.1 From a9cbabfa4fb9f1b2b4fa8d0afe466fedf8559bb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 2 Nov 2025 20:10:49 -0800 Subject: [PATCH 13/23] home-assistant: support libre_hardware_monitor component --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index e02277331f0d..d8b05c3a638c 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -3282,7 +3282,8 @@ ]; "libre_hardware_monitor" = ps: with ps; [ - ]; # missing inputs: librehardwaremonitor-api + librehardwaremonitor-api + ]; "lidarr" = ps: with ps; [ aiopyarr @@ -7450,6 +7451,7 @@ "lg_netcast" "lg_soundbar" "lg_thinq" + "libre_hardware_monitor" "lidarr" "life360" "lifx" -- knotmirror 0.0.1 From fa1c27e4378da09308df7f8e95b7ca862946292a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Nov 2025 04:38:39 +0000 Subject: [PATCH 14/23] openhue-cli: 0.20 -> 0.21 --- pkgs/by-name/op/openhue-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openhue-cli/package.nix b/pkgs/by-name/op/openhue-cli/package.nix index 1c0ec32a1fe1..390524892449 100644 --- a/pkgs/by-name/op/openhue-cli/package.nix +++ b/pkgs/by-name/op/openhue-cli/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "openhue-cli"; - version = "0.20"; + version = "0.21"; src = fetchFromGitHub { owner = "openhue"; repo = "openhue-cli"; tag = finalAttrs.version; - hash = "sha256-vUmJjuBcOjIhhtWrzq+y0fDlh+wQhgBwxnfuod27CBA="; + hash = "sha256-u6ulk+qv1FlZ7PdUiO9UXtRqWWp2MMRAnc8F9vHnRBo="; leaveDotGit = true; postFetch = '' cd "$out" @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { ''; }; - vendorHash = "sha256-DhTe0fSWoAwzoGr8rZMsbSE92jJFr4T7aVx/ULMfVFo="; + vendorHash = "sha256-3930OjQ26n7J3XDWjCthfQjORP5wpJ3ZZK/m6/wi2X4="; env.CGO_ENABLED = 0; -- knotmirror 0.0.1 From 74d7b6244723cbee61ecfd0490240f80d17b1137 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Nov 2025 14:42:30 +0000 Subject: [PATCH 15/23] compose2nix: 0.3.2 -> 0.3.3 --- pkgs/by-name/co/compose2nix/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/compose2nix/package.nix b/pkgs/by-name/co/compose2nix/package.nix index d6da37a19c5d..25fe02a5e476 100644 --- a/pkgs/by-name/co/compose2nix/package.nix +++ b/pkgs/by-name/co/compose2nix/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "compose2nix"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "aksiksi"; repo = "compose2nix"; rev = "v${version}"; - hash = "sha256-3i49IyYDwyVQffjHrHPmtPJl4ZkT1VpiFVDmX/dHcKw="; + hash = "sha256-0QCYgzxg0upnrVGDXbX9GgSHyzeMP3yqNor2t8DVwiU="; }; - vendorHash = "sha256-ckN4nK2A0micl+iBtvxwf5iMchrcGdC0xzjQta6Jges="; + vendorHash = "sha256-8boWHIGvenGugKq+8ysPCsUib7QQ0ov+jbKFDKpls3g="; passthru.tests = { version = testers.testVersion { -- knotmirror 0.0.1 From 04d40bd838dd8c191c4f95f93d92700e933604d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 3 Nov 2025 08:55:06 -0800 Subject: [PATCH 16/23] immich: 2.2.1 -> 2.2.2 Diff: https://github.com/immich-app/immich/compare/v2.2.1...v2.2.2 Changelog: https://github.com/immich-app/immich/releases/tag/v2.2.2 --- pkgs/by-name/im/immich-cli/package.nix | 2 +- pkgs/by-name/im/immich/package.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/im/immich-cli/package.nix b/pkgs/by-name/im/immich-cli/package.nix index 57c223e9e794..db841758850f 100644 --- a/pkgs/by-name/im/immich-cli/package.nix +++ b/pkgs/by-name/im/immich-cli/package.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation rec { pname = "immich-cli"; - version = "2.2.99"; + version = "2.2.100"; inherit (immich) src pnpmDeps; postPatch = '' diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index ec7dae1eb449..c12872da602d 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -34,7 +34,7 @@ }: let pnpm = pnpm_10; - version = "2.2.1"; + version = "2.2.2"; esbuild' = buildPackages.esbuild.override { buildGoModule = @@ -108,7 +108,7 @@ let owner = "immich-app"; repo = "immich"; tag = "v${version}"; - hash = "sha256-PBhUTDnZtl7Ri9thSAXuazpcmpWEUNn7BXLix+AuaE8="; + hash = "sha256-0ibXs4c61CEp6s/gOCsIj2A7VTnA+72jTMXoo4kkt74="; }; pnpmDeps = pnpm.fetchDeps { -- knotmirror 0.0.1 From ce6168d85887a97a708abf4175e85ef3b9dfeb63 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Nov 2025 18:10:25 +0100 Subject: [PATCH 17/23] python313Packages.typst: modernize --- pkgs/development/python-modules/typst/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/typst/default.nix b/pkgs/development/python-modules/typst/default.nix index 8f820d103f02..88cf0d02f89f 100644 --- a/pkgs/development/python-modules/typst/default.nix +++ b/pkgs/development/python-modules/typst/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, openssl, pkg-config, - pythonOlder, rustc, rustPlatform, }: @@ -16,8 +15,6 @@ buildPythonPackage rec { version = "0.14.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "messense"; repo = "typst-py"; @@ -52,7 +49,7 @@ buildPythonPackage rec { meta = { description = "Python binding to typst"; homepage = "https://github.com/messense/typst-py"; - changelog = "https://github.com/messense/typst-py/releases/tag/v${version}"; + changelog = "https://github.com/messense/typst-py/releases/tag/v${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -- knotmirror 0.0.1 From d090b2662e9ccebe657442b07330cd679841abaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 3 Nov 2025 08:03:02 -0800 Subject: [PATCH 18/23] python3Packages.python-jsonpath: fix src fetching --- .../development/python-modules/python-jsonpath/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/python-jsonpath/default.nix b/pkgs/development/python-modules/python-jsonpath/default.nix index af58dc59b57a..fbc94587688a 100644 --- a/pkgs/development/python-modules/python-jsonpath/default.nix +++ b/pkgs/development/python-modules/python-jsonpath/default.nix @@ -17,6 +17,13 @@ buildPythonPackage rec { repo = "python-jsonpath"; tag = "v${version}"; fetchSubmodules = true; + preFetch = '' + # can't clone using ssh + # https://github.com/jg-rp/python-jsonpath/pull/122 + export GIT_CONFIG_COUNT=1 + export GIT_CONFIG_KEY_0=url.https://github.com/.insteadOf + export GIT_CONFIG_VALUE_0=git@github.com: + ''; hash = "sha256-DiXBIo/I36rrn+RCQda+khfViCnzHwiGzK2X9ACF3io="; }; -- knotmirror 0.0.1 From c768b4243eacf2a965338fe7f4fbdaf7f83d931d Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 3 Nov 2025 19:28:43 +0100 Subject: [PATCH 19/23] ci/github-script/bot: fix infinite labeling cycle When we recently refactored the code to use the maintainer map for related labels, we made a mistake: When a PR has no packages with maintainers returned from eval, the label would internally be set to `0` instead of `false`. The code would then go on compare the before and after labels with strict equality - and assume a difference, because `0 !== false`. Thus, it seemed like new labels needed to be set, so the PUT request was actually sent. Of course, the labels were actually the same - when filtering the labels to be set, the `0` would also be treated as falsy, so the label would not be set. This would result in no visible change in the PR, but internall GitHub would replace the `updated_at` timestamp for that PR - after all we replaced all labels. Repeatedly updating *all* PRs we're looking at quickly causes problems, because we are going to look at the same PRs *again* in the next cycle - essentially causing infinite recursion. The bot became slower and slower over time, because it had to process more and more PRs each run. Simply casting this to a proper Boolean, should get us out of the mess soon. --- ci/github-script/bot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js index a40b3b227957..fb5e79e54239 100644 --- a/ci/github-script/bot.js +++ b/ci/github-script/bot.js @@ -322,7 +322,7 @@ module.exports = async ({ github, context, core, dry }) => { Object.assign(prLabels, evalLabels, { '11.by: package-maintainer': - packages.length && + Boolean(packages.length) && packages.every((pkg) => maintainers[pkg]?.includes(pull_request.user.id), ), -- knotmirror 0.0.1 From 5fc8325608cb6972236d514066d5978f18f7bbaf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Nov 2025 18:49:32 +0000 Subject: [PATCH 20/23] sigsum: 0.11.2 -> 0.12.0 --- pkgs/by-name/si/sigsum/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/sigsum/package.nix b/pkgs/by-name/si/sigsum/package.nix index 03bf0d55345b..acf609234b0b 100644 --- a/pkgs/by-name/si/sigsum/package.nix +++ b/pkgs/by-name/si/sigsum/package.nix @@ -8,7 +8,7 @@ buildGoModule (finalAttrs: { pname = "sigsum"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitLab { domain = "git.glasklar.is"; @@ -16,7 +16,7 @@ buildGoModule (finalAttrs: { owner = "core"; repo = "sigsum-go"; tag = "v${finalAttrs.version}"; - hash = "sha256-oaYquy0N8yHfKLoNEv8Vte3dpp/UQFZ74mZHin8dDzw="; + hash = "sha256-SFEKbPOAU2cpsc9oLiX3Lhv/AvYNPNiLjjjGteHOtpg="; }; postPatch = '' @@ -24,7 +24,7 @@ buildGoModule (finalAttrs: { --replace-fail "info.Main.Version" '"${finalAttrs.version}"' ''; - vendorHash = "sha256-8Tyhd13PRTO2dGOdhkgYmwsVzWfqwOpZ9XSsAtiCcyM="; + vendorHash = "sha256-2v9NShhmHr0O5FH49tDSPUK1lT2tmhJkrZaVTwrL3cY="; ldflags = [ "-s" -- knotmirror 0.0.1 From ceaf58465f081d0b90dbfa51929be09acb2355af Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 3 Nov 2025 15:59:32 -0300 Subject: [PATCH 21/23] arguments: fix build with cmake4 --- pkgs/by-name/ar/arguments/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ar/arguments/package.nix b/pkgs/by-name/ar/arguments/package.nix index 39ce653de6a5..eb23f0d13cca 100644 --- a/pkgs/by-name/ar/arguments/package.nix +++ b/pkgs/by-name/ar/arguments/package.nix @@ -25,6 +25,11 @@ stdenv.mkDerivation rec { doCheck = false; # internal_volume_io.h: No such file or directory + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { homepage = "https://github.com/${owner}/arguments"; description = "Library for argument handling for MINC programs"; -- knotmirror 0.0.1 From eb57af1c259fb81d7a10014749c99656cebcd919 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Nov 2025 20:13:19 +0100 Subject: [PATCH 22/23] forgejo-runner: mark broken on darwin The tests currently fail to execute on darwin, which may indicate a sandboxing issue. Likely needs someone to care for forgejo ci/cd on darwin. --- pkgs/by-name/fo/forgejo-runner/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index e1e7f11d8e47..3fe8cc8d9787 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -92,6 +92,8 @@ buildGoModule rec { }; meta = with lib; { + # Cannot process container options: '--pid=host --device=/dev/sda': 'unknown server OS: darwin' + broken = stdenv.hostPlatform.isDarwin; description = "Runner for Forgejo based on act"; homepage = "https://code.forgejo.org/forgejo/runner"; changelog = "https://code.forgejo.org/forgejo/runner/releases/tag/${src.rev}"; -- knotmirror 0.0.1 From df09fd8e795a5ddf143dbaedb79074a7af2a3b77 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 3 Nov 2025 17:00:55 -0300 Subject: [PATCH 23/23] _1password-gui-beta: 8.11.14-20.BETA -> 8.11.18-30.BETA --- pkgs/by-name/_1/_1password-gui/sources.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json index f0da36a7578b..c9dab6f3bf8a 100644 --- a/pkgs/by-name/_1/_1password-gui/sources.json +++ b/pkgs/by-name/_1/_1password-gui/sources.json @@ -29,28 +29,28 @@ }, "beta": { "linux": { - "version": "8.11.14-20.BETA", + "version": "8.11.18-30.BETA", "sources": { "x86_64": { - "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.14-20.BETA.x64.tar.gz", - "hash": "sha256-/B06ghBsr7xgEWgXo+jkz5PUJVS51WfzyBZFxwu3XBM=" + "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.18-30.BETA.x64.tar.gz", + "hash": "sha256-rCb54NhczM5Us6DRd1DgA7xGem4Ri4GIcJ0FFCiNAvo=" }, "aarch64": { - "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.14-20.BETA.arm64.tar.gz", - "hash": "sha256-gSdlXULW7q7uRWm5CncA/ya+LA4k4y8g+Lj79h5V2kc=" + "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.18-30.BETA.arm64.tar.gz", + "hash": "sha256-qL6Xa8g2qgyl+UfDThH18rbaXxkt+bN0y2TcQ8C214Y=" } } }, "darwin": { - "version": "8.11.14-20.BETA", + "version": "8.11.18-30.BETA", "sources": { "x86_64": { - "url": "https://downloads.1password.com/mac/1Password-8.11.14-20.BETA-x86_64.zip", - "hash": "sha256-1ZPekYyHLVbIop2Yw3sj1XsWCG5SgoI0MFVK44HJfCs=" + "url": "https://downloads.1password.com/mac/1Password-8.11.18-30.BETA-x86_64.zip", + "hash": "sha256-xkCTyFxZhCKsCTTyWz3SPA9XKhR5p7GT3hwBwXQVb40=" }, "aarch64": { - "url": "https://downloads.1password.com/mac/1Password-8.11.14-20.BETA-aarch64.zip", - "hash": "sha256-Ca3jpcfxaINKSR0JjF7fT+6rfrbK//f22RT7UhEhDaM=" + "url": "https://downloads.1password.com/mac/1Password-8.11.18-30.BETA-aarch64.zip", + "hash": "sha256-Ou3GSMTNmaz+sbYCYqmxH9qrQMDmUBfTUPVcvdNDt6k=" } } } -- knotmirror 0.0.1