From 45c1777cd95c0064348d2e64a5bebc18c3cd7ac2 Mon Sep 17 00:00:00 2001 From: qzylinra Date: Fri, 22 Aug 2025 15:45:50 +0800 Subject: [PATCH] xflux-gui: drop The upstream project is no longer being maintained. https://github.com/xflux-gui/fluxgui#this-package-is-barely-maintained --- pkgs/tools/misc/xflux/default.nix | 51 ----------------------- pkgs/tools/misc/xflux/gui.nix | 68 ------------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 4 files changed, 1 insertion(+), 120 deletions(-) delete mode 100644 pkgs/tools/misc/xflux/default.nix delete mode 100644 pkgs/tools/misc/xflux/gui.nix diff --git a/pkgs/tools/misc/xflux/default.nix b/pkgs/tools/misc/xflux/default.nix deleted file mode 100644 index 442d7f8d5d7e..000000000000 --- a/pkgs/tools/misc/xflux/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - libXxf86vm, - libXext, - libX11, - libXrandr, - gcc, -}: -stdenv.mkDerivation { - pname = "xflux"; - version = "unstable-2013-09-01"; - src = fetchurl { - url = "https://justgetflux.com/linux/xflux64.tgz"; - sha256 = "cc50158fabaeee58c331f006cc1c08fd2940a126e99d37b76c8e878ef20c2021"; - }; - - libPath = lib.makeLibraryPath [ - gcc.cc - libXxf86vm - libXext - libX11 - libXrandr - ]; - - unpackPhase = '' - unpackFile $src; - ''; - installPhase = '' - mkdir -p "$out/bin" - cp xflux "$out/bin" - ''; - postFixup = '' - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "$libPath" "$out/bin/xflux" - ''; - meta = { - description = "Adjusts your screen to emit warmer light at night"; - longDescription = '' - xflux changes the color temperature of your screen to be much warmer - when the sun sets, and then changes it back its colder temperature - when the sun rises. - ''; - homepage = "https://justgetflux.com/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.paholg ]; - mainProgram = "xflux"; - }; -} diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix deleted file mode 100644 index cdbef0d9ddbf..000000000000 --- a/pkgs/tools/misc/xflux/gui.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - lib, - fetchFromGitHub, - buildPythonApplication, - python, - wrapGAppsHook3, - xflux, - gtk3, - gobject-introspection, - pango, - gdk-pixbuf, - atk, - pexpect, - pygobject3, - pyxdg, - libappindicator-gtk3, -}: -buildPythonApplication rec { - pname = "xflux-gui"; - version = "1.2.0"; - format = "setuptools"; - - src = fetchFromGitHub { - repo = "xflux-gui"; - owner = "xflux-gui"; - rev = "v${version}"; - sha256 = "09zphcd9821ink63636swql4g85hg6lpsazqg1mawlk9ikc8zbps"; - }; - - propagatedBuildInputs = [ - pyxdg - pexpect - pygobject3 - ]; - - buildInputs = [ - xflux - gtk3 - ]; - - nativeBuildInputs = [ - wrapGAppsHook3 - gobject-introspection - pango - gdk-pixbuf - atk - libappindicator-gtk3 - ]; - - postPatch = '' - substituteInPlace src/fluxgui/xfluxcontroller.py \ - --replace "pexpect.spawn(\"xflux\"" "pexpect.spawn(\"${xflux}/bin/xflux\"" - ''; - - postFixup = '' - wrapGAppsHook - wrapPythonPrograms - patchPythonScript $out/${python.sitePackages}/fluxgui/fluxapp.py - ''; - - meta = { - description = "Better lighting for Linux. Open source GUI for xflux"; - homepage = "https://justgetflux.com/linux.html"; - license = lib.licenses.unfree; # marked as unfree since the source code contains a copy of the unfree xflux binary - maintainers = [ lib.maintainers.sheenobu ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 56f14e523835..26a9d22cb2cf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2383,6 +2383,7 @@ mapAliases { xen_4_18 = throw "Due to technical challenges involving building older versions of Xen with newer dependencies, the Xen Project Hypervisor Maintenance Team decided to switch to a latest-only support cycle. As Xen 4.18 would have been the 'n-1' version, it was removed"; # Added 2024-10-05 xen_4_19 = throw "Use 'xen' instead"; # Added 2024-10-05 xenPackages = throw "The attributes in the xenPackages set have been promoted to the top-level. (xenPackages.xen_4_19 -> xen)"; + xflux-gui = throw "'xflux-gui' has been removed as it was unmaintained"; # Added 2025-08-22 xineLib = throw "'xineLib' has been renamed to/replaced by 'xine-lib'"; # Converted to throw 2024-10-17 xineUI = throw "'xineUI' has been renamed to/replaced by 'xine-ui'"; # Converted to throw 2024-10-17 xlsxgrep = throw "'xlsxgrep' has been dropped due to lack of maintenance."; # Added 2024-11-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3072866de458..b28159fb12fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4547,7 +4547,6 @@ with pkgs; xdot = with python3Packages; toPythonApplication xdot; xflux = callPackage ../tools/misc/xflux { }; - xflux-gui = python3Packages.callPackage ../tools/misc/xflux/gui.nix { }; libxfs = xfsprogs.dev;