From 27576ae8b9ced6bcc9064f397679c64160234dd9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Feb 2026 20:01:20 +0000 Subject: [PATCH 1/4] kmscon: 9.3.0 -> 9.3.1 --- pkgs/by-name/km/kmscon/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/km/kmscon/package.nix b/pkgs/by-name/km/kmscon/package.nix index 61a5d5e7ae97..3cbadb2db51a 100644 --- a/pkgs/by-name/km/kmscon/package.nix +++ b/pkgs/by-name/km/kmscon/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "kmscon"; - version = "9.3.0"; + version = "9.3.1"; src = fetchFromGitHub { owner = "kmscon"; repo = "kmscon"; tag = "v${finalAttrs.version}"; - hash = "sha256-vdM/3n3Y2FM+PLDgVuU10kkNLCSzTrFI35CaY5NxWks="; + hash = "sha256-pH+dBcUKXrVh9/y6mNWmYBx6HVbuSZX/F2sCG/Yj5UQ="; }; strictDeps = true; From 88c1b2aa4c89b95ae452e256ee24c653ec82e929 Mon Sep 17 00:00:00 2001 From: ccicnce113424 Date: Mon, 9 Feb 2026 09:03:21 +0800 Subject: [PATCH 2/4] {kmscon, libtsm}: add meta.changelog --- pkgs/by-name/km/kmscon/package.nix | 1 + pkgs/by-name/li/libtsm/package.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/by-name/km/kmscon/package.nix b/pkgs/by-name/km/kmscon/package.nix index 3cbadb2db51a..9e649221358e 100644 --- a/pkgs/by-name/km/kmscon/package.nix +++ b/pkgs/by-name/km/kmscon/package.nix @@ -73,6 +73,7 @@ stdenv.mkDerivation (finalAttrs: { description = "KMS/DRM based System Console"; mainProgram = "kmscon"; homepage = "https://www.freedesktop.org/wiki/Software/kmscon/"; + changelog = "https://github.com/kmscon/kmscon/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ccicnce113424 ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/li/libtsm/package.nix b/pkgs/by-name/li/libtsm/package.nix index cd7fd796e593..917798f96b0c 100644 --- a/pkgs/by-name/li/libtsm/package.nix +++ b/pkgs/by-name/li/libtsm/package.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Terminal-emulator State Machine"; homepage = "https://www.freedesktop.org/wiki/Software/kmscon/libtsm/"; + changelog = "https://github.com/kmscon/libtsm/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ccicnce113424 ]; platforms = lib.platforms.linux; From e00ac658db56af76ce8b2a62dd441a1ed4e15797 Mon Sep 17 00:00:00 2001 From: ccicnce113424 Date: Mon, 9 Feb 2026 09:11:09 +0800 Subject: [PATCH 3/4] kmscon: fix docs --- pkgs/by-name/km/kmscon/package.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/by-name/km/kmscon/package.nix b/pkgs/by-name/km/kmscon/package.nix index 9e649221358e..5723f7bc1568 100644 --- a/pkgs/by-name/km/kmscon/package.nix +++ b/pkgs/by-name/km/kmscon/package.nix @@ -12,6 +12,7 @@ pango, pkg-config, docbook_xsl, + docbook_xml_dtd_42, libxslt, libgbm, ninja, @@ -60,10 +61,23 @@ stdenv.mkDerivation (finalAttrs: { libxslt # xsltproc ]; + outputs = [ + "out" + "man" + ]; + patches = [ ./sandbox.patch # Generate system units where they should be (nix store) instead of /etc/systemd/system ]; + postPatch = '' + for i in ./docs/man/*.in; do + substituteInPlace "''${i}" \ + --replace-fail "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" \ + "${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd" + done + ''; + passthru = { tests.kmscon = nixosTests.kmscon; updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; }; From 06d12de35ab46bd159adf75d5937520de8f5f559 Mon Sep 17 00:00:00 2001 From: ccicnce113424 Date: Mon, 9 Feb 2026 20:01:32 +0800 Subject: [PATCH 4/4] nixosTests.kmscon: wait for `multi-user.target` and check `$TERM` --- nixos/tests/kmscon.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/tests/kmscon.nix b/nixos/tests/kmscon.nix index 0eb7e941bd84..28f2cdd1c3d3 100644 --- a/nixos/tests/kmscon.nix +++ b/nixos/tests/kmscon.nix @@ -29,8 +29,7 @@ enableOCR = true; testScript = '' - machine.succeed(":") - # ^ this create a screen + machine.wait_for_unit("multi-user.target") with subtest("ensure we can open a tty"): machine.wait_for_text("machine login:") @@ -38,6 +37,8 @@ machine.wait_for_text("Password:") machine.send_chars("foobar\n") machine.wait_for_text("alice@machine") + machine.send_chars("echo $TERM\n") + machine.wait_for_text("xterm-256color") machine.screenshot("tty.png") ''; }