From 3692a2e83d9012b4f3493c15e93c1e5af0c3e8ea Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 22:06:02 +0200 Subject: [PATCH 1/6] conky: Update to version 1.9.0. Version 1.8.1 seems to be quite dated, in addition I'd like to use the weather plugin, which isn't available in 1.8.1 as well. If you work in your hermetically sealed environment, you surely want to know what's going on outside. Signed-off-by: aszlig --- pkgs/os-specific/linux/conky/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index fda361d6c74..2ef52aee99e 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, libxml2, curl, wirelesstools, glib, openssl}: stdenv.mkDerivation rec { - name = "conky-1.8.1"; + name = "conky-1.9.0"; src = fetchurl { url = "mirror://sourceforge/conky/${name}.tar.bz2"; - sha256 = "0hsybra4qzaqzny6n66m7768vbwkikajcvcbsqgnnnb9527jfnpq"; + sha256 = "0vxvjmi3cdvnp994sv5zcdyncfn0mlxa71p2wm9zpyrmy58bbwds"; }; buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ]; From b2b67c055b048c0db9dea06a219b8ef87d5dbbfc Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 22:18:13 +0200 Subject: [PATCH 2/6] conky: Remove curl/types.h patch. This patch is no longer needed, as it is fixed upstream now. Signed-off-by: aszlig --- .../linux/conky/curl-types-h.patch | 25 ------------------- pkgs/os-specific/linux/conky/default.nix | 2 -- 2 files changed, 27 deletions(-) delete mode 100644 pkgs/os-specific/linux/conky/curl-types-h.patch diff --git a/pkgs/os-specific/linux/conky/curl-types-h.patch b/pkgs/os-specific/linux/conky/curl-types-h.patch deleted file mode 100644 index ba99da23b46..00000000000 --- a/pkgs/os-specific/linux/conky/curl-types-h.patch +++ /dev/null @@ -1,25 +0,0 @@ -curl removed header -diff --git a/src/ccurl_thread.c b/src/ccurl_thread.c -index 10e73a6..9bea299 100644 ---- a/src/ccurl_thread.c -+++ b/src/ccurl_thread.c -@@ -33,7 +33,6 @@ - #endif /* DEBUG */ - - #include --#include - #include - - /* -diff --git a/src/eve.c b/src/eve.c -index dc07264..f62a5f6 100644 ---- a/src/eve.c -+++ b/src/eve.c -@@ -37,7 +37,6 @@ - #include - - #include --#include - #include - - #include diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 2ef52aee99e..94c7e72f0e2 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" "ncurses" ]) ++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss" ]); - patches = [ ./curl-types-h.patch ]; - meta = { homepage = http://conky.sourceforge.net/; description = "Conky is an advanced, highly configurable system monitor complied without X based on torsmo"; From 3b7dd3c9309c0865d2d2e5adc7715e8dae4bbbce Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 23:34:44 +0200 Subject: [PATCH 3/6] conky: Patch to #include in conky.c. In current upstream master, they converted conky.c to C++ already, so it's not an issue there anymore. But until then we need to patch it on our own to fix the build. Signed-off-by: aszlig --- pkgs/os-specific/linux/conky/default.nix | 2 ++ pkgs/os-specific/linux/conky/stdbool.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/os-specific/linux/conky/stdbool.patch diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 94c7e72f0e2..f5cccff6650 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0vxvjmi3cdvnp994sv5zcdyncfn0mlxa71p2wm9zpyrmy58bbwds"; }; + patches = [ ./stdbool.patch ]; + buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ]; configureFlags = (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" "ncurses" ]) diff --git a/pkgs/os-specific/linux/conky/stdbool.patch b/pkgs/os-specific/linux/conky/stdbool.patch new file mode 100644 index 00000000000..3f0b714a1f0 --- /dev/null +++ b/pkgs/os-specific/linux/conky/stdbool.patch @@ -0,0 +1,12 @@ +diff --git a/src/conky.c b/src/conky.c +index 5848b61..69a3d45 100644 +--- a/src/conky.c ++++ b/src/conky.c +@@ -34,6 +34,7 @@ + #include "common.h" + #include "timed_thread.h" + #include ++#include + #include + #include + #include From b0ace9fa110fbd68bd7be9bc58f5168b66ae3707 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 23:40:52 +0200 Subject: [PATCH 4/6] conky: Add license attribute to meta. As the GPL license is more restrictive than the BSD license of the original (torsmo) of the fork, I'm adding GPL as the license here. Signed-off-by: aszlig --- pkgs/os-specific/linux/conky/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index f5cccff6650..381cc44e36f 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = http://conky.sourceforge.net/; description = "Conky is an advanced, highly configurable system monitor complied without X based on torsmo"; maintainers = [ stdenv.lib.maintainers.guibert ]; + license = stdenv.lib.licenses.gpl3Plus; }; } - From 2b7e88e9f5c867356df9976c288b40b36c74b3c5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 23:46:32 +0200 Subject: [PATCH 5/6] conky: Re-enable support for ncurses. Build breakage with enabled ncurses is fixed in 1.9.0 now, so we can safely re-enable it. Signed-off-by: aszlig --- pkgs/os-specific/linux/conky/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 381cc44e36f..a75df8b531c 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, pkgconfig, libxml2, curl, wirelesstools, glib, openssl}: +{ stdenv, fetchurl, pkgconfig, libxml2, curl, wirelesstools, glib, openssl +, ncurses }: stdenv.mkDerivation rec { name = "conky-1.9.0"; @@ -10,9 +11,9 @@ stdenv.mkDerivation rec { patches = [ ./stdbool.patch ]; - buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ]; + buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ncurses ]; configureFlags = - (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" "ncurses" ]) + (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" ]) ++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss" ]); meta = { From 109fdfe34fd77687946d43e740ef24948e574bab Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 23:50:33 +0200 Subject: [PATCH 6/6] conky: Enable weather plugins. Those plugins do not require additional dependencis or at least no dependencies we don't actually use, so let's build them aswell. And after all, If you work in your hermetically sealed environment, you surely want to know what's going on outside. Signed-off-by: aszlig --- pkgs/os-specific/linux/conky/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index a75df8b531c..086b792b4cd 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ncurses ]; configureFlags = (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" ]) - ++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss" ]); + ++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss" + "weather-metar" "weather-xoap" ]); meta = { homepage = http://conky.sourceforge.net/;