diff --git a/pkgs/by-name/da/darkly-qt5/package.nix b/pkgs/by-name/da/darkly-qt5/package.nix deleted file mode 100644 index de0113957bd4..000000000000 --- a/pkgs/by-name/da/darkly-qt5/package.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - darkly, - libsForQt5, -}: -darkly.override { qtPackages = libsForQt5; } diff --git a/pkgs/by-name/da/darkly/package.nix b/pkgs/by-name/da/darkly/package.nix index 9a8ddb9f439f..9dad017633cf 100644 --- a/pkgs/by-name/da/darkly/package.nix +++ b/pkgs/by-name/da/darkly/package.nix @@ -5,14 +5,11 @@ cmake, ninja, kdePackages, - qtPackages ? kdePackages, + qt6, gitUpdater, }: -let - qtMajorVersion = lib.versions.major qtPackages.qtbase.version; -in stdenv.mkDerivation (finalAttrs: { - pname = "darkly-qt${qtMajorVersion}"; + pname = "darkly"; version = "0.5.32"; src = fetchFromGitHub { @@ -25,34 +22,27 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ninja - qtPackages.wrapQtAppsHook - qtPackages.extra-cmake-modules + qt6.wrapQtAppsHook + kdePackages.extra-cmake-modules ]; - buildInputs = - with qtPackages; - [ - qtbase - kconfig - kcoreaddons - kcmutils - kguiaddons - ki18n - kiconthemes - kwindowsystem - ] - ++ lib.optionals (qtMajorVersion == "5") [ - kirigami2 - ] - ++ lib.optionals (qtMajorVersion == "6") [ - kcolorscheme - kdecoration - kirigami - ]; + buildInputs = with kdePackages; [ + qtbase + kconfig + kcoreaddons + kcmutils + kguiaddons + ki18n + kiconthemes + kwindowsystem + kcolorscheme + kdecoration + kirigami + ]; - cmakeFlags = map (v: lib.cmakeBool "BUILD_QT${v}" (v == qtMajorVersion)) [ - "5" - "6" + cmakeFlags = [ + "-DBUILD_QT5=OFF" + "-DBUILD_QT6=ON" ]; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; @@ -64,8 +54,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.linux; license = with lib.licenses; [ gpl2Plus ]; maintainers = with lib.maintainers; [ pluiedev ]; - } - // lib.optionalAttrs (qtMajorVersion == "6") { mainProgram = "darkly-settings6"; }; }) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 195bc8c00707..dc839ef65963 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -587,6 +587,7 @@ mapAliases { cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09 dale = throw "dale has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10 daq = throw "'daq' has been removed as it is unmaintained and broken. Snort2 has also been removed, which depended on this"; # Added 2025-05-21 + darkly-qt5 = throw "'darkly-qt' has been removed due to outdated KF5 dependencies"; # Added 2026-05-01 daytona-bin = throw "'daytona-bin' has been removed, as it was unmaintained in nixpkgs"; # Added 2025-07-21 dbench = throw "'dbench' has been removed as it is unmaintained for 14 years and broken"; # Added 2025-05-17 dbus-sharp-1_0 = throw "'dbus-sharp-1_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25