diff options
author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2024-04-03 01:54:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-03 01:54:23 +0200 |
commit | ce93557538db610740f40b8e95243f869f9c54dc (patch) | |
tree | a7effce274299ded943b36738043f48e9e7859fb | |
parent | 9a1d9718f7811efc73f29e48384823db499e55c3 (diff) | |
parent | 3fb84cd7f05280d608b9821c95f723b78d7a1315 (diff) |
Merge pull request #300723 from A1ca7raz/nixos-unstable
sierra-breeze-enhanced: 1.3.3 -> 2.0.1
-rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
-rw-r--r-- | pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix | 13 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/qt5-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/qt6-packages.nix | 2 |
5 files changed, 21 insertions, 4 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c3b6cef360c63..34181378687da 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -256,6 +256,12 @@ githubId = 381298; name = "9R"; }; + A1ca7raz = { + email = "aya@wtm.moe"; + github = "A1ca7raz"; + githubId = 7345998; + name = "A1ca7raz"; + }; a1russell = { email = "adamlr6+pub@gmail.com"; github = "a1russell"; 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 63140298ea3a6..156d8aaaf9073 100644 --- a/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix +++ b/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix @@ -5,17 +5,24 @@ , wrapQtAppsHook , kwin , lib +, useQt5 ? false }: +let + latestVersion = "2.0.1"; + latestSha256 = "sha256-4KvOhQSYmHV/5TxyeK4f1uUmHK5uR5xXC2MfPTM96SM="; + qt5Version = "1.3.3"; + qt5Sha256 = "sha256-zTUTsSzy4p0Y7RPOidCtxTjjyvPRyWSQCxA5sUzXcLc="; +in stdenv.mkDerivation rec { pname = "sierra-breeze-enhanced"; - version = "1.3.3"; + version = if useQt5 then qt5Version else latestVersion; src = fetchFromGitHub { owner = "kupiqu"; repo = "SierraBreezeEnhanced"; rev = "V${version}"; - sha256 = "sha256-zTUTsSzy4p0Y7RPOidCtxTjjyvPRyWSQCxA5sUzXcLc="; + sha256 = if useQt5 then qt5Sha256 else latestSha256; }; nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; @@ -32,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/kupiqu/SierraBreezeEnhanced"; changelog = "https://github.com/kupiqu/SierraBreezeEnhanced/releases/tag/V${version}"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ A1ca7raz ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e34b386ac0bf..bbb35d07906c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29399,7 +29399,7 @@ with pkgs; shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { }; - sierra-breeze-enhanced = libsForQt5.callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced { }; + sierra-breeze-enhanced = libsForQt5.callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced { useQt5 = true; }; simp1e-cursors = callPackage ../data/icons/simp1e-cursors { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 7c861a3300320..791df02b69983 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -271,6 +271,8 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP rlottie-qml = callPackage ../development/libraries/rlottie-qml { }; + sierra-breeze-enhanced = callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced { useQt5 = true; }; + soqt = callPackage ../development/libraries/soqt { }; telepathy = callPackage ../development/libraries/telepathy/qt { }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 70e4212cfdc52..e136faf2fb299 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -105,6 +105,8 @@ makeScopeWithSplicing' { # is, to allow users to choose the right build if needed. sddm = callPackage ../applications/display-managers/sddm {}; + sierra-breeze-enhanced = kdePackages.callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced { }; + signond = callPackage ../development/libraries/signond {}; waylib = callPackage ../development/libraries/waylib { }; |