From 219f773d3b2ef274777aded2f9f7b737a73d10a7 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 10 Jul 2020 16:42:39 +0200 Subject: [PATCH 1/3] picmi: init at 19.12.3 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/picmi.nix | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/applications/kde/picmi.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 82c653edda46..fcb4a2131804 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -174,6 +174,7 @@ let messagelib = callPackage ./messagelib.nix {}; minuet = callPackage ./minuet.nix {}; okular = callPackage ./okular.nix {}; + picmi = callPackage ./picmi {}; pimcommon = callPackage ./pimcommon.nix {}; pim-data-exporter = callPackage ./pim-data-exporter.nix {}; pim-sieve-editor = callPackage ./pim-sieve-editor.nix {}; diff --git a/pkgs/applications/kde/picmi.nix b/pkgs/applications/kde/picmi.nix new file mode 100644 index 000000000000..2e8dba2c1ce7 --- /dev/null +++ b/pkgs/applications/kde/picmi.nix @@ -0,0 +1,17 @@ +{ mkDerivation, lib +, libkdegames, extra-cmake-modules +, kdeclarative, knewstuff +}: + +mkDerivation { + name = "picmi"; + meta = with lib; { maintainers = with maintainers; [ freezeboy ]; }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + kdeclarative + knewstuff + libkdegames + ]; +} From 535c20b3161f69ce6d37d644d78d01c8db06c054 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 11 Jul 2020 16:48:09 +0200 Subject: [PATCH 2/3] fixup picmi path and meta record --- pkgs/applications/kde/default.nix | 2 +- pkgs/applications/kde/picmi.nix | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index fcb4a2131804..3b36ed9e3ada 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -174,7 +174,7 @@ let messagelib = callPackage ./messagelib.nix {}; minuet = callPackage ./minuet.nix {}; okular = callPackage ./okular.nix {}; - picmi = callPackage ./picmi {}; + picmi = callPackage ./picmi.nix {}; pimcommon = callPackage ./pimcommon.nix {}; pim-data-exporter = callPackage ./pim-data-exporter.nix {}; pim-sieve-editor = callPackage ./pim-sieve-editor.nix {}; diff --git a/pkgs/applications/kde/picmi.nix b/pkgs/applications/kde/picmi.nix index 2e8dba2c1ce7..dd09e8f9cd80 100644 --- a/pkgs/applications/kde/picmi.nix +++ b/pkgs/applications/kde/picmi.nix @@ -5,7 +5,15 @@ mkDerivation { name = "picmi"; - meta = with lib; { maintainers = with maintainers; [ freezeboy ]; }; + meta = with lib; { + description = "Nonogram game"; + longDescription = ''The goal is to reveal the hidden pattern in the board by coloring or + leaving blank the cells in a grid according to numbers given at the side of the grid. + ''; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; nativeBuildInputs = [ extra-cmake-modules ]; From 05f8c54f5bd8d55abfdbe7bd2a0e39d1e2531800 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sun, 12 Jul 2020 23:14:16 +0200 Subject: [PATCH 3/3] picmi: export in all-packages --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f75b3a41a2e6..f788b4d5c627 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20674,7 +20674,7 @@ in akonadi akregator ark dolphin dragon elisa ffmpegthumbs filelight gwenview k3b kaddressbook kapptemplate kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake - kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle; + kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular picmi spectacle; okteta = libsForQt5.callPackage ../applications/editors/okteta { };