From 4c63d537b59edf59479ac8153d81ebdf27cd5ef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sat, 11 Oct 2025 14:47:25 -0400 Subject: [PATCH 1/5] systemdgenie: 0.99.0 -> 0.99.0-unstable-2025-10-11 --- .../system/systemdgenie/default.nix | 26 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/system/systemdgenie/default.nix b/pkgs/applications/system/systemdgenie/default.nix index 0131be7ebc71..ed1a07f1d0a0 100644 --- a/pkgs/applications/system/systemdgenie/default.nix +++ b/pkgs/applications/system/systemdgenie/default.nix @@ -2,32 +2,34 @@ stdenv, lib, cmake, - extra-cmake-modules, - kxmlgui, fetchFromGitLab, - kdelibs4support, - wrapQtAppsHook, + kdePackages, + pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "systemdgenie"; - version = "0.99.0"; + version = "0.99.0-unstable-2025-10-11"; + src = fetchFromGitLab { domain = "invent.kde.org"; repo = "SystemdGenie"; owner = "system"; - rev = "v${version}"; - hash = "sha256-y+A2OuK1ZooPY5W0SsXEb1aaOAJ2b7QSwiumolmAaR4="; + rev = "dcfd937a711fb124da6c717c51334dbbb430e48e"; + hash = "sha256-X/qUWStT3vRvJNQMdzUV818bsZkbxaaAd7RHJcK+WEE="; }; nativeBuildInputs = [ cmake - extra-cmake-modules - wrapQtAppsHook + pkg-config + kdePackages.extra-cmake-modules + kdePackages.wrapQtAppsHook ]; buildInputs = [ - kxmlgui - kdelibs4support + kdePackages.kirigami-addons + kdePackages.kio + kdePackages.ktexteditor + kdePackages.kxmlgui ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c3c0bff12c8..c79729bb9f3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4096,7 +4096,7 @@ with pkgs; w3m = w3m-batch; }; - systemdgenie = libsForQt5.callPackage ../applications/system/systemdgenie { }; + systemdgenie = callPackage ../applications/system/systemdgenie { }; tartube = callPackage ../applications/video/tartube { }; From 7bb2b9073192c0a482fc6715135372130eaaa4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sat, 11 Oct 2025 14:47:36 -0400 Subject: [PATCH 2/5] systemdgenie: enable strictDeps --- pkgs/applications/system/systemdgenie/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/system/systemdgenie/default.nix b/pkgs/applications/system/systemdgenie/default.nix index ed1a07f1d0a0..9bfb4711b1ca 100644 --- a/pkgs/applications/system/systemdgenie/default.nix +++ b/pkgs/applications/system/systemdgenie/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { hash = "sha256-X/qUWStT3vRvJNQMdzUV818bsZkbxaaAd7RHJcK+WEE="; }; + strictDeps = true; + nativeBuildInputs = [ cmake pkg-config From 3d892c3d5b815c8d25d6929225efd46e0bb200ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sat, 11 Oct 2025 14:47:43 -0400 Subject: [PATCH 3/5] systemdgenie: clean up meta --- pkgs/applications/system/systemdgenie/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/system/systemdgenie/default.nix b/pkgs/applications/system/systemdgenie/default.nix index 9bfb4711b1ca..dba5e019fda3 100644 --- a/pkgs/applications/system/systemdgenie/default.nix +++ b/pkgs/applications/system/systemdgenie/default.nix @@ -34,12 +34,12 @@ stdenv.mkDerivation { kdePackages.kxmlgui ]; - meta = with lib; { + meta = { description = "Systemd management utility"; mainProgram = "systemdgenie"; homepage = "https://kde.org"; - license = licenses.gpl2; - maintainers = [ maintainers.pasqui23 ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.pasqui23 ]; + platforms = lib.platforms.linux; }; } From 3981ba00d0400063c415e6ba1bfe0754e77cca14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sun, 12 Oct 2025 08:52:55 -0400 Subject: [PATCH 4/5] systemdgenie: set updateScript --- pkgs/applications/system/systemdgenie/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/system/systemdgenie/default.nix b/pkgs/applications/system/systemdgenie/default.nix index dba5e019fda3..bb4b43072d40 100644 --- a/pkgs/applications/system/systemdgenie/default.nix +++ b/pkgs/applications/system/systemdgenie/default.nix @@ -5,7 +5,9 @@ fetchFromGitLab, kdePackages, pkg-config, + nix-update-script, }: + stdenv.mkDerivation { pname = "systemdgenie"; version = "0.99.0-unstable-2025-10-11"; @@ -34,6 +36,8 @@ stdenv.mkDerivation { kdePackages.kxmlgui ]; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + meta = { description = "Systemd management utility"; mainProgram = "systemdgenie"; From c98b9ab2aa1ff7dfcb3b3853298569a27145ce21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sat, 11 Oct 2025 14:48:59 -0400 Subject: [PATCH 5/5] systemdgenie: migrate to by-name --- .../default.nix => by-name/sy/systemdgenie/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/system/systemdgenie/default.nix => by-name/sy/systemdgenie/package.nix} (100%) diff --git a/pkgs/applications/system/systemdgenie/default.nix b/pkgs/by-name/sy/systemdgenie/package.nix similarity index 100% rename from pkgs/applications/system/systemdgenie/default.nix rename to pkgs/by-name/sy/systemdgenie/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c79729bb9f3a..3cd3e1caba9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4096,8 +4096,6 @@ with pkgs; w3m = w3m-batch; }; - systemdgenie = callPackage ../applications/system/systemdgenie { }; - tartube = callPackage ../applications/video/tartube { }; tartube-yt-dlp = callPackage ../applications/video/tartube {