From 29ddcdb5ad3d0c2951f07f9795728c45bda3da3a Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 10 Oct 2010 05:03:07 +0000 Subject: [PATCH] kdepim move svn path=/nixpkgs/trunk/; revision=24191 --- pkgs/desktops/kde-4.5/default.nix | 8 +- .../desktops/kde-4.5/kde-package/manifest.nix | 89 ++----------------- pkgs/desktops/kde-4.5/pim-runtime/default.nix | 23 +++-- .../kde-4.5/pim-runtime45/default.nix | 15 ++++ pkgs/desktops/kde-4.5/pim/default.nix | 29 ++++-- .../kde-4.5/{pim => pim45}/boost-1.44.diff | 0 pkgs/desktops/kde-4.5/pim45/default.nix | 18 ++++ 7 files changed, 80 insertions(+), 102 deletions(-) create mode 100644 pkgs/desktops/kde-4.5/pim-runtime45/default.nix rename pkgs/desktops/kde-4.5/{pim => pim45}/boost-1.44.diff (100%) create mode 100644 pkgs/desktops/kde-4.5/pim45/default.nix diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index 7ccbc75a0e3..7630d136a8f 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -133,12 +133,12 @@ kimagemapeditor = callPackage ./webdev/kimagemapeditor.nix { }; }; - kdepim_runtime = callPackage ../kde-4.4/pim-runtime { }; - kdepim = callPackage ../kde-4.4/pim { }; + kdepim_runtime = callPackage ./pim-runtime { }; + kdepim = callPackage ./pim { }; # Experimental 4.5 versions - kdepim_runtime45 = callPackage ./pim-runtime { }; - kdepim45 = callPackage ./pim { }; + kdepim_runtime45 = callPackage ./pim-runtime45 { }; + kdepim45 = callPackage ./pim45 { }; ### DEVELOPMENT kdebindings = callPackage ./bindings { }; diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix index edb8c8b77ee..688f2581950 100644 --- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix +++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix @@ -1,85 +1,5 @@ builtins.listToAttrs [ -{ - name = "kdegraphics-4.5.0.tar.bz2"; - value = "13ms1z26sb2pfadhagkykgnw0p7inrn36p4s9qr04qisy2b2vd6l"; -} -{ - name = "kdebase-workspace-4.5.0.tar.bz2"; - value = "0wwg2rcwgkwi0k1a7v6h0ibvzk64mb2fvr02zbdkc94rh4pc25zw"; -} -{ - name = "oxygen-icons-4.5.0.tar.bz2"; - value = "11wlrxnral4q5wi46p1di1cff4vr5da35a8dv2xx3ag6lnhqvjqi"; -} -{ - name = "kdeplasma-addons-4.5.0.tar.bz2"; - value = "1v0zcl65sqlz6ggin3mb6pr3gf2v15z8lyh0p4b95rslrzw6iih6"; -} -{ - name = "kdepimlibs-4.5.0.tar.bz2"; - value = "0n3wmc2c4jcxbi81i9jmw23b5ms43gia58qpr835im874641f54m"; -} -{ - name = "kdegames-4.5.0.tar.bz2"; - value = "1ax2qwmkpnc01prlkw5yx5hiqcv725b7yf6czr5gkjysjsqi3aqk"; -} -{ - name = "kdewebdev-4.5.0.tar.bz2"; - value = "0frl9kfw549lfxrjbslxny12r4cg67ggnyclhb0rqma7i07g8gd8"; -} -{ - name = "kdelibs-4.5.0.tar.bz2"; - value = "0d3iml2v1vp1y6i5vpqv77nbdlw6qb8j6c88yi744ba4zvcirzrx"; -} -{ - name = "kdebase-4.5.0.tar.bz2"; - value = "1znmmx84hx3a31lhr55j3h91p9r6fv1c4q9hbgv4xwaijlkxk6dw"; -} -{ - name = "kdeadmin-4.5.0.tar.bz2"; - value = "1zwc8x1r7wg1qddw01b5zr3npmzibag17csiv4a1w6fsnvnny8k1"; -} -{ - name = "kdebase-runtime-4.5.0.tar.bz2"; - value = "0cis9as2szqaxi0bhhw63sy6s8b994j8ffx5wsc84w4a8y3ld1s0"; -} -{ - name = "kdeedu-4.5.0.tar.bz2"; - value = "15c6k1274ckhs4liqyxna5xka2gn4h9qfdvbh9ys85x08srb3051"; -} -{ - name = "kdebindings-4.5.0.tar.bz2"; - value = "0x8c98gbp2rm3dckzw3l0jh2ch5g9sb2prmilwzl8d5psyhx39n6"; -} -{ - name = "kdemultimedia-4.5.0.tar.bz2"; - value = "0b00d9kgy7jcfrxivw4gjvqzp5gd145cd4zbhbnjjdg5l9pvc721"; -} -{ - name = "kdetoys-4.5.0.tar.bz2"; - value = "0lg12cjpk2x2qsk998jbsn0p7a26ans9zgf5966k4wmjcgx1zhqq"; -} -{ - name = "kdenetwork-4.5.0.tar.bz2"; - value = "0xc8309z5c7k3hg38waavrs2hlpv8mf20paj9nadr8q3zs0q6nyp"; -} -{ - name = "kdesdk-4.5.0.tar.bz2"; - value = "09w0n1v9qhxf7ijickw48s19rkaim36vnrxv28lrhj2x3s3s6n1s"; -} -{ - name = "kdeartwork-4.5.0.tar.bz2"; - value = "15sdhrq6hx4i0wywilvvl3h8j5wfa7lgvr8siqxlipy94pfwrbwr"; -} -{ - name = "kdeutils-4.5.0.tar.bz2"; - value = "1x4dwc193gsfcnryhkv2v3xafjr1a87ls0zfi56i1w2aj38b36l7"; -} -{ - name = "kdeaccessibility-4.5.0.tar.bz2"; - value = "0p08xn3rdqf4a9mj4wrvnjj64mbxas3pns772a1sdmpxkyjlwwcx"; -} { name = "polkit-qt-1-0.96.1.tar.bz2"; value = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr"; @@ -172,4 +92,11 @@ builtins.listToAttrs name = "kdeadmin-4.5.1.tar.bz2"; value = "011ajsma8s9ay0dsjx383jn8yynkyshlzx6gjw68caxzjhpc0ib2"; } -] +{ + name = "kdepim-4.4.6.tar.bz2"; + value = "0pymjjxg8qjiarcbs6saxkkb4n51qlfk4l0pwblhglsvgc4q3wjm"; +} +{ + name = "kdepim-runtime-4.4.6.tar.bz2"; + value = "1y0xxwsq9wlwbkd661i4f1iqvpzg3sbi3lq9dir45fjx406chgmd"; +}] diff --git a/pkgs/desktops/kde-4.5/pim-runtime/default.nix b/pkgs/desktops/kde-4.5/pim-runtime/default.nix index c5952120628..0bf30121923 100644 --- a/pkgs/desktops/kde-4.5/pim-runtime/default.nix +++ b/pkgs/desktops/kde-4.5/pim-runtime/default.nix @@ -1,15 +1,22 @@ -{ kde, cmake, kdelibs, qt4, kdepimlibs, akonadi, pkgconfig, boost, shared_mime_info, libxml2, shared_desktop_ontologies, soprano, strigi, automoc4, libxslt }: - -kde.package rec { - buildInputs = [ automoc4 cmake kdelibs qt4 kdepimlibs akonadi pkgconfig boost shared_mime_info shared_desktop_ontologies libxml2 soprano strigi libxslt ]; +{ kde, cmake, qt4, perl, libxml2, libxslt, boost, shared_mime_info +, kdelibs, kdepimlibs +, automoc4, phonon, akonadi, soprano, strigi}: +kde.package { + buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info + kdelibs kdepimlibs + automoc4 phonon akonadi soprano strigi ]; + prePatch = '' + find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@" + ''; meta = { - description = "Runtime files for KDE PIM: akonadi agents etc."; + description = "KDE PIM runtime"; + homepage = http://www.kde.org; + license = "GPL"; kde = rec { name = "kdepim-runtime"; - version = "4.4.93"; - subdir = "kdepim/${version}/src/src"; - stable = false; + version = "4.4.6"; + subdir = "kdepim-${version}/src"; }; }; } diff --git a/pkgs/desktops/kde-4.5/pim-runtime45/default.nix b/pkgs/desktops/kde-4.5/pim-runtime45/default.nix new file mode 100644 index 00000000000..c5952120628 --- /dev/null +++ b/pkgs/desktops/kde-4.5/pim-runtime45/default.nix @@ -0,0 +1,15 @@ +{ kde, cmake, kdelibs, qt4, kdepimlibs, akonadi, pkgconfig, boost, shared_mime_info, libxml2, shared_desktop_ontologies, soprano, strigi, automoc4, libxslt }: + +kde.package rec { + buildInputs = [ automoc4 cmake kdelibs qt4 kdepimlibs akonadi pkgconfig boost shared_mime_info shared_desktop_ontologies libxml2 soprano strigi libxslt ]; + + meta = { + description = "Runtime files for KDE PIM: akonadi agents etc."; + kde = rec { + name = "kdepim-runtime"; + version = "4.4.93"; + subdir = "kdepim/${version}/src/src"; + stable = false; + }; + }; +} diff --git a/pkgs/desktops/kde-4.5/pim/default.nix b/pkgs/desktops/kde-4.5/pim/default.nix index 821c03fe7e1..a551c4c405d 100644 --- a/pkgs/desktops/kde-4.5/pim/default.nix +++ b/pkgs/desktops/kde-4.5/pim/default.nix @@ -1,18 +1,29 @@ -{ kde, automoc4, cmake, kdelibs, akonadi, kdepimlibs, boost, zlib, strigi, - shared_desktop_ontologies, soprano, grantlee, libassuan, perl, libxslt }: +{ kde, cmake, perl, boost, gpgme, libassuan, libgpgerror, libxslt +, shared_mime_info, libXScrnSaver, kdelibs, kdepimlibs, kdepim_runtime +, automoc4, akonadi, qca2}: kde.package { - buildInputs = [ automoc4 cmake kdelibs akonadi kdepimlibs boost zlib strigi - shared_desktop_ontologies soprano grantlee libassuan perl libxslt ]; - - patches = [ ./boost-1.44.diff ]; + buildInputs = [ cmake boost gpgme libassuan libgpgerror libxslt + shared_mime_info libXScrnSaver kdelibs kdepimlibs automoc4 akonadi ]; + prePatch = '' + find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@" + ''; + postInstall = '' + mkdir -p $out/nix-support/ + echo ${akonadi} ${kdepimlibs} ${kdepim_runtime} > $out/nix-support/propagated-user-env-packages + ''; meta = { + description = "KDE PIM tools"; + longDescription = '' + Contains various personal information management tools for KDE, such as an organizer + ''; + license = "GPL"; + homepage = http://pim.kde.org; kde = rec { name = "kdepim"; - version = "4.4.93"; - subdir = "kdepim/${version}/src/src"; - stable = false; + version = "4.4.6"; + subdir = "kdepim-${version}/src"; }; }; } diff --git a/pkgs/desktops/kde-4.5/pim/boost-1.44.diff b/pkgs/desktops/kde-4.5/pim45/boost-1.44.diff similarity index 100% rename from pkgs/desktops/kde-4.5/pim/boost-1.44.diff rename to pkgs/desktops/kde-4.5/pim45/boost-1.44.diff diff --git a/pkgs/desktops/kde-4.5/pim45/default.nix b/pkgs/desktops/kde-4.5/pim45/default.nix new file mode 100644 index 00000000000..821c03fe7e1 --- /dev/null +++ b/pkgs/desktops/kde-4.5/pim45/default.nix @@ -0,0 +1,18 @@ +{ kde, automoc4, cmake, kdelibs, akonadi, kdepimlibs, boost, zlib, strigi, + shared_desktop_ontologies, soprano, grantlee, libassuan, perl, libxslt }: + +kde.package { + buildInputs = [ automoc4 cmake kdelibs akonadi kdepimlibs boost zlib strigi + shared_desktop_ontologies soprano grantlee libassuan perl libxslt ]; + + patches = [ ./boost-1.44.diff ]; + + meta = { + kde = rec { + name = "kdepim"; + version = "4.4.93"; + subdir = "kdepim/${version}/src/src"; + stable = false; + }; + }; +}