From ee25f3700313deb3c508c0f9d0f78e54c867e2f4 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 23 Nov 2024 14:40:23 +0100 Subject: [PATCH] gkraken,nixos/gkraken: Drop It was switched to maintenance mode on 2020-12-09[1], and marked deprecated in favour of Coolero/CoolerControl on 2022-02-23[2]. We have CoolerControl packaged since 24.05[3], so we can now drop gkraken. [1]: https://gitlab.com/leinardi/gkraken/-/releases/0.14.5 [2]: https://gitlab.com/leinardi/gkraken/-/releases/1.2.0 [3]: https://github.com/NixOS/nixpkgs/commit/c981cb00dd1a78970addf91aa8c381a8c45fddb4 --- .../manual/release-notes/rl-2505.section.md | 2 + nixos/modules/hardware/gkraken.nix | 15 ---- nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 4 + pkgs/by-name/gk/gkraken/package.nix | 87 ------------------- pkgs/top-level/aliases.nix | 1 + 6 files changed, 7 insertions(+), 103 deletions(-) delete mode 100644 nixos/modules/hardware/gkraken.nix delete mode 100644 pkgs/by-name/gk/gkraken/package.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 31d1777d3014..c591aa3020e5 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -33,6 +33,8 @@ [v1.7.0](https://github.com/jtroo/kanata/releases/tag/v1.7.0) for more information. +- `gkraken` software and `hardware.gkraken.enable` option have been removed, use `coolercontrol` via `programs.coolercontrol.enable` option instead. + - the notmuch vim plugin now lives in a separate output of the `notmuch` package. Installing `notmuch` will not bring the notmuch vim package anymore, add `vimPlugins.notmuch-vim` to your (Neo)vim configuration if you want the diff --git a/nixos/modules/hardware/gkraken.nix b/nixos/modules/hardware/gkraken.nix deleted file mode 100644 index 90b0069e80c8..000000000000 --- a/nixos/modules/hardware/gkraken.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.hardware.gkraken; -in -{ - options.hardware.gkraken = { - enable = lib.mkEnableOption "gkraken's udev rules for NZXT AIO liquid coolers"; - }; - - config = lib.mkIf cfg.enable { - services.udev.packages = with pkgs; [ - gkraken - ]; - }; -} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index cc107eefe505..bc3d42a8cc14 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -64,7 +64,6 @@ ./hardware/digitalbitbox.nix ./hardware/flipperzero.nix ./hardware/flirc.nix - ./hardware/gkraken.nix ./hardware/glasgow.nix ./hardware/gpgsmartcards.nix ./hardware/graphics.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 7888c9883a70..bca1c0732bac 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -33,6 +33,10 @@ in systemd-logind API). Instead of using the module you can now simply add the brightnessctl package to environment.systemPackages. '') + (mkRemovedOptionModule [ "hardware" "gkraken" "enable" ] '' + gkraken was deprecated by coolercontrol and thus removed from nixpkgs. + Consider using programs.coolercontrol instead. + '') (mkRemovedOptionModule [ "hardware" "u2f" ] '' The U2F modules module was removed, as all it did was adding the udev rules from libu2f-host to the system. Udev gained native support diff --git a/pkgs/by-name/gk/gkraken/package.nix b/pkgs/by-name/gk/gkraken/package.nix deleted file mode 100644 index 9866c049fa7a..000000000000 --- a/pkgs/by-name/gk/gkraken/package.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ python3Packages -, lib -, fetchFromGitLab -, meson -, pkg-config -, glib -, ninja -, desktop-file-utils -, gobject-introspection -, gtk3 -, libnotify -, dbus -, wrapGAppsHook3 -}: - -python3Packages.buildPythonApplication rec { - pname = "gkraken"; - version = "1.2.0"; - - src = fetchFromGitLab { - owner = "leinardi"; - repo = "gkraken"; - rev = version; - sha256 = "0hxlh0319rl28iba02917z3n6d5cq2qcgpj2ng31bkjjhlvvfm2g"; - }; - - format = "other"; - - postPatch = '' - patchShebangs scripts/meson_post_install.py - ''; - - nativeBuildInputs = [ - meson - pkg-config - gobject-introspection - glib - ninja - gtk3 - desktop-file-utils - wrapGAppsHook3 - ]; - - buildInputs = [ - glib - gtk3 - libnotify - dbus - ]; - - propagatedBuildInputs = with python3Packages; [ - pygobject3 - peewee - rx - injector - liquidctl - pyxdg - requests - matplotlib - dbus-python - ]; - - dontWrapGApps = true; - - # Extract udev rules from python code - postInstall = '' - mkdir -p $out/lib/udev/rules.d - sed -e '/\s*\(from\|@singleton\|@inject\)/d' $src/gkraken/interactor/udev_interactor.py > udev_interactor.py - python -c 'from udev_interactor import _UDEV_RULE; print(_UDEV_RULE)' > $out/lib/udev/rules.d/60-gkraken.rules - ''; - - preFixup = '' - makeWrapperArgs+=( - "''${gappsWrapperArgs[@]}" - ) - ''; - - meta = with lib; { - description = "GUI that allows to control the cooling (fan and/or pump profiles) of NZXT Kraken AIO liquid coolers from Linux"; - homepage = "https://gitlab.com/leinardi/gkraken"; - changelog = "https://gitlab.com/leinardi/gkraken/-/tags/${version}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.linux; - mainProgram = "gkraken"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5173b3dc0dda..2871e3bd720d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -439,6 +439,7 @@ mapAliases { topGit = top-git; }; # Added 2021-01-14 + gkraken = throw "'gkraken' has been deprecated by upstream. Consider using the replacement 'coolercontrol' instead."; # Added 2024-11-22 glew-egl = lib.warn "'glew-egl' is now provided by 'glew' directly" glew; # Added 2024-08-11 glfw-wayland = glfw; # Added 2024-04-19 glfw-wayland-minecraft = glfw3-minecraft; # Added 2024-05-08