From cc6479b738810d2a5b53e1b36de9a2dae2e6d069 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH] sierra-breeze-enhanced: drop Qt5 build --- .../sierra-breeze-enhanced/default.nix | 12 ++---------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ---- pkgs/top-level/qt5-packages.nix | 4 ---- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix b/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix index ea98b567fd0b..6b3331ccd613 100644 --- a/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix +++ b/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix @@ -6,24 +6,16 @@ wrapQtAppsHook, kwin, lib, - useQt5 ? false, }: -let - latestVersion = "2.1.1"; - latestSha256 = "sha256-7mQnJCQr/zm9zEdg2JPr7jQn8uajyCXvyYRQZWxG+Q8="; - - qt5Version = "1.3.3"; - qt5Sha256 = "sha256-zTUTsSzy4p0Y7RPOidCtxTjjyvPRyWSQCxA5sUzXcLc="; -in stdenv.mkDerivation rec { pname = "sierra-breeze-enhanced"; - version = if useQt5 then qt5Version else latestVersion; + version = "2.1.1"; src = fetchFromGitHub { owner = "kupiqu"; repo = "SierraBreezeEnhanced"; rev = if version == "2.1.1" then "V.2.1.1" else "V${version}"; - sha256 = if useQt5 then qt5Sha256 else latestSha256; + hash = "sha256-7mQnJCQr/zm9zEdg2JPr7jQn8uajyCXvyYRQZWxG+Q8="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8b109118aa07..80f4186a94bc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1866,6 +1866,7 @@ mapAliases { shell-hist = throw "'shell-hist' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 shipyard = jumppad; # Added 2023-06-06 siduck76-st = st-snazzy; # Added 2024-12-24 + sierra-breeze-enhanced = throw "'sierra-breeze-enhanced' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 signald = throw "'signald' has been removed due to lack of upstream maintenance"; # Added 2025-05-17 signaldctl = throw "'signaldctl' has been removed due to lack of upstream maintenance"; # Added 2025-05-17 signal-desktop-beta = throw "signal-desktop-beta has been removed to make the signal-desktop package easier to maintain"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d60379d6d759..3d003af18b1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11328,10 +11328,6 @@ with pkgs; inherit (darwin) autoSignDarwinBinariesHook; }; - sierra-breeze-enhanced = - libsForQt5.callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced - { useQt5 = true; }; - scheherazade-new = scheherazade.override { version = "4.300"; }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 826a465dade5..4abfa6f877c4 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -291,10 +291,6 @@ makeScopeWithSplicing' { callPackage ../development/libraries/sailfish-access-control-plugin { }; - sierra-breeze-enhanced = callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced { - useQt5 = true; - }; - soqt = callPackage ../development/libraries/soqt { }; telepathy = callPackage ../development/libraries/telepathy/qt { };