From c4cce6cb83edcd9966f47fa667f2d0e7c5c5cf25 Mon Sep 17 00:00:00 2001 From: ccicnce113424 Date: Sat, 24 Jan 2026 04:38:59 +0800 Subject: [PATCH 1/2] libtsm: 4.0.2-unstable-2023-12-24 -> 4.4.1 --- pkgs/by-name/li/libtsm/package.nix | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/li/libtsm/package.nix b/pkgs/by-name/li/libtsm/package.nix index 9e7877e18f15..6c1770232036 100644 --- a/pkgs/by-name/li/libtsm/package.nix +++ b/pkgs/by-name/li/libtsm/package.nix @@ -4,32 +4,39 @@ fetchFromGitHub, libxkbcommon, pkg-config, - cmake, + meson, + ninja, + check, + nix-update-script, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "libtsm"; - version = "4.0.2-unstable-2023-12-24"; + version = "4.4.1"; src = fetchFromGitHub { - owner = "Aetf"; + owner = "kmscon"; repo = "libtsm"; - rev = "69922bde02c7af83b4d48a414cc6036af7388626"; - sha256 = "sha256-Rug3OWSbbiIivItULPNNptClIZ/PrXdQeUypAAxrUY8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-8db/amwcV1a5Ho0dymQxKtOFsTN6nLUnwSobuAowSwk="; }; buildInputs = [ libxkbcommon ]; nativeBuildInputs = [ - cmake + meson + ninja pkg-config + check ]; + passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; }; + meta = { description = "Terminal-emulator State Machine"; homepage = "https://www.freedesktop.org/wiki/Software/kmscon/libtsm/"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ ccicnce113424 ]; platforms = lib.platforms.linux; }; -} +}) From c1233277887dc6393167c3daecc0b70492d60a33 Mon Sep 17 00:00:00 2001 From: ccicnce113424 Date: Sat, 24 Jan 2026 04:39:17 +0800 Subject: [PATCH 2/2] kmscon: 9.0.0-unstable-2025-01-09 -> 9.3.0 --- pkgs/by-name/km/kmscon/package.nix | 28 +++++++++++++--------------- pkgs/by-name/km/kmscon/sandbox.patch | 16 ++-------------- 2 files changed, 15 insertions(+), 29 deletions(-) diff --git a/pkgs/by-name/km/kmscon/package.nix b/pkgs/by-name/km/kmscon/package.nix index 27c9a1f17ebb..d5cf8dd13ee0 100644 --- a/pkgs/by-name/km/kmscon/package.nix +++ b/pkgs/by-name/km/kmscon/package.nix @@ -10,24 +10,25 @@ libGLU, libGL, pango, - pixman, pkg-config, docbook_xsl, libxslt, libgbm, ninja, check, + bash, buildPackages, + nix-update-script, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "kmscon"; - version = "9.0.0-unstable-2025-01-09"; + version = "9.3.0"; src = fetchFromGitHub { - owner = "Aetf"; + owner = "kmscon"; repo = "kmscon"; - rev = "a81941f4464e6f9cee75bfb8a1db88c253ede33d"; - sha256 = "sha256-l7Prt7CsYi4VCnp9xktvqqNT+4djSdO2GvP1JdxhNSI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-vdM/3n3Y2FM+PLDgVuU10kkNLCSzTrFI35CaY5NxWks="; }; strictDeps = true; @@ -43,10 +44,11 @@ stdenv.mkDerivation { libtsm libxkbcommon pango - pixman systemdLibs libgbm check + # Needed for autoPatchShebangs when strictDeps = true + bash ]; nativeBuildInputs = [ @@ -57,22 +59,18 @@ stdenv.mkDerivation { libxslt # xsltproc ]; - env.NIX_CFLAGS_COMPILE = - lib.optionalString stdenv.cc.isGNU "-O " - + "-Wno-error=maybe-uninitialized -Wno-error=unused-result -Wno-error=implicit-function-declaration"; - - enableParallelBuilding = true; - patches = [ ./sandbox.patch # Generate system units where they should be (nix store) instead of /etc/systemd/system ]; + passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; }; + meta = { description = "KMS/DRM based System Console"; mainProgram = "kmscon"; homepage = "https://www.freedesktop.org/wiki/Software/kmscon/"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ ccicnce113424 ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/km/kmscon/sandbox.patch b/pkgs/by-name/km/kmscon/sandbox.patch index e70d0da80a19..0a9292328aa3 100644 --- a/pkgs/by-name/km/kmscon/sandbox.patch +++ b/pkgs/by-name/km/kmscon/sandbox.patch @@ -1,25 +1,13 @@ -From d51e35a7ab936983b2a544992adae66093c6028f Mon Sep 17 00:00:00 2001 -From: hustlerone -Date: Thu, 20 Feb 2025 11:05:56 +0100 -Subject: [PATCH] Patch for nixpkgs - ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/meson.build b/meson.build -index 964b44b..4415084 100644 +index de29a32..e731bbd 100644 --- a/meson.build +++ b/meson.build @@ -39,7 +39,7 @@ mandir = get_option('mandir') moduledir = get_option('libdir') / meson.project_name() systemd_deps = dependency('systemd', required: false) --systemdsystemunitdir = systemd_deps.get_variable('systemdsystemunitdir', default_value: get_option('libdir') / 'systemd/system') +-systemdsystemunitdir = systemd_deps.get_variable('systemdsystemunitdir', default_value: 'lib/systemd/system') +systemdsystemunitdir = get_option('libdir') / 'systemd' # # Required dependencies --- -2.47.2 -