From f2000007b37fb7bbc3f008179ebb820a2dfb5f8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C5=A0uklje?= Date: Sat, 28 Sep 2013 02:45:20 +0200 Subject: [PATCH 1/8] New package started, should not work yet. --- .../applications/office/eventlist/default.nix | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/applications/office/eventlist/default.nix diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix new file mode 100644 index 00000000000..26b8fabb549 --- /dev/null +++ b/pkgs/applications/office/eventlist/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "eventlist-0.6.95"; + + src = fetchurl { + url = "http://kde-look.org/CONTENT/content-files/107779-plasmoid-eventlist-0.6.95.tar.bz2"; + md5 = "67531c52806eee0a6cd911265f1eb9f5"; + }; + + doCheck = true; + + meta = { + description = "KDE Plasmoid to show events and todos on the desktop."; + longDescription = '' + This is a plasmoid to show the events and todos from Akonadi resources (KOrganizer, Birthdays etc.). + With a google resource also Google calendar items can be shown. + Also possible with a CalDAV resource. + A facebook resource is also available. + + Incidences can be filtered, added, edited, deleted via context menu. + ''; + homepage = http://kde-look.org/content/show.php/Eventlist?content=107779; + license = "GPLv3+"; + + platforms = stdenv.lib.platforms.all; + }; +} From 3abea9036c9321302e940a4c083b3c4341010465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C5=A0uklje?= Date: Sun, 29 Sep 2013 15:30:08 +0200 Subject: [PATCH 2/8] Changed the hash checker to sha256 and fixed (hopefully) all-packages.nix. --- pkgs/applications/office/eventlist/default.nix | 12 +++++++----- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix index 26b8fabb549..e8ab602fb56 100644 --- a/pkgs/applications/office/eventlist/default.nix +++ b/pkgs/applications/office/eventlist/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, kdelibs }: stdenv.mkDerivation rec { name = "eventlist-0.6.95"; src = fetchurl { url = "http://kde-look.org/CONTENT/content-files/107779-plasmoid-eventlist-0.6.95.tar.bz2"; - md5 = "67531c52806eee0a6cd911265f1eb9f5"; + sha256 = "29d3ff0b84353c2e563e05f75cd729b9e2971365eed9b8ce9b38d94f51901b94" }; doCheck = true; + buildInputs = [ kdelibs ]; + meta = { + inherit (kdelibs.meta) platforms; description = "KDE Plasmoid to show events and todos on the desktop."; longDescription = '' This is a plasmoid to show the events and todos from Akonadi resources (KOrganizer, Birthdays etc.). @@ -20,9 +23,8 @@ stdenv.mkDerivation rec { Incidences can be filtered, added, edited, deleted via context menu. ''; - homepage = http://kde-look.org/content/show.php/Eventlist?content=107779; + homepage = "http://kde-look.org/content/show.php/Eventlist?content=107779"; license = "GPLv3+"; - platforms = stdenv.lib.platforms.all; - }; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e3f9798d5c..efb9aba92b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9361,6 +9361,8 @@ let else callPackage ../applications/graphics/digikam { }; + eventlist = callPackage ../applications/office/eventlist {}; + k3b = callPackage ../applications/misc/k3b { }; kadu = callPackage ../applications/networking/instant-messengers/kadu { }; From 12470a04997b5254ed7bbf222343ca43d99736af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C5=A0uklje?= Date: Mon, 30 Sep 2013 00:22:31 +0200 Subject: [PATCH 3/8] Fixed the sha line. --- pkgs/applications/office/eventlist/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix index e8ab602fb56..3a4f1640366 100644 --- a/pkgs/applications/office/eventlist/default.nix +++ b/pkgs/applications/office/eventlist/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://kde-look.org/CONTENT/content-files/107779-plasmoid-eventlist-0.6.95.tar.bz2"; - sha256 = "29d3ff0b84353c2e563e05f75cd729b9e2971365eed9b8ce9b38d94f51901b94" + sha256 = "29d3ff0b84353c2e563e05f75cd729b9e2971365eed9b8ce9b38d94f51901b94"; }; doCheck = true; From 28a1e45ec74594902f82b167b56f638e79ac017f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C5=A0uklje?= Date: Sun, 6 Oct 2013 21:20:24 +0200 Subject: [PATCH 4/8] Added proper dependencies. --- pkgs/applications/office/eventlist/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix index 3a4f1640366..8879e828abd 100644 --- a/pkgs/applications/office/eventlist/default.nix +++ b/pkgs/applications/office/eventlist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kdelibs }: +{ stdenv, fetchurl, kdelibs, kdepimlibs, akonadi }: stdenv.mkDerivation rec { name = "eventlist-0.6.95"; From 5b4a8ff6ccf9d440fd1eeb7a451717303ca8b860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C5=A0uklje?= Date: Sun, 6 Oct 2013 21:27:23 +0200 Subject: [PATCH 5/8] Eventlist: Updated version to 0.6.96. --- pkgs/applications/office/eventlist/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix index 8879e828abd..8ad12576796 100644 --- a/pkgs/applications/office/eventlist/default.nix +++ b/pkgs/applications/office/eventlist/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, kdelibs, kdepimlibs, akonadi }: stdenv.mkDerivation rec { - name = "eventlist-0.6.95"; + name = "eventlist-0.6.96"; src = fetchurl { - url = "http://kde-look.org/CONTENT/content-files/107779-plasmoid-eventlist-0.6.95.tar.bz2"; - sha256 = "29d3ff0b84353c2e563e05f75cd729b9e2971365eed9b8ce9b38d94f51901b94"; + url = "http://kde-look.org/CONTENT/content-files/107779-plasmoid-eventlist-0.6.96.tar.bz2"; + sha256 = "26cc7bd1c465bf1379fd0ba1fa8592eaa62f2553734d1b283e17359103908eea"; }; doCheck = true; From 525a6fc8a820d2b1fce2a22b25b9cb99be31773d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C5=A0uklje?= Date: Sun, 6 Oct 2013 22:09:35 +0200 Subject: [PATCH 6/8] Eventlist: Added more dependencies. --- pkgs/applications/office/eventlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix index 8ad12576796..5a8d761bb50 100644 --- a/pkgs/applications/office/eventlist/default.nix +++ b/pkgs/applications/office/eventlist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kdelibs, kdepimlibs, akonadi }: +{ stdenv, fetchurl, kdelibs, kdepimlibs, akonadi, gettext }: stdenv.mkDerivation rec { name = "eventlist-0.6.96"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ kdelibs ]; + buildInputs = [ kdelibs kdepimlibs akonadi gettext ]; meta = { inherit (kdelibs.meta) platforms; From 4f74888a9f8dd6310a3b5a3b00cbc5cbaa05538c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C5=A0uklje?= Date: Sun, 6 Oct 2013 23:57:16 +0200 Subject: [PATCH 7/8] Eventlist: First working package 0.6.96. Added boost as buildInputs. Removed uneeded doCheck. --- pkgs/applications/office/eventlist/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix index 5a8d761bb50..d10133efb55 100644 --- a/pkgs/applications/office/eventlist/default.nix +++ b/pkgs/applications/office/eventlist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kdelibs, kdepimlibs, akonadi, gettext }: +{ stdenv, fetchurl, kdelibs, kdepimlibs, akonadi, gettext, boost }: stdenv.mkDerivation rec { name = "eventlist-0.6.96"; @@ -8,9 +8,7 @@ stdenv.mkDerivation rec { sha256 = "26cc7bd1c465bf1379fd0ba1fa8592eaa62f2553734d1b283e17359103908eea"; }; - doCheck = true; - - buildInputs = [ kdelibs kdepimlibs akonadi gettext ]; + buildInputs = [ kdelibs kdepimlibs akonadi gettext boost ]; meta = { inherit (kdelibs.meta) platforms; From c8a9b0069fdb487d5b021de582213312612d56e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C5=A0uklje?= Date: Mon, 7 Oct 2013 00:26:27 +0200 Subject: [PATCH 8/8] Eventlist: Renamed accordingly and fixed the description. --- pkgs/applications/office/eventlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix index d10133efb55..f126d6bfba6 100644 --- a/pkgs/applications/office/eventlist/default.nix +++ b/pkgs/applications/office/eventlist/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, kdelibs, kdepimlibs, akonadi, gettext, boost }: stdenv.mkDerivation rec { - name = "eventlist-0.6.96"; + name = "plasmoid-eventlist-0.6.96"; src = fetchurl { url = "http://kde-look.org/CONTENT/content-files/107779-plasmoid-eventlist-0.6.96.tar.bz2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { inherit (kdelibs.meta) platforms; - description = "KDE Plasmoid to show events and todos on the desktop."; + description = "KDE Plasmoid to show events and todos on the desktop"; longDescription = '' This is a plasmoid to show the events and todos from Akonadi resources (KOrganizer, Birthdays etc.). With a google resource also Google calendar items can be shown.