From aa9bc0cb9dbd69a5bc79614ac3d964be1afdf5bb Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Tue, 24 Feb 2026 12:18:24 -0800 Subject: [PATCH] light: drop Unmaintained upstream; see https://github.com/NixOS/nixpkgs/issues/354405 --- doc/release-notes/rl-2605.section.md | 3 ++ ...0001-define-light-loglevel-as-extern.patch | 38 -------------- pkgs/by-name/li/light/package.nix | 51 ------------------- pkgs/top-level/aliases.nix | 1 + 4 files changed, 4 insertions(+), 89 deletions(-) delete mode 100644 pkgs/by-name/li/light/0001-define-light-loglevel-as-extern.patch delete mode 100644 pkgs/by-name/li/light/package.nix diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index d84a0645a234..141c5876136d 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -161,6 +161,9 @@ - `python3packages.pillow-avif-plugin` has been removed as the functionality is included in `python3packages.pillow` directly since version 11.3. +- `light` has been removed because it was unmaintained. + `brightnessctl` and `acpilight` provide similar functionality. + - `services.openssh.settings.AcceptEnv` now explicitly defined as an option that takes a list of strings, to facilitate option merging. Setting it to a string value is no longer supported. - `nodejs-slim` has a `npm` and a `corepack` outputs, and `nodejs` no longer has a `libv8` output. diff --git a/pkgs/by-name/li/light/0001-define-light-loglevel-as-extern.patch b/pkgs/by-name/li/light/0001-define-light-loglevel-as-extern.patch deleted file mode 100644 index 082f8f3f10e1..000000000000 --- a/pkgs/by-name/li/light/0001-define-light-loglevel-as-extern.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 47f163f6bcd1d66bebc49d96abcf46853a0708fb Mon Sep 17 00:00:00 2001 -From: wxt <3264117476@qq.com> -Date: Tue, 22 Oct 2024 07:48:34 +0800 -Subject: [PATCH] fix build - ---- - src/helpers.c | 1 + - src/helpers.h | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/helpers.c b/src/helpers.c -index c7bc4de..00e6098 100644 ---- a/src/helpers.c -+++ b/src/helpers.c -@@ -9,6 +9,7 @@ - #include // errno - #include // dirname - -+light_loglevel_t light_loglevel; - - bool light_file_read_uint64(char const *filename, uint64_t *val) - { -diff --git a/src/helpers.h b/src/helpers.h -index f73714b..4a92753 100644 ---- a/src/helpers.h -+++ b/src/helpers.h -@@ -21,7 +21,7 @@ typedef enum { - LIGHT_NOTE_LEVEL - } light_loglevel_t; - --light_loglevel_t light_loglevel; -+extern light_loglevel_t light_loglevel; - - #define LIGHT_LOG(lvl, fp, fmt, args...)\ - if(light_loglevel >= lvl)\ --- -2.46.1 - diff --git a/pkgs/by-name/li/light/package.nix b/pkgs/by-name/li/light/package.nix deleted file mode 100644 index 25d82ddb9425..000000000000 --- a/pkgs/by-name/li/light/package.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - autoreconfHook, - coreutils, - udevCheckHook, -}: - -stdenv.mkDerivation { - version = "1.2.2"; - pname = "light"; - - src = fetchFromGitLab { - owner = "dpeukert"; - repo = "light"; - rev = "2a54078cbe3814105ee4f565f451b1b5947fbde0"; - hash = "sha256-OmHdVJvBcBjJiPs45JqOHxFoJYvKIEIpt9pFhBz74Kg="; - }; - - configureFlags = [ "--with-udev" ]; - - nativeBuildInputs = [ - autoreconfHook - udevCheckHook - ]; - - patches = [ - ./0001-define-light-loglevel-as-extern.patch - ]; - - # ensure udev rules can find the commands used - postPatch = '' - substituteInPlace 90-backlight.rules \ - --replace-fail '/bin/chgrp' '${coreutils}/bin/chgrp' \ - --replace-fail '/bin/chmod' '${coreutils}/bin/chmod' - ''; - - doInstallCheck = true; - - meta = { - description = "GNU/Linux application to control backlights"; - homepage = "https://gitlab.com/dpeukert/light"; - license = lib.licenses.gpl3Only; - mainProgram = "light"; - maintainers = with lib.maintainers; [ - puffnfresh - ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3e1c4acc1f0c..fa06325ec012 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1106,6 +1106,7 @@ mapAliases { libXxf86dga = libxxf86dga; # Added 2026-02-06 libXxf86misc = libxxf86misc; # Added 2026-02-06 libXxf86vm = libxxf86vm; # Added 2026-02-06 + light = throw "'light' has been removed because it was unmaintained. 'brightnessctl' and 'acpilight' provide similar functionality."; # Added 2026-02-24 lightdm_gtk_greeter = throw "'lightdm_gtk_greeter' has been renamed to/replaced by 'lightdm-gtk-greeter'"; # Converted to throw 2025-10-27 lightly-boehs = throw "'lightly-boehs' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 lightly-qt = throw "'lightly-qt' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20