Merge pull request #300723 from A1ca7raz/nixos-unstable

sierra-breeze-enhanced: 1.3.3 -> 2.0.1

authored by Peder Bergebakken Sundt and committed by GitHub ce935575 9a1d9718

+21 -4
+6
maintainers/maintainer-list.nix
··· 256 256 githubId = 381298; 257 257 name = "9R"; 258 258 }; 259 + A1ca7raz = { 260 + email = "aya@wtm.moe"; 261 + github = "A1ca7raz"; 262 + githubId = 7345998; 263 + name = "A1ca7raz"; 264 + }; 259 265 a1russell = { 260 266 email = "adamlr6+pub@gmail.com"; 261 267 github = "a1russell";
+10 -3
pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix
··· 5 5 , wrapQtAppsHook 6 6 , kwin 7 7 , lib 8 + , useQt5 ? false 8 9 }: 10 + let 11 + latestVersion = "2.0.1"; 12 + latestSha256 = "sha256-4KvOhQSYmHV/5TxyeK4f1uUmHK5uR5xXC2MfPTM96SM="; 9 13 14 + qt5Version = "1.3.3"; 15 + qt5Sha256 = "sha256-zTUTsSzy4p0Y7RPOidCtxTjjyvPRyWSQCxA5sUzXcLc="; 16 + in 10 17 stdenv.mkDerivation rec { 11 18 pname = "sierra-breeze-enhanced"; 12 - version = "1.3.3"; 19 + version = if useQt5 then qt5Version else latestVersion; 13 20 14 21 src = fetchFromGitHub { 15 22 owner = "kupiqu"; 16 23 repo = "SierraBreezeEnhanced"; 17 24 rev = "V${version}"; 18 - sha256 = "sha256-zTUTsSzy4p0Y7RPOidCtxTjjyvPRyWSQCxA5sUzXcLc="; 25 + sha256 = if useQt5 then qt5Sha256 else latestSha256; 19 26 }; 20 27 21 28 nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; ··· 32 39 homepage = "https://github.com/kupiqu/SierraBreezeEnhanced"; 33 40 changelog = "https://github.com/kupiqu/SierraBreezeEnhanced/releases/tag/V${version}"; 34 41 license = licenses.gpl3Only; 35 - maintainers = with maintainers; [ ]; 42 + maintainers = with maintainers; [ A1ca7raz ]; 36 43 }; 37 44 }
+1 -1
pkgs/top-level/all-packages.nix
··· 29399 29399 29400 29400 shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { }; 29401 29401 29402 - sierra-breeze-enhanced = libsForQt5.callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced { }; 29402 + sierra-breeze-enhanced = libsForQt5.callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced { useQt5 = true; }; 29403 29403 29404 29404 simp1e-cursors = callPackage ../data/icons/simp1e-cursors { }; 29405 29405
+2
pkgs/top-level/qt5-packages.nix
··· 271 271 272 272 rlottie-qml = callPackage ../development/libraries/rlottie-qml { }; 273 273 274 + sierra-breeze-enhanced = callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced { useQt5 = true; }; 275 + 274 276 soqt = callPackage ../development/libraries/soqt { }; 275 277 276 278 telepathy = callPackage ../development/libraries/telepathy/qt { };
+2
pkgs/top-level/qt6-packages.nix
··· 105 105 # is, to allow users to choose the right build if needed. 106 106 sddm = callPackage ../applications/display-managers/sddm {}; 107 107 108 + sierra-breeze-enhanced = kdePackages.callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced { }; 109 + 108 110 signond = callPackage ../development/libraries/signond {}; 109 111 110 112 waylib = callPackage ../development/libraries/waylib { };