From 00e47b8ef86ac4815251c4ada42d8cbf8206a5f4 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Thu, 4 Sep 2025 17:29:08 +0200 Subject: [PATCH 01/55] opentelemetry-cpp: add panicgh to maintainers --- pkgs/by-name/op/opentelemetry-cpp/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/op/opentelemetry-cpp/package.nix b/pkgs/by-name/op/opentelemetry-cpp/package.nix index 0210970b3bd1..59337b2d2598 100644 --- a/pkgs/by-name/op/opentelemetry-cpp/package.nix +++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix @@ -96,7 +96,10 @@ stdenv.mkDerivation (finalAttrs: { description = "OpenTelemetry C++ Client Library"; homepage = "https://github.com/open-telemetry/opentelemetry-cpp"; license = [ lib.licenses.asl20 ]; - maintainers = with lib.maintainers; [ jfroche ]; + maintainers = with lib.maintainers; [ + jfroche + panicgh + ]; platforms = lib.platforms.linux; # https://github.com/protocolbuffers/protobuf/issues/14492 broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); From 13568e4c6477caa5faa35b957f90aa92d242a177 Mon Sep 17 00:00:00 2001 From: griffi-gh Date: Fri, 19 Sep 2025 00:21:24 +0200 Subject: [PATCH 02/55] garage-webui: init at 1.1.0 --- pkgs/by-name/ga/garage-webui/package.nix | 74 ++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 pkgs/by-name/ga/garage-webui/package.nix diff --git a/pkgs/by-name/ga/garage-webui/package.nix b/pkgs/by-name/ga/garage-webui/package.nix new file mode 100644 index 000000000000..ab70c5406b93 --- /dev/null +++ b/pkgs/by-name/ga/garage-webui/package.nix @@ -0,0 +1,74 @@ +{ + lib, + stdenv, + fetchFromGitHub, + buildGoModule, + nodejs, + pnpm_9, + nix-update-script, +}: +let + pnpm = pnpm_9; +in +buildGoModule (finalAttrs: { + pname = "garage-webui"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "khairul169"; + repo = "garage-webui"; + tag = finalAttrs.version; + hash = "sha256-bqUAhZBSQkWZ1QsgPslEUDwt8NOg25Os0NGlPoyjPL4="; + }; + + frontend = stdenv.mkDerivation (finalAttrs': { + pname = "${finalAttrs.pname}-frontend"; + inherit (finalAttrs) version src; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + ]; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs') pname version src; + fetcherVersion = 2; + hash = "sha256-8eQhR/fuDFNL8W529Ev7piCaseVaFahgZJQk3AJA3ng="; + }; + + buildPhase = '' + runHook preBuild + pnpm run build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + cp -r dist $out/ + runHook postInstall + ''; + }); + + preBuild = '' + cp -r ${finalAttrs.frontend} ./ui/dist + ''; + + modRoot = "./backend"; + tags = [ "prod" ]; + env.CGO_ENABLED = 0; + vendorHash = "sha256-7z6r6w/SbBlYYHMxm11xFl/QEYZc2KebnOJZRgYRUYk="; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Simple admin web UI for Garage"; + homepage = "https://github.com/khairul169/garage-webui"; + changelog = "https://github.com/khairul169/garage-webui/releases/tag/${finalAttrs.version}"; + mainProgram = "garage-webui"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ griffi-gh ]; + }; +}) From b5012be0584634f0823c764a95a1e5150b1e895e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Thu, 16 Oct 2025 12:57:26 +0200 Subject: [PATCH 03/55] crystal_1_18: init at 1.18.1 --- pkgs/development/compilers/crystal/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 367a08aa87cb..53d51fb3e810 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -325,5 +325,13 @@ rec { doCheck = false; }; - crystal = crystal_1_16; + crystal_1_18 = generic { + version = "1.18.1"; + sha256 = "sha256-6bJnonQyPtWIl1ex1tw3QercDl4ZQcvuVNYiWzMpGZ0="; + binary = binaryCrystal_1_10; + llvmPackages = llvmPackages_21; + doCheck = false; + }; + + crystal = crystal_1_18; } From 757a78e2e08d3e882526c43b1b7a0b717fcb0f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Sat, 18 Oct 2025 18:20:09 +0200 Subject: [PATCH 04/55] Add to `all-packages.nix` --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 659b705ee86a..869093ed4e4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4524,6 +4524,7 @@ with pkgs; crystal_1_15 crystal_1_16 crystal_1_17 + crystal_1_18 crystal ; From a1d3ffe29c39ec6ab876e51b6a89aeae4d2c0bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Tue, 21 Oct 2025 18:40:45 +0200 Subject: [PATCH 05/55] Pin ameba and blahaj to `crystal_1_17` --- pkgs/by-name/am/ameba/package.nix | 6 ++++-- pkgs/by-name/bl/blahaj/package.nix | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/am/ameba/package.nix b/pkgs/by-name/am/ameba/package.nix index c1ce7a669fad..429e0ef8a062 100644 --- a/pkgs/by-name/am/ameba/package.nix +++ b/pkgs/by-name/am/ameba/package.nix @@ -1,10 +1,12 @@ { lib, fetchFromGitHub, - crystal, + crystal_1_17, coreutils, }: - +let + crystal = crystal_1_17; +in crystal.buildCrystalPackage rec { pname = "ameba"; version = "1.6.4"; diff --git a/pkgs/by-name/bl/blahaj/package.nix b/pkgs/by-name/bl/blahaj/package.nix index 258da854cfb8..b834d213e8fe 100644 --- a/pkgs/by-name/bl/blahaj/package.nix +++ b/pkgs/by-name/bl/blahaj/package.nix @@ -1,13 +1,16 @@ { lib, stdenv, - crystal, + crystal_1_17, fetchFromGitHub, # https://crystal-lang.org/2019/09/06/parallelism-in-crystal/ multithreading ? true, static ? stdenv.hostPlatform.isStatic, }: +let + crystal = crystal_1_17; +in crystal.buildCrystalPackage rec { pname = "blahaj"; version = "2.2.0"; From 436f35019305d061112137b53d2f6f6662f15f21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Tue, 21 Oct 2025 21:10:36 +0200 Subject: [PATCH 06/55] Crystal 1.18.2 --- pkgs/development/compilers/crystal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 53d51fb3e810..30c53688cbeb 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -326,8 +326,8 @@ rec { }; crystal_1_18 = generic { - version = "1.18.1"; - sha256 = "sha256-6bJnonQyPtWIl1ex1tw3QercDl4ZQcvuVNYiWzMpGZ0="; + version = "1.18.2"; + sha256 = "sha256-bwKs9bwD1WfS95DSxVY5AjT5Q61jOsfAH897tmiurng="; binary = binaryCrystal_1_10; llvmPackages = llvmPackages_21; doCheck = false; From 614a43bb4ff766172d58072ef165a81ee9f04dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Wed, 22 Oct 2025 11:39:27 +0200 Subject: [PATCH 07/55] Pin invidious to `crystal_1_17` --- pkgs/by-name/in/invidious/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix index db6d48735876..9b4a099fe824 100644 --- a/pkgs/by-name/in/invidious/package.nix +++ b/pkgs/by-name/in/invidious/package.nix @@ -1,7 +1,7 @@ { lib, callPackage, - crystal, + crystal_1_17, fetchFromGitHub, librsvg, pkg-config, @@ -27,6 +27,7 @@ let # normally video.js is downloaded at build time videojs = callPackage ./videojs.nix { inherit versions; }; + crystal = crystal_1_17; in crystal.buildCrystalPackage rec { pname = "invidious"; From 3c916f4b9eccafa8de09c827a27ce4dadc3cdc57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Wed, 22 Oct 2025 13:21:05 +0200 Subject: [PATCH 08/55] Update pkgs/by-name/in/invidious/package.nix Co-authored-by: Kenichi Kamiya --- pkgs/by-name/in/invidious/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix index 9b4a099fe824..71c4b3d2aea9 100644 --- a/pkgs/by-name/in/invidious/package.nix +++ b/pkgs/by-name/in/invidious/package.nix @@ -27,7 +27,7 @@ let # normally video.js is downloaded at build time videojs = callPackage ./videojs.nix { inherit versions; }; - crystal = crystal_1_17; + crystal = crystal_1_16; in crystal.buildCrystalPackage rec { pname = "invidious"; From 78021c7da86d183b3ed85bda08c57e04151bc4c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Wed, 22 Oct 2025 13:30:13 +0200 Subject: [PATCH 09/55] Update pkgs/by-name/in/invidious/package.nix Co-authored-by: Kenichi Kamiya --- pkgs/by-name/in/invidious/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix index 71c4b3d2aea9..d01f5bf3406a 100644 --- a/pkgs/by-name/in/invidious/package.nix +++ b/pkgs/by-name/in/invidious/package.nix @@ -1,7 +1,7 @@ { lib, callPackage, - crystal_1_17, + crystal_1_16, fetchFromGitHub, librsvg, pkg-config, From 61dc356440e01984798de80b32db047c93bfd25d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 24 Oct 2025 10:37:50 +0200 Subject: [PATCH 10/55] glm: Add patch to fix on big-endian, mark broken on non-Linux big-endian --- .../gl/glm/1001-glm-Fix-packing-on-BE.patch | 181 ++++++++++++++++++ pkgs/by-name/gl/glm/package.nix | 9 + 2 files changed, 190 insertions(+) create mode 100644 pkgs/by-name/gl/glm/1001-glm-Fix-packing-on-BE.patch diff --git a/pkgs/by-name/gl/glm/1001-glm-Fix-packing-on-BE.patch b/pkgs/by-name/gl/glm/1001-glm-Fix-packing-on-BE.patch new file mode 100644 index 000000000000..d4dafa87be08 --- /dev/null +++ b/pkgs/by-name/gl/glm/1001-glm-Fix-packing-on-BE.patch @@ -0,0 +1,181 @@ +From 06ce42e72324b32b1f4c37c646e99950c2bd5f6b Mon Sep 17 00:00:00 2001 +From: Max Rees +Date: Sun, 15 Mar 2020 15:13:27 -0400 +Subject: [PATCH] Fix test suite on big endian platforms + +--- + glm/gtc/packing.inl | 55 ++++++++++++++++++++++++++++++++++++++++ + test/gtc/gtc_packing.cpp | 3 ++- + 2 files changed, 57 insertions(+), 1 deletion(-) + +diff --git a/glm/gtc/packing.inl b/glm/gtc/packing.inl +index 8c906e16c1..b1c99a5076 100644 +--- a/glm/gtc/packing.inl ++++ b/glm/gtc/packing.inl +@@ -9,6 +9,9 @@ + #include "../detail/type_half.hpp" + #include + #include ++extern "C" { ++#include ++} + + namespace glm{ + namespace detail +@@ -183,9 +186,15 @@ namespace detail + { + struct + { ++#if BYTE_ORDER == LITTLE_ENDIAN + uint x : 3; + uint y : 3; + uint z : 2; ++#else ++ uint z : 2; ++ uint y : 3; ++ uint x : 3; ++#endif + } data; + uint8 pack; + }; +@@ -194,8 +203,13 @@ namespace detail + { + struct + { ++#if BYTE_ORDER == LITTLE_ENDIAN + uint x : 4; + uint y : 4; ++#else ++ uint y : 4; ++ uint x : 4; ++#endif + } data; + uint8 pack; + }; +@@ -204,10 +218,17 @@ namespace detail + { + struct + { ++#if BYTE_ORDER == LITTLE_ENDIAN + uint x : 4; + uint y : 4; + uint z : 4; + uint w : 4; ++#else ++ uint w : 4; ++ uint z : 4; ++ uint y : 4; ++ uint x : 4; ++#endif + } data; + uint16 pack; + }; +@@ -216,9 +237,15 @@ namespace detail + { + struct + { ++#if BYTE_ORDER == LITTLE_ENDIAN + uint x : 5; + uint y : 6; + uint z : 5; ++#else ++ uint z : 5; ++ uint y : 6; ++ uint x : 5; ++#endif + } data; + uint16 pack; + }; +@@ -227,10 +254,17 @@ namespace detail + { + struct + { ++#if BYTE_ORDER == LITTLE_ENDIAN + uint x : 5; + uint y : 5; + uint z : 5; + uint w : 1; ++#else ++ uint w : 1; ++ uint z : 5; ++ uint y : 5; ++ uint x : 5; ++#endif + } data; + uint16 pack; + }; +@@ -239,10 +273,17 @@ namespace detail + { + struct + { ++#if BYTE_ORDER == LITTLE_ENDIAN + uint x : 10; + uint y : 10; + uint z : 10; + uint w : 2; ++#else ++ uint w : 2; ++ uint z : 10; ++ uint y : 10; ++ uint x : 10; ++#endif + } data; + uint32 pack; + }; +@@ -251,10 +292,17 @@ namespace detail + { + struct + { ++#if BYTE_ORDER == LITTLE_ENDIAN + int x : 10; + int y : 10; + int z : 10; + int w : 2; ++#else ++ int w : 2; ++ int z : 10; ++ int y : 10; ++ int x : 10; ++#endif + } data; + uint32 pack; + }; +@@ -263,10 +311,17 @@ namespace detail + { + struct + { ++#if BYTE_ORDER == LITTLE_ENDIAN + uint x : 9; + uint y : 9; + uint z : 9; + uint w : 5; ++#else ++ uint w : 5; ++ uint z : 9; ++ uint y : 9; ++ uint x : 9; ++#endif + } data; + uint32 pack; + }; +diff --git a/test/gtc/gtc_packing.cpp b/test/gtc/gtc_packing.cpp +index df5b3bb1a9..fbaaa5bccd 100644 +--- a/test/gtc/gtc_packing.cpp ++++ b/test/gtc/gtc_packing.cpp +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + + void print_bits(float const& s) + { +@@ -156,7 +157,7 @@ int test_U3x10_1x2() + + glm::u8vec4 const v0(0xff, 0x77, 0x0, 0x33); + glm::uint32 const p0 = *reinterpret_cast(&v0[0]); +- glm::uint32 const r0 = 0x330077ff; ++ glm::uint32 const r0 = htonl(0xff770033); + + Error += p0 == r0 ? 0 : 1; + diff --git a/pkgs/by-name/gl/glm/package.nix b/pkgs/by-name/gl/glm/package.nix index d9daa49d4f4c..f5dd16d62101 100644 --- a/pkgs/by-name/gl/glm/package.nix +++ b/pkgs/by-name/gl/glm/package.nix @@ -21,6 +21,12 @@ stdenv.mkDerivation rec { "doc" ]; + patches = lib.optionals stdenv.hostPlatform.isLinux [ + # Remove when https://github.com/g-truc/glm/pull/1001 merged & in release. + # Relies on , Linux-specific + ./1001-glm-Fix-packing-on-BE.patch + ]; + nativeBuildInputs = [ cmake ]; env.NIX_CFLAGS_COMPILE = @@ -62,6 +68,9 @@ stdenv.mkDerivation rec { homepage = "https://github.com/g-truc/glm"; license = licenses.mit; platforms = platforms.unix; + # https://github.com/g-truc/glm/issues/897 indicates that packing isn't implemented properly on non-LE. + # Patch from https://github.com/g-truc/glm/pull/1001 currently relies on Linux-only header. + broken = !stdenv.hostPlatform.isLittleEndian && !stdenv.hostPlatform.isLinux; maintainers = with maintainers; [ smancill ]; }; } From becc6875057f374b92df86f5c1372f7a9e69f6ee Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Fri, 24 Oct 2025 17:15:51 +0800 Subject: [PATCH 11/55] jami: fix build with Qt 6.10 --- pkgs/by-name/ja/jami/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ja/jami/package.nix b/pkgs/by-name/ja/jami/package.nix index d3505139e1ac..2debaf3a2ac5 100644 --- a/pkgs/by-name/ja/jami/package.nix +++ b/pkgs/by-name/ja/jami/package.nix @@ -229,8 +229,8 @@ stdenv.mkDerivation rec { qwindowkit-src = fetchFromGitHub { owner = "stdware"; repo = "qwindowkit"; - rev = "758b00cb6c2d924be3a1ea137ec366dc33a5132d"; - hash = "sha256-qpVsF4gUX2noG9nKgjNP7FCEe59okZtDA8R/aZOef7Q="; + rev = "0131d673092ab18afd69fac84f4a17ad2ba615f2"; + hash = "sha256-jajgLOj0h/byt3+fSbCpV3VPUoHxijUsKw/0BOwbXTw="; fetchSubmodules = true; }; @@ -239,6 +239,7 @@ stdenv.mkDerivation rec { cp -R --no-preserve=mode,ownership ${qwindowkit-src} qwindowkit substituteInPlace CMakeLists.txt \ --replace-fail 'add_subdirectory(3rdparty/zxing-cpp EXCLUDE_FROM_ALL)' 'find_package(ZXing)' + sed -i -e '/pkg_check_modules/i FIND_PACKAGE(PkgConfig REQUIRED)' src/libclient/CMakeLists.txt ''; preConfigure = '' From 7b74d9b4996955c6ed4c97a9c1e6e850a05c4811 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Oct 2025 16:20:22 +0000 Subject: [PATCH 12/55] inkcut: 2.1.6 -> 2.1.7 --- pkgs/by-name/in/inkcut/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/in/inkcut/package.nix b/pkgs/by-name/in/inkcut/package.nix index 4510cbe1ee42..e4613461d4fa 100644 --- a/pkgs/by-name/in/inkcut/package.nix +++ b/pkgs/by-name/in/inkcut/package.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "inkcut"; - version = "2.1.6"; + version = "2.1.7"; format = "pyproject"; src = fetchFromGitHub { owner = "inkcut"; repo = "inkcut"; tag = "v${version}"; - hash = "sha256-qfgzJTFr4VTV/x4PVnUKJzIndfjXB8z2jTWLXvadBuY="; + hash = "sha256-inB3yR4ykepN5rYzyPlXW/J/HuSxGs6EDhshpa7n7o8="; }; postPatch = '' From 7f07c8b68cc2f3eb792d58e98cdf6020cfaa6be5 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sun, 26 Oct 2025 20:25:36 +0800 Subject: [PATCH 13/55] python313Packages.submitit: fix build --- pkgs/development/python-modules/submitit/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/submitit/default.nix b/pkgs/development/python-modules/submitit/default.nix index baa8e0c68ee3..7ace9bfdd730 100644 --- a/pkgs/development/python-modules/submitit/default.nix +++ b/pkgs/development/python-modules/submitit/default.nix @@ -7,7 +7,7 @@ flit-core, typing-extensions, pytestCheckHook, - pytest-asyncio, + pytest-asyncio_0, }: buildPythonPackage rec { @@ -34,7 +34,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-asyncio + # event_loop was removed in pytest-asyncio 1.x + pytest-asyncio_0 ]; pythonImportsCheck = [ From cb83650fd1874a370f1170b584553f2fb4212e9e Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sun, 26 Oct 2025 12:28:45 +0000 Subject: [PATCH 14/55] python313Packages.submitit: 1.5.2 -> 1.5.3 --- pkgs/development/python-modules/submitit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/submitit/default.nix b/pkgs/development/python-modules/submitit/default.nix index 7ace9bfdd730..a131e66fd255 100644 --- a/pkgs/development/python-modules/submitit/default.nix +++ b/pkgs/development/python-modules/submitit/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "submitit"; - version = "1.5.2"; + version = "1.5.3"; pyproject = true; src = fetchFromGitHub { owner = "facebookincubator"; repo = "submitit"; tag = version; - hash = "sha256-PDQLzqQjoBAZM9FKsoRby26Pbh4nik3SltIHUw/xWcY="; + hash = "sha256-uBlKbg1oKeUPcWzM9WxisGtpBu69eZyTetaANYpTG5E="; }; build-system = [ From d81caeb6f4851abdff8f50cf065971ce41d5121a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 27 Oct 2025 15:48:03 +0100 Subject: [PATCH 15/55] headscale: 0.26.1 -> 0.27.0 Changelog: https://github.com/juanfont/headscale/releases/tag/v0.27.0 --- pkgs/by-name/he/headscale/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/he/headscale/package.nix b/pkgs/by-name/he/headscale/package.nix index a4da9dbc82ac..30ed1bda6506 100644 --- a/pkgs/by-name/he/headscale/package.nix +++ b/pkgs/by-name/he/headscale/package.nix @@ -11,16 +11,16 @@ }: buildGoModule rec { pname = "headscale"; - version = "0.26.1"; + version = "0.27.0"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; tag = "v${version}"; - hash = "sha256-LnS6K3U4RgRRV4i92zcRZtLJF1QdbORQP9ZIis9u6rk="; + hash = "sha256-bWY12OW2gc5m6xdEJYh6xBixUMKYRuSBH4lCkcToL04="; }; - vendorHash = "sha256-dR8xmUIDMIy08lhm7r95GNNMAbXv4qSH3v9HR40HlNk="; + vendorHash = "sha256-GUIzlPRsyEq1uSTzRNds9p1uVu4pTeH5PAxrJ5Njhis="; subPackages = [ "cmd/headscale" ]; From 5a4a7625a580d8821f0240f76cd577c653444465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 10:10:51 -0700 Subject: [PATCH 16/55] python3Packages.home-assistant-chip-wheels: don't depend on pylint --- .../python-modules/home-assistant-chip-wheels/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix index a856179eee7a..58168c0a329c 100644 --- a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix @@ -45,7 +45,6 @@ pyfakefs, pygments, pykwalify, - pylint, pyperclip, pyserial, python, @@ -245,7 +244,6 @@ stdenv.mkDerivation rec { pyelftools pygments pykwalify - pylint pyperclip pyserial python-daemon From 1079c21566b1451ce99ab22e07e15569b1cb0c35 Mon Sep 17 00:00:00 2001 From: redianthus Date: Tue, 28 Oct 2025 11:28:22 +0100 Subject: [PATCH 17/55] ocamlPackages.smtml: 0.12.0 -> 0.13.0 --- pkgs/development/ocaml-modules/smtml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/smtml/default.nix b/pkgs/development/ocaml-modules/smtml/default.nix index d8426a8fc52b..533eee64483a 100644 --- a/pkgs/development/ocaml-modules/smtml/default.nix +++ b/pkgs/development/ocaml-modules/smtml/default.nix @@ -27,13 +27,13 @@ buildDunePackage (finalAttrs: { pname = "smtml"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "formalsec"; repo = "smtml"; tag = "v${finalAttrs.version}"; - hash = "sha256-WETSvhy5OfztOTqJimym0OaZLo053nl8pcoQlyyP8I0="; + hash = "sha256-8AAS7C/X9YnkgZORRauKqPgXPyFXOhPvd7/VS693e8Q="; }; nativeBuildInputs = [ From 5c30dd39c434bdd2eda69464493c33c289b9565e Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 26 Oct 2025 20:08:02 +0000 Subject: [PATCH 18/55] nixosTests.bittorrent: use `hostPkgs` --- nixos/tests/bittorrent.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index 812238b222b4..cf7b977223d4 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -6,12 +6,12 @@ # which only works if the first client successfully uses the UPnP-IGD # protocol to poke a hole in the NAT. -{ pkgs, ... }: +{ lib, hostPkgs, ... }: let # Some random file to serve. - file = pkgs.hello.src; + file = hostPkgs.hello.src; internalRouterAddress = "192.168.3.1"; internalClient1Address = "192.168.3.2"; @@ -37,7 +37,7 @@ in { name = "bittorrent"; - meta = with pkgs.lib.maintainers; { + meta = with lib.maintainers; { maintainers = [ rob bobvanderlinden From 548659bd060582b4c8365477ae124468329e3643 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 26 Oct 2025 20:08:02 +0000 Subject: [PATCH 19/55] nixosTests.bittorrent: drop redundant `environment.systemPackages` The Transmission module adds the package automatically. --- nixos/tests/bittorrent.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index cf7b977223d4..11758605a4eb 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -23,7 +23,6 @@ let transmissionConfig = { pkgs, ... }: { - environment.systemPackages = [ pkgs.transmission_3 ]; services.transmission = { enable = true; settings = { From f8b2fc54c895eb878816e7cb27bdbf3512fd3a87 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 26 Oct 2025 20:08:02 +0000 Subject: [PATCH 20/55] fetchtorrent: use Transmission 4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I don’t know why setting `--config-dir` breaks the finish script with Transmission 4, but I don’t really feel like spending more time investigating than I already did. It does still respect the passed settings, since we were passing the default location anyway. --- pkgs/build-support/fetchtorrent/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/fetchtorrent/default.nix b/pkgs/build-support/fetchtorrent/default.nix index 5848c3e25f00..d3828602594e 100644 --- a/pkgs/build-support/fetchtorrent/default.nix +++ b/pkgs/build-support/fetchtorrent/default.nix @@ -1,7 +1,7 @@ { lib, runCommand, - transmission_3_noSystemd, + transmission_4, rqbit, writeShellScript, formats, @@ -97,7 +97,7 @@ runCommand name ] ++ ( if (backend == "transmission") then - [ transmission_3_noSystemd ] + [ transmission_4 ] else if (backend == "rqbit") then [ rqbit ] else @@ -132,7 +132,6 @@ runCommand name --portmap \ --finish ${transmissionFinishScript} \ --download-dir "$downloadedDirectory" \ - --config-dir "$HOME"/.config/transmission \ "$url" '' else From 24fa70ea8942c55c78dffd8484eca0d76ced2f92 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 26 Oct 2025 20:08:02 +0000 Subject: [PATCH 21/55] =?UTF-8?q?release:=20don=E2=80=99t=20block=20Darwin?= =?UTF-8?q?=20on=20Transmission=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We probably shouldn’t block Darwin on the GTK version of Transmission 4 either, but hey… --- pkgs/top-level/release.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index c7d5252f4966..8c40fb1c0070 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -154,7 +154,6 @@ let jobs.gimp2.x86_64-darwin # FIXME replace with gimp once https://github.com/NixOS/nixpkgs/issues/411189 is resoved jobs.emacs.x86_64-darwin jobs.wireshark.x86_64-darwin - jobs.transmission_3-gtk.x86_64-darwin jobs.transmission_4-gtk.x86_64-darwin # Tests @@ -198,7 +197,6 @@ let jobs.gimp2.aarch64-darwin # FIXME replace with gimp once https://github.com/NixOS/nixpkgs/issues/411189 is resoved jobs.emacs.aarch64-darwin jobs.wireshark.aarch64-darwin - jobs.transmission_3-gtk.aarch64-darwin jobs.transmission_4-gtk.aarch64-darwin # Tests From 8b66d344c918c7610204651ce285908509112a83 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 27 Oct 2025 18:04:46 +0000 Subject: [PATCH 22/55] nixos/apparmor: use `valueMeta` to check submodule option definedness --- nixos/modules/security/apparmor.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index 5875d13bf786..d7e9ab7ab162 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -1,4 +1,5 @@ { + options, config, lib, pkgs, @@ -10,11 +11,6 @@ let cfg = config.security.apparmor; enabledPolicies = lib.filterAttrs (n: p: p.state != "disable") cfg.policies; buildPolicyPath = n: p: lib.defaultTo (pkgs.writeText n p.profile) p.path; - - # Accessing submodule options when not defined results in an error thunk rather than a regular option object - # We can emulate the behavior of `