From be7e5971739da2cf4928b63c44f4071a21217780 Mon Sep 17 00:00:00 2001 From: Philipp Woelfel Date: Fri, 14 Jan 2022 19:02:42 -0700 Subject: [PATCH 1/5] lightly-qt: init at 0.4.1 --- pkgs/data/themes/lightly-qt/default.nix | 43 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/data/themes/lightly-qt/default.nix diff --git a/pkgs/data/themes/lightly-qt/default.nix b/pkgs/data/themes/lightly-qt/default.nix new file mode 100644 index 000000000000..9092811d5f2a --- /dev/null +++ b/pkgs/data/themes/lightly-qt/default.nix @@ -0,0 +1,43 @@ +{ + mkDerivation, + lib, + fetchFromGitHub, + cmake, + extra-cmake-modules, + kdecoration, + plasma-workspace, + qtbase, + qt5 +}: + +mkDerivation rec { + pname = "lightly-qt"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "Luwx"; + repo = "Lightly"; + rev = "v${version}"; + sha256 = "0qkjzgjplgwczhk6959iah4ilvazpprv7yb809jy75kkp1jw8mwk"; + }; + + buildInputs = [ + kdecoration + plasma-workspace + qtbase + qt5.qtx11extras + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + meta = { + description = "A fork of breeze theme style that aims to be visually modern and minimalistic"; + homepage = "https://github.com/Luwx/Lightly"; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.pwoelfel ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6cb53114a47..4db3d8c8af6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23621,6 +23621,8 @@ with pkgs; libre-franklin = callPackage ../data/fonts/libre-franklin { }; + lightly-qt = libsForQt5.callPackage ../data/themes/lightly-qt { }; + line-awesome = callPackage ../data/fonts/line-awesome { }; linux-manual = callPackage ../data/documentation/linux-manual { }; From b0d472b8e7403ef9fcb9cecd7ab7b596b0324e72 Mon Sep 17 00:00:00 2001 From: Philipp Woelfel Date: Sat, 15 Jan 2022 11:53:59 -0700 Subject: [PATCH 2/5] Fix styling Co-authored-by: Nikolay Korotkiy --- pkgs/data/themes/lightly-qt/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/data/themes/lightly-qt/default.nix b/pkgs/data/themes/lightly-qt/default.nix index 9092811d5f2a..311c7ca68ec0 100644 --- a/pkgs/data/themes/lightly-qt/default.nix +++ b/pkgs/data/themes/lightly-qt/default.nix @@ -1,13 +1,12 @@ -{ - mkDerivation, - lib, - fetchFromGitHub, - cmake, - extra-cmake-modules, - kdecoration, - plasma-workspace, - qtbase, - qt5 +{ mkDerivation +, lib +, fetchFromGitHub +, cmake +, extra-cmake-modules +, kdecoration +, plasma-workspace +, qtbase +, qt5 }: mkDerivation rec { From 3db469781ad1de6f667d55b9f4cb88db127b5b77 Mon Sep 17 00:00:00 2001 From: Philipp Woelfel Date: Sat, 15 Jan 2022 11:54:20 -0700 Subject: [PATCH 3/5] Update pkgs/data/themes/lightly-qt/default.nix Code style changes Co-authored-by: Nikolay Korotkiy --- pkgs/data/themes/lightly-qt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/themes/lightly-qt/default.nix b/pkgs/data/themes/lightly-qt/default.nix index 311c7ca68ec0..9e4adc758515 100644 --- a/pkgs/data/themes/lightly-qt/default.nix +++ b/pkgs/data/themes/lightly-qt/default.nix @@ -36,7 +36,7 @@ mkDerivation rec { description = "A fork of breeze theme style that aims to be visually modern and minimalistic"; homepage = "https://github.com/Luwx/Lightly"; license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.pwoelfel ]; + maintainers = with lib.maintainers; [ pwoelfel ]; platforms = lib.platforms.all; }; } From 57c9949a64a32681d5305a3f3f103c2e9422c192 Mon Sep 17 00:00:00 2001 From: Philipp Woelfel Date: Sat, 15 Jan 2022 11:57:45 -0700 Subject: [PATCH 4/5] license: gpl2Plus --- pkgs/data/themes/lightly-qt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/themes/lightly-qt/default.nix b/pkgs/data/themes/lightly-qt/default.nix index 9e4adc758515..8058cea788b1 100644 --- a/pkgs/data/themes/lightly-qt/default.nix +++ b/pkgs/data/themes/lightly-qt/default.nix @@ -35,7 +35,7 @@ mkDerivation rec { meta = { description = "A fork of breeze theme style that aims to be visually modern and minimalistic"; homepage = "https://github.com/Luwx/Lightly"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ pwoelfel ]; platforms = lib.platforms.all; }; From 610b8b2210428080020d00ec0e083fb54fedaf1f Mon Sep 17 00:00:00 2001 From: Philipp Woelfel Date: Sat, 15 Jan 2022 12:50:51 -0700 Subject: [PATCH 5/5] Cleanup: Factor out lib for metadata --- pkgs/data/themes/lightly-qt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/themes/lightly-qt/default.nix b/pkgs/data/themes/lightly-qt/default.nix index 8058cea788b1..7b653d952424 100644 --- a/pkgs/data/themes/lightly-qt/default.nix +++ b/pkgs/data/themes/lightly-qt/default.nix @@ -32,11 +32,11 @@ mkDerivation rec { extra-cmake-modules ]; - meta = { + meta = with lib; { description = "A fork of breeze theme style that aims to be visually modern and minimalistic"; homepage = "https://github.com/Luwx/Lightly"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ pwoelfel ]; - platforms = lib.platforms.all; + license = licenses.gpl2Plus; + maintainers = [ maintainers.pwoelfel ]; + platforms = platforms.all; }; }