public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move kdevplatform and kdevelop to all-packages.nix

Browse Source 
svn path=/nixpkgs/trunk/; revision=24063
This commit is contained in:
Yury G. Kudryashov 2010-10-05 05:43:39 +00:00
parent b801c21d1f
commit 67b5d732a2
4 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/desktops/kde-4.4/extragear/kdevelop/default.nix → pkgs/applications/editors/kdevelop/default.nix
View File

@ -2,11 +2,13 @@
kdebase_workspace, gettext, perl }: kdebase_workspace, gettext, perl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kdevelop-4.0.0"; name = "${pname}-${version}";
version = "4.0.2";
pname = "kdevelop";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/kdevelop/4.0.0/src/${name}.tar.bz2"; url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
sha256 = "0cnwhfk71iksip17cjzf3g68n751k8fz2acin6qb27k7sh71pdfp"; sha256 = "1y8ydx0fcmsab31qf5id5r5fcmp3j2l8mibvbbjfy66xgxarmnpc";
}; };
buildInputs = [ kdevplatform cmake pkgconfig automoc4 shared_mime_info buildInputs = [ kdevplatform cmake pkgconfig automoc4 shared_mime_info

14
pkgs/desktops/kde-4.4/default.nix
View File

@ -235,17 +235,6 @@ pkgs.recurseIntoAttrs (rec {
inherit automoc4 phonon; inherit automoc4 phonon;
}; };
kdevelop = import ./extragear/kdevelop {
inherit (pkgs) stdenv fetchurl cmake pkgconfig shared_mime_info gettext perl;
inherit kdevplatform automoc4 kdebase_workspace;
};
kdevplatform = import ./extragear/kdevplatform {
inherit (pkgs) stdenv fetchurl cmake subversion qt4 perl gettext pkgconfig
apr aprutil boost;
inherit kdelibs automoc4 phonon;
};
kdesvn = import ./extragear/kdesvn { kdesvn = import ./extragear/kdesvn {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext apr aprutil subversion db4; inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext apr aprutil subversion db4;
inherit kdelibs; inherit kdelibs;
@ -277,7 +266,8 @@ pkgs.recurseIntoAttrs (rec {
inherit automoc4 phonon; inherit automoc4 phonon;
}; };
inherit (pkgs) konversation yakuake ktorrent koffice amarok; inherit (pkgs) konversation yakuake ktorrent koffice amarok kdevplatform
kdevelop;
gtk_qt_engine = import ./extragear/gtk-qt-engine { gtk_qt_engine = import ./extragear/gtk-qt-engine {
inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext; inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext;

6
pkgs/desktops/kde-4.4/extragear/kdevplatform/default.nix → pkgs/development/libraries/kdevplatform/default.nix
View File

@ -2,11 +2,11 @@
gettext, pkgconfig, apr, aprutil, boost }: gettext, pkgconfig, apr, aprutil, boost }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kdevplatform-1.0.0"; name = "kdevplatform-1.0.2";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/kdevelop/4.0.0/src/${name}.tar.bz2"; url = "mirror://kde/stable/kdevelop/4.0.2/src/${name}.tar.bz2";
sha256 = "05qgi5hwvzqzysihd5nrn28kiz0l6rp9dbxlf25jcjs5dml3dza6"; sha256 = "0yn4v3jx1dks84nvi7s40a1pmnvipqx5hlbvbmdgqhhpqik5y9qg";
}; };
propagatedBuildInputs = [ kdelibs subversion qt4 phonon ]; propagatedBuildInputs = [ kdelibs subversion qt4 phonon ];

4
pkgs/top-level/all-packages.nix
View File

@ -3118,6 +3118,8 @@ let
judy = callPackage ../development/libraries/judy { }; judy = callPackage ../development/libraries/judy { };
kdevplatform = newScope pkgs.kde4 ../development/libraries/kdevplatform { };
krb5 = callPackage ../development/libraries/kerberos/krb5.nix { }; krb5 = callPackage ../development/libraries/kerberos/krb5.nix { };
lablgtk = callPackage ../development/libraries/lablgtk { lablgtk = callPackage ../development/libraries/lablgtk {
@ -5797,6 +5799,8 @@ let
kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { }; kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { };
kdevelop = newScope pkgs.kde4 ../applications/editors/kdevelop { };
kermit = callPackage ../tools/misc/kermit { }; kermit = callPackage ../tools/misc/kermit { };
kino = import ../applications/video/kino { kino = import ../applications/video/kino {