From f6938b8469168bdd07fa9c00b5ede3d857a62e9a Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 9 Apr 2009 12:16:58 +0000 Subject: [PATCH 1/6] Added Amarok player for KDE 4.2 svn path=/nixpkgs/trunk/; revision=14963 --- pkgs/desktops/kde-4.2/default.nix | 8 +++++++ .../kde-4.2/extragear/amarok/builder.sh | 9 ++++++++ .../kde-4.2/extragear/amarok/default.nix | 14 +++++++++++ .../libraries/loudmouth/default.nix | 23 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 44 insertions(+), 12 deletions(-) create mode 100644 pkgs/desktops/kde-4.2/extragear/amarok/builder.sh create mode 100644 pkgs/desktops/kde-4.2/extragear/amarok/default.nix diff --git a/pkgs/desktops/kde-4.2/default.nix b/pkgs/desktops/kde-4.2/default.nix index 4e24259d874..5ce7d2390e2 100644 --- a/pkgs/desktops/kde-4.2/default.nix +++ b/pkgs/desktops/kde-4.2/default.nix @@ -176,4 +176,12 @@ rec { inherit kdelibs kdepimlibs; inherit automoc4 phonon; }; + +#### EXTRA GEAR + + amarok = import ./extragear/amarok { + inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext curl mysql libxml2 taglib loudmouth; + inherit kdelibs; + inherit automoc4 phonon strigi soprano; + }; } diff --git a/pkgs/desktops/kde-4.2/extragear/amarok/builder.sh b/pkgs/desktops/kde-4.2/extragear/amarok/builder.sh new file mode 100644 index 00000000000..c19ba33ffcf --- /dev/null +++ b/pkgs/desktops/kde-4.2/extragear/amarok/builder.sh @@ -0,0 +1,9 @@ +source $stdenv/setup + +myPatchPhase() +{ + sed -i -e "s|/usr|$loudmouth|g" cmake/modules/FindLoudmouth.cmake + sed -i -e "s|/usr|$mysql|g" cmake/modules/FindMySQLAmarok.cmake +} +patchPhase=myPatchPhase +genericBuild diff --git a/pkgs/desktops/kde-4.2/extragear/amarok/default.nix b/pkgs/desktops/kde-4.2/extragear/amarok/default.nix new file mode 100644 index 00000000000..a631149beb5 --- /dev/null +++ b/pkgs/desktops/kde-4.2/extragear/amarok/default.nix @@ -0,0 +1,14 @@ +{stdenv, fetchurl, cmake, qt4, perl, gettext, curl, libxml2, mysql, taglib, loudmouth, + kdelibs, automoc4, phonon, strigi, soprano}: + +stdenv.mkDerivation { + name = "amarok-2.0.2"; + src = fetchurl { + url = mirror://kde/stable/amarok/2.0.2/src/amarok-2.0.2.tar.bz2; + md5 = "98b78372ec6ea3432faba356c90c6dbe"; + }; + inherit mysql loudmouth; + builder = ./builder.sh; + buildInputs = [ cmake qt4 perl stdenv.gcc.libc gettext curl libxml2 mysql taglib loudmouth + kdelibs automoc4 phonon strigi soprano ]; +} diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index 87d613efd30..c711e8a0ddf 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -1,14 +1,15 @@ -args: with args; -stdenv.mkDerivation rec { - name = "loudmouth-1.3.3"; +{stdenv, fetchurl, gnutls, libidn, glib, pkgconfig, zlib}: - src = fetchurl { - url = "http://ftp.imendio.com/pub/imendio/loudmouth/src/${name}.tar.bz2"; - sha256 = "0f3xpp3pf5bxcp0kcmqa0g28vfl5gg8mj0hxhs2cx75hwgikd26x"; - }; +stdenv.mkDerivation { + name = "loudmouth-1.4.3"; + + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/sources/loudmouth/1.4/loudmouth-1.4.3.tar.bz2; + md5 = "55339ca42494690c3942ee1465a96937"; + }; + + propagatedBuildInputs = [gnutls libidn glib zlib]; + buildInputs = [pkgconfig]; - propagatedBuildInputs = [gnutls libidn glib]; - buildInputs = [pkgconfig]; - - configureFlags = "--enable-shared --disable-static"; + configureFlags = "--enable-shared --disable-static"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a0969e7e6a..4d1471f3124 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3649,7 +3649,7 @@ let }; loudmouth = import ../development/libraries/loudmouth { - inherit fetchurl stdenv libidn gnutls pkgconfig; + inherit fetchurl stdenv libidn gnutls pkgconfig zlib; inherit (gtkLibs) glib; }; From 4dba9f26d6dd94ff82b4c7d9dc7b6801b1abd28c Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 9 Apr 2009 12:17:40 +0000 Subject: [PATCH 2/6] Added amarok to buildfarm svn path=/nixpkgs/trunk/; revision=14964 --- pkgs/top-level/release.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index fe08bdf72ac..f4f5a3274b3 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -331,6 +331,7 @@ in { }; kde42 = { + amarok = linux; kdeadmin = linux; kdeartwork = linux; kdebase = linux; From 06d17bced699260289db3a9e1e35d5cee82c7a1e Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 9 Apr 2009 12:54:39 +0000 Subject: [PATCH 3/6] Added ktorrent for KDE4 package svn path=/nixpkgs/trunk/; revision=14967 --- pkgs/desktops/kde-4.2/default.nix | 6 ++++++ pkgs/top-level/release.nix | 1 + 2 files changed, 7 insertions(+) diff --git a/pkgs/desktops/kde-4.2/default.nix b/pkgs/desktops/kde-4.2/default.nix index 5ce7d2390e2..6dc5ac795f7 100644 --- a/pkgs/desktops/kde-4.2/default.nix +++ b/pkgs/desktops/kde-4.2/default.nix @@ -184,4 +184,10 @@ rec { inherit kdelibs; inherit automoc4 phonon strigi soprano; }; + + ktorrent = import ./extragear/ktorrent { + inherit (pkgs) stdenv fetchurl cmake qt4 perl gmp taglib boost gettext; + inherit kdelibs kdepimlibs kdebase_workspace; + inherit automoc4 phonon qca2; + }; } diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index f4f5a3274b3..c71c853eec3 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -349,6 +349,7 @@ in { kdetoys = linux; kdeutils = linux; kdewebdev = linux; + ktorrent = linux; }; kernelPackages_2_6_26 = { From c9e2b006443c2c2287de29652d95399ed6e1fe4b Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 9 Apr 2009 12:58:44 +0000 Subject: [PATCH 4/6] Added ktorrent package svn path=/nixpkgs/trunk/; revision=14968 --- .../kde-4.2/extragear/ktorrent/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 pkgs/desktops/kde-4.2/extragear/ktorrent/default.nix diff --git a/pkgs/desktops/kde-4.2/extragear/ktorrent/default.nix b/pkgs/desktops/kde-4.2/extragear/ktorrent/default.nix new file mode 100644 index 00000000000..fc7a3cbe97d --- /dev/null +++ b/pkgs/desktops/kde-4.2/extragear/ktorrent/default.nix @@ -0,0 +1,14 @@ +{stdenv, fetchurl, cmake, qt4, perl, gmp, taglib, boost, gettext, + kdelibs, kdepimlibs, kdebase_workspace, automoc4, phonon, qca2}: + +stdenv.mkDerivation { + name = "ktorrent-3.2.1"; + src = fetchurl { + url = http://ktorrent.org/downloads/3.2.1/ktorrent-3.2.1.tar.bz2; + sha256 = "e37324519fdd04cad2a489fb772cbe628d8ff9f578e2bb913b18a1404dd7c4eb"; + }; + CMAKE_PREFIX_PATH=kdepimlibs; + cmakeFlags = "-DTASKMANAGER_INCLUDE_DIR=${kdebase_workspace}/include"; + buildInputs = [ cmake qt4 perl gmp taglib boost gettext stdenv.gcc.libc + kdelibs kdepimlibs kdebase_workspace automoc4 phonon qca2 ]; +} From 0abae1cd12ea3844338c7ac9bc92e63c311d4797 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 9 Apr 2009 13:32:46 +0000 Subject: [PATCH 5/6] Added kdesvn package svn path=/nixpkgs/trunk/; revision=14970 --- pkgs/desktops/kde-4.2/default.nix | 6 ++++++ pkgs/desktops/kde-4.2/extragear/kdesvn/builder.sh | 8 ++++++++ pkgs/desktops/kde-4.2/extragear/kdesvn/default.nix | 13 +++++++++++++ pkgs/top-level/release.nix | 1 + 4 files changed, 28 insertions(+) create mode 100644 pkgs/desktops/kde-4.2/extragear/kdesvn/builder.sh create mode 100644 pkgs/desktops/kde-4.2/extragear/kdesvn/default.nix diff --git a/pkgs/desktops/kde-4.2/default.nix b/pkgs/desktops/kde-4.2/default.nix index 6dc5ac795f7..7b444690e40 100644 --- a/pkgs/desktops/kde-4.2/default.nix +++ b/pkgs/desktops/kde-4.2/default.nix @@ -185,6 +185,12 @@ rec { inherit automoc4 phonon strigi soprano; }; + kdesvn = import ./extragear/kdesvn { + inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext apr aprutil subversion db4; + inherit kdelibs; + inherit automoc4 phonon; + }; + ktorrent = import ./extragear/ktorrent { inherit (pkgs) stdenv fetchurl cmake qt4 perl gmp taglib boost gettext; inherit kdelibs kdepimlibs kdebase_workspace; diff --git a/pkgs/desktops/kde-4.2/extragear/kdesvn/builder.sh b/pkgs/desktops/kde-4.2/extragear/kdesvn/builder.sh new file mode 100644 index 00000000000..ed3b06c00c8 --- /dev/null +++ b/pkgs/desktops/kde-4.2/extragear/kdesvn/builder.sh @@ -0,0 +1,8 @@ +source $stdenv/setup + +myPatchPhase() +{ + sed -i -e "s|/usr|$subversion|g" src/svnqt/cmakemodules/FindSubversion.cmake +} +patchPhase=myPatchPhase +genericBuild diff --git a/pkgs/desktops/kde-4.2/extragear/kdesvn/default.nix b/pkgs/desktops/kde-4.2/extragear/kdesvn/default.nix new file mode 100644 index 00000000000..407b84f9989 --- /dev/null +++ b/pkgs/desktops/kde-4.2/extragear/kdesvn/default.nix @@ -0,0 +1,13 @@ +{stdenv, fetchurl, cmake, qt4, perl, gettext, apr, aprutil, subversion, db4, + kdelibs, automoc4, phonon}: + +stdenv.mkDerivation { + name = "kdesvn-1.2.4"; + src = fetchurl { + url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.2.4.tar.bz2; + sha256 = "aa81addf5f86b4c59026debc555d7aac783002331942847c32d2feb277a81620"; + }; + builder = ./builder.sh; + inherit subversion; + buildInputs = [ cmake qt4 perl gettext apr aprutil subversion db4 kdelibs automoc4 phonon ]; +} diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index c71c853eec3..34c31f56942 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -350,6 +350,7 @@ in { kdeutils = linux; kdewebdev = linux; ktorrent = linux; + kdesvn = linux; }; kernelPackages_2_6_26 = { From a1540b57aeb7fb505a26d9a9085371be4c254d23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 9 Apr 2009 13:51:39 +0000 Subject: [PATCH 6/6] GNU Zile 2.3.6. svn path=/nixpkgs/trunk/; revision=14971 --- pkgs/applications/editors/zile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 7ac4e1f6185..a968f7fa498 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, ncurses, help2man }: stdenv.mkDerivation rec { - name = "zile-2.3.4"; + name = "zile-2.3.6"; src = fetchurl { url = "mirror://gnu/zile/${name}.tar.gz"; - sha256 = "1m20j5plpbx7rbk9rw3jsirip5gja5n8amqvg4mqs3pb28isx1fx"; + sha256 = "0p5jij6fknj88ipk4fqw6wpr0ib1b4ycal0psjglf5jyrmzln9jm"; }; buildInputs = [ ncurses help2man ];