From 64388c13f9ba419c28bb5e0683a3f2442bfb446a Mon Sep 17 00:00:00 2001 From: stevelr Date: Tue, 13 Oct 2026 19:32:00 +0000 Subject: [PATCH 1/5] maintainers: add stevelr --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8e7cdae759fd..6ca013f338d7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -28197,6 +28197,16 @@ githubId = 1181362; name = "Stefan Junker"; }; + stevelr = { + email = "stevelr.git@pm.me"; + github = "stevelr"; + githubId = 15311467; + name = "Steve Schoettler"; + keys = [ + { fingerprint = "57C9 E8E1 274D 713E FEF3 1B89 407A A4E4 3349 35ED"; } + { fingerprint = "8379 6FAD CB03 18D6 513B 4CBB D39C B4E4 FD6B C844"; } + ]; + }; stevenroose = { email = "github@stevenroose.org"; github = "stevenroose"; From 409fd4d377a0c5a8c466b449f97ba1999201a22f Mon Sep 17 00:00:00 2001 From: stevelr Date: Tue, 13 Oct 2026 21:02:24 +0000 Subject: [PATCH 2/5] extra-container: add stevelr to maintainers, remove erikarvstedt Background: - previous maintainer's last commit (2025-12-19) b450bdb24fca1076973c852d87bcb49b8eb5fd49 https://github.com/erikarvstedt/extra-container/commits/master/ - erikarvstedt/extra-container has been broken since nixos-unstable April 2026 and is incompatible with nixos-26.05. - PR (2026-04-28) by stevelr fixes breakage in nixos-26.05 and nixos-unstable since. No response from original maintainer in ~6 mos. https://github.com/erikarvstedt/extra-container/pull/41 - Issue (2026-09-19) stevelr offered to be co-maintainer or take over maintenance. No response from original maintainer. https://github.com/erikarvstedt/extra-container/issues/43 Signed-off-by: stevelr --- pkgs/by-name/ex/extra-container/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ex/extra-container/package.nix b/pkgs/by-name/ex/extra-container/package.nix index 804fc0c3bf16..f9d44f813e7d 100644 --- a/pkgs/by-name/ex/extra-container/package.nix +++ b/pkgs/by-name/ex/extra-container/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/erikarvstedt/extra-container/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.erikarvstedt ]; + maintainers = [ lib.maintainers.stevelr ]; mainProgram = "extra-container"; }; }) From 0573f5b6c859a32deb3cf6e3bbcafab811544a26 Mon Sep 17 00:00:00 2001 From: stevelr Date: Tue, 13 Oct 2026 21:21:05 +0000 Subject: [PATCH 3/5] extra-container: 0.14 -> 0.17, new repo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - moved to new org/repo: extra-container/extra-container - update: 0.14 → 0.17 - Compatible with nixos-26.05; and nixos-unstable (as of 2026-10-10) - assertions and warnings checked when building containers (previously silently ignored) - Dropped i686-linux from supportedSystems - backport to 26.05 Signed-off-by: stevelr --- pkgs/by-name/ex/extra-container/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ex/extra-container/package.nix b/pkgs/by-name/ex/extra-container/package.nix index f9d44f813e7d..528149ff527c 100644 --- a/pkgs/by-name/ex/extra-container/package.nix +++ b/pkgs/by-name/ex/extra-container/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "extra-container"; - version = "0.14"; + version = "0.17"; src = fetchFromGitHub { - owner = "erikarvstedt"; + owner = "extra-container"; repo = "extra-container"; - rev = finalAttrs.version; - hash = "sha256-XGp4HHH6D6ZKiO5RnMzqYJYnZB538EnEflvlTsOKpvo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-fLE3qALPTc9audJ/r1IXMd8eva4mpTYyKW50iJJcDxA="; }; buildCommand = '' @@ -37,8 +37,8 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Run declarative containers without full system rebuilds"; - homepage = "https://github.com/erikarvstedt/extra-container"; - changelog = "https://github.com/erikarvstedt/extra-container/blob/${finalAttrs.version}/CHANGELOG.md"; + homepage = "https://github.com/extra-container/extra-container"; + changelog = "https://github.com/extra-container/extra-container/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.stevelr ]; From 8378b5af6db0977059579a46978a46de402cecc8 Mon Sep 17 00:00:00 2001 From: stevelr Date: Tue, 13 Oct 2026 21:25:38 +0000 Subject: [PATCH 4/5] nixos/programs/extra-container: add package option Signed-off-by: stevelr --- nixos/modules/programs/extra-container.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/extra-container.nix b/nixos/modules/programs/extra-container.nix index 30b0785ad47f..1cb0c9b9bbd8 100644 --- a/nixos/modules/programs/extra-container.nix +++ b/nixos/modules/programs/extra-container.nix @@ -14,9 +14,10 @@ in extra-container, a tool for running declarative NixOS containers without host system rebuilds ''; + programs.extra-container.package = lib.mkPackageOption pkgs "extra-container" { }; }; config = lib.mkIf cfg.enable { - environment.systemPackages = [ pkgs.extra-container ]; + environment.systemPackages = [ cfg.package ]; boot.extraSystemdUnitPaths = [ "/etc/systemd-mutable/system" ]; }; } From 4f3b455404121e1b6875622fa18c491f20546bc3 Mon Sep 17 00:00:00 2001 From: stevelr Date: Tue, 13 Oct 2026 21:41:42 +0000 Subject: [PATCH 5/5] doc/release-notes: extra-container 0.17 Signed-off-by: stevelr --- doc/release-notes/rl-2611.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 4a5aea4bedc0..84645ffc8b38 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -283,6 +283,8 @@ - `swiftpm` is no longer wrapped to include Git to fetch dependencies. Users with Git-based dependencies will need to add `git` to their dev shells or include it in their environment if they weren’t already. +- `extra-container` v0.17 now enforces assertions and warnings, and is hosted at [new org/repo extra-container/extra-container](https://github.com/extra-container/extra-container). Full changes: [CHANGELOG](https://github.com/extra-container/extra-container/blob/main/CHANGELOG.md) + - `buildPythonPackage` and `buildPythonApplication` now uses `meta.problems.unsupportedPython` to mark Python packages with unsupported Python interpreters. - The `disabled` argument automatically converts to `meta.problems.unsupportedPython` with the default message. - Overriding the `passthru.disabled` attribute no longer affects such marks.