Author: eelco
Date: Thu Jul 7 20:48:51 2011
New Revision: 27645
URL: https://svn.nixos.org/websvn/nix/?rev=27645&sc=1
Log:
* Start of KDE 4.7. Only kdelibs builds currently.
Added:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/
- copied from r27617, nixpkgs/trunk/pkgs/desktops/kde-4.5/
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kde-package/manifest-4.6.90.nix
- copied, changed from r27617,
nixpkgs/trunk/pkgs/desktops/kde-4.5/kde-package/manifest-4.5.5.nix
Deleted:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kde-package/manifest-4.5.5.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/support/attica/
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/support/polkit-qt-1/
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kde-package/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libs/default.nix
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Wed Jul 6 14:00:09
2011 (r27617)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Thu Jul 7
20:48:51 2011 (r27645)
@@ -2,7 +2,7 @@
let
- release = "4.5.5";
+ release = "4.6.90";
# Various packages (e.g. kdesdk) have been split up into many
# smaller packages. Some people may want to install the entire
@@ -26,17 +26,13 @@
phonon = null;
- kde = callPackage ./kde-package { inherit release; };
+ kde = callPackage ./kde-package { inherit release; stable = false; };
### SUPPORT
akonadi = callPackage ./support/akonadi { };
- attica = callPackage ./support/attica { };
-
oxygen_icons = callPackage ./support/oxygen-icons { };
- polkit_qt_1 = callPackage ./support/polkit-qt-1 { };
-
soprano = callPackage ./support/soprano { };
### LIBS
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kde-package/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/kde-package/default.nix Wed Jul 6
14:00:09 2011 (r27617)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kde-package/default.nix
Thu Jul 7 20:48:51 2011 (r27645)
@@ -1,9 +1,11 @@
-{ stdenv, fetchurl, release }:
+{ stdenv, fetchurl, release, stable ? true }:
rec {
inherit release;
+
+ stable_ = stable;
- defaultArgs = { name, stable ? true, version ? release, module ? name, ... }:
+ defaultArgs = { name, stable ? stable_, version ? release, module ? name,
... }:
(
{
Copied and modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kde-package/manifest-4.6.90.nix
(from r27617,
nixpkgs/trunk/pkgs/desktops/kde-4.5/kde-package/manifest-4.5.5.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/kde-package/manifest-4.5.5.nix Wed Jul
6 14:00:09 2011 (r27617, copy source)
+++
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kde-package/manifest-4.6.90.nix
Thu Jul 7 20:48:51 2011 (r27645)
@@ -1,82 +1,286 @@
[
{
- module = "kdeaccessibility";
- sha256 = "1vlm844jx0ggp236zl3wzzq3j2s8h9cd7cg1ajvsalpcab0dp088";
+ module = "blinken";
+ sha256 = "01pl05djzkp1i0f30zgzdlc1gbf116ah3k3rrsc1rj5k11r97gga";
}
{
- module = "kdeadmin";
- sha256 = "1dd725f1m9w1sm6fkhvsc7nkn7avk2lmkgqx183vjx1znxfpj9x3";
+ module = "cantor";
+ sha256 = "0vyb0h4bdxksc1kpgxn0s8bcn2j8kk2dj519jqf3bxps8fc5b9pp";
}
{
- module = "kdeartwork";
- sha256 = "1k22fhqch2s6ajfy906nxjhqw05a9lfibs7pdzgsrdxs5606jdyc";
+ module = "gwenview";
+ sha256 = "16jm0klq04sg1pmhmgmdkw0p7nxbdichzbz4g5rhwsd0qy2qagw5";
+}
+{
+ module = "kalgebra";
+ sha256 = "1m2jkzvk44557jd2mg7zjbsw0hslip4rqgsy0czw2dl8grplwlgj";
+}
+{
+ module = "kalzium";
+ sha256 = "0rbazz5izynk3m6kxsxfx0d99wg5k1n8lb3r57l9zpiq18z99xn5";
}
{
- module = "kdebase";
- sha256 = "07xk16r5cw1jzilkkg2kyff0nk7n0fxrawx0n7xn4mxpzqzgjvn6";
+ module = "kamera";
+ sha256 = "1vainjdr6kjwdh4fxkaq3kr8ljs51a973g2q86zac2x58j5nhm1v";
}
{
- module = "kdebase-runtime";
- sha256 = "0kz9s3i66fzxcklm95f7vqlx3jbgpj32gbg7nxy1iyaih01vz17j";
+ module = "kanagram";
+ sha256 = "0x1d151y7ssdzds6vfs0dnx6wndk1dbs2gv21rng8f2v1fdsdlcy";
}
{
- module = "kdebase-workspace";
- sha256 = "14c0v5bhb16syrk9hw340jb9fh48syclgnxiwzyfn7967gz9142d";
+ module = "kate";
+ sha256 = "0qa18mxhvxd14xrlnlz93r2js3ax3ykqk38a9fcbzna7x4a52f7p";
}
{
- module = "kdebindings";
- sha256 = "1iapya735cpdpdn5g8rw1m4r8jvr8kjpjbpxkhd7y750x3vjvykv";
+ module = "kbruch";
+ sha256 = "17wnrjkf2cm9jl4z6m4mbxygs23hnspr3cig541b6wfpg4q3chh2";
}
{
- module = "kdeedu";
- sha256 = "0agirfgx6fwm6j2hk7xzf589gikr5y4p3sqabjrk5i6wwqjsp651";
+ module = "kcolorchooser";
+ sha256 = "03sj7jmlc66ifri5wnrqqiwgrnam20284m3kpwcd2s11y4f0jawq";
+}
+{
+ module = "kdeaccessibility";
+ sha256 = "0kz8qc51dqi9yhnqsjfn8447iqrvzz0vqq32nr469hm45npshnzf";
+}
+{
+ module = "kdeadmin";
+ sha256 = "0w1naiy8nfgshsx0j03ma6frp2vxn6dakfv511pnlil8pngx40m9";
+}
+{
+ module = "kdeartwork";
+ sha256 = "1nck52rvjwkwcgg3dnyw7nwxcq54f0kxws5dcpf63vmksz2a8d5h";
+}
+{
+ module = "kde-baseapps";
+ sha256 = "1441ascv5skjy719r4rgk2zdb4y2laqjh1lf7imizc0xqmlxb18b";
}
{
module = "kdegames";
- sha256 = "10jrq5cd0fjjl5bpdqjckyx1g4clxdain3xy2gcw2f40b4yk0zi4";
+ sha256 = "0i25j0gak1xgx4ap5a93f8vvmlcgvrsihis95gp655h878n03b72";
}
{
- module = "kdegraphics";
- sha256 = "0k475fmfmr8z86qh9qsdik5jphdsaiw4kb580mn1r4zwsn1wq8dk";
+ module = "kdegraphics-strigi-analyzer";
+ sha256 = "0ab7kqmysilsw6yk74i8l2809ckmm6k0n8354df3vf2ffsgfi2br";
+}
+{
+ module = "kdegraphics-thumbnailers";
+ sha256 = "1zvc0bvk66krxpxrlf74kmg6y3d3ngmil36bpcv7i6jnrqfay15h";
}
{
module = "kdelibs";
- sha256 = "1yganq6m9zvf9l3cbdkgj1i4zrlq77qm3lf7nnqzpkyr6iq6sz1l";
+ sha256 = "0ri1gdcl1ag12yl7p6qzfmrn9djhah45wpycpvs86p1m6vwdm866";
}
{
module = "kdemultimedia";
- sha256 = "17ma5igdq8qmsmpx8lia7xpw68441via613qs42sbm2nhqg2rp46";
+ sha256 = "0g01zj8h8a2vqz8j45a99wlhi74hdixbid6h4bl6va0c0hn604yi";
}
{
module = "kdenetwork";
- sha256 = "1w97bb5z55kllzig528ap5dmilvjgqiazn8vkj180zwi1avixqpg";
+ sha256 = "19y73gfw4kcq91abdbhj1v3iq5f26ljac3xanh9dfm8fa5s5jy0v";
+}
+{
+ module = "kdepim";
+ sha256 = "05bzmyvvi9fb63f4cdcbcs1cfwvhzpnkcimqr3cjnnskjhhmrjiy";
}
{
module = "kdepimlibs";
- sha256 = "0immri4fvs9kxhaafk9i8zh630slayrd84wpwgvy1673mgxs4y4r";
+ sha256 = "11zsyrhirdx7v1cjrrigml5y2gw27s7ms0n3bjj6jfdh98ygi1hs";
+}
+{
+ module = "kdepim-runtime";
+ sha256 = "1p4yal2axs3035v48q0q8g9cb4bm37j9ban9rafqlh07dk1p4li7";
}
{
module = "kdeplasma-addons";
- sha256 = "13hhsbgfqxxh07zafy3zgky9bipyxysi5zpwmi7ljjj51n72z1wr";
+ sha256 = "0d6ilvj74i3hp9pcpfkwl46xj1hfi642cn0ad8h4s2abs35abkm5";
+}
+{
+ module = "kde-runtime";
+ sha256 = "18g60qdmhylw48gdgqhbknziyhcmr7ww5viarsjxnmk7hif1f2za";
}
{
module = "kdesdk";
- sha256 = "030m2gghaxgkg8hjrzzdkibmmf34zqimi8jw979sar7c9n5nrkkg";
+ sha256 = "1s3r9cdwyr3ys2a7waq3b4lcgf7l21bfpig7xpp2fyzndqz54w47";
}
{
module = "kdetoys";
- sha256 = "0q2cbsj2p16i0nd6swpayiq1w40l084cxvvkdqpzilkss8dcp0jf";
+ sha256 = "1a6spjiixazjln4wnaaqakb18if5d2rvlh0qiz24v3l356qh7wa9";
}
{
module = "kdeutils";
- sha256 = "057zmfyp4lz5i2hq7n80p6zi5bf39hz3rvi1wyyw35sga76j5fvw";
+ sha256 = "0ny0ic753q7gqmyn1ig33cl6m2lv8dh56xdb6pz7jcdj3szzg12h";
+}
+{
+ module = "kde-wallpapers";
+ sha256 = "08w5l3r01pjrf3n8rgfl319q3pk8kvbh96rs17shh85sahmhrd7k";
}
{
module = "kdewebdev";
- sha256 = "14k3dr9z53g98gxyzglbrmkbwgc63ifn11z0wfy2vxfrk4vhniip";
+ sha256 = "0d6jgb89sl7n621n25arw40acwsw9v382a28ghawsf3rsk8bjp02";
+}
+{
+ module = "kde-workspace";
+ sha256 = "1i2jlkp1hasxpwfp86hp3z4lggiazp20d4y0vga706xl94vjsacp";
+}
+{
+ module = "kgamma";
+ sha256 = "1ngxz74mmsm9b37lrb541yh1nsn70ca5x3rs5i8mk27rrps4b1p9";
+}
+{
+ module = "kgeography";
+ sha256 = "0s8px1qvdjdbcjxwq34gfbaap4c5fzas8q6ivjmxa7m8whfhkvyf";
+}
+{
+ module = "khangman";
+ sha256 = "11vcp28r9vjf291bqlah6mmdclfghzpnfpf78hcclbrd7b1wc29w";
+}
+{
+ module = "kig";
+ sha256 = "1nz4c4dq7a0q23hw2rwvivliw2s1l29p823a6hnq7sdrqqrid5mi";
+}
+{
+ module = "kimono";
+ sha256 = "10kcgaw79sdq27s1pglrbfdd0lalgyai0lanxd49x9gwcf1iigg5";
+}
+{
+ module = "kiten";
+ sha256 = "0hw6hv1pccdgvdhhs1gxskx393xl9aj22zhj183jrsimd87k1kga";
+}
+{
+ module = "klettres";
+ sha256 = "1h8v5smrdpi3x3vvsyylax19ykaipnixfgjdms97c84zsvz898gy";
+}
+{
+ module = "kmplot";
+ sha256 = "13v36pqxsdxc3x2yl807bcvbmyh48s9w77mgr9w2x4hn1l4ms3f0";
+}
+{
+ module = "kolourpaint";
+ sha256 = "1sc357lcnk7al92sj763bjhhyvc07cf1plbgy2xvhkcfp6b5l425";
+}
+{
+ module = "konsole";
+ sha256 = "0bi5b6lh0b388azcgrsmh45dflgxfln8d1qp8x2prsd85hi3v0bq";
+}
+{
+ module = "korundum";
+ sha256 = "1al9pq6vn14x28kkf1zmp1kfiq1z52hidy3jxnajv39ildja13y8";
+}
+{
+ module = "kross-interpreters";
+ sha256 = "0d8lna1m1qn6r8rdhrs39x1b98n0271asa75i4hzgz6xic6z8afy";
+}
+{
+ module = "kruler";
+ sha256 = "0kbkl7xbznxfa8pq7jicd7lh1469j87cnz1hf1vsj40lcb6hs7dj";
+}
+{
+ module = "ksaneplugin";
+ sha256 = "1mnna8jjjcvjrg7a9yg0mggbah44wyx24yzlkdgr7l4h4g0ka4bi";
+}
+{
+ module = "ksnapshot";
+ sha256 = "0hp07r7yv61chvhjw05q6acyd4hqlbk8bnbiy9nxaz4grsab1v54";
+}
+{
+ module = "kstars";
+ sha256 = "1aiwbbrcv7373hn8656bbja0jn71f5m36mdpwr5jflg4g2vh6inb";
+}
+{
+ module = "ktouch";
+ sha256 = "04msgkyy5ar4bqsc43dvjwlbj5mmvd7ajylg1lqni04qr01dibh3";
+}
+{
+ module = "kturtle";
+ sha256 = "1ay1dxrgrz3kdjmb2wms2y7jkarsis6jfszw2qc2i9zgzjh8b05b";
+}
+{
+ module = "kwordquiz";
+ sha256 = "05v6c2hi55phkcaqvamak8xii5fpwsf82h3y3499flpczrni6prb";
+}
+{
+ module = "libkdcraw";
+ sha256 = "1f02ymqdlawy053hq97phy328z829k2jqxs81gfyig7vbq1xf888";
+}
+{
+ module = "libkdeedu";
+ sha256 = "1d45mz3qkzxrv0ap4rs3zciczxmw3lfiai3cm74k98sxixwqpx9v";
+}
+{
+ module = "libkexiv2";
+ sha256 = "0jw5151rd23bxxqh2sg14mi5kvc5gm74aliiglbniiv7qgxn1mls";
+}
+{
+ module = "libkipi";
+ sha256 = "0w4wiikhqz88x7wbzmms0y7zxka7mpqq8vw61w89p3yl2x4qhmsn";
+}
+{
+ module = "libksane";
+ sha256 = "0czqijqz5l45mvydzvi0gmqx4sw77wirnh92dv2rc6bs34ik8i75";
+}
+{
+ module = "marble";
+ sha256 = "14lfr5rzj37wfp4chk1h54kslwph8pknkk6s82l1svm5naa7c3bf";
+}
+{
+ module = "mobipocket";
+ sha256 = "0qbcmwcrg306x0yrm783n640c0bdn0aq47jmgynr5327plvpqlsh";
+}
+{
+ module = "okular";
+ sha256 = "1kl7px5jzk33wsdhfh67s6zkip9zkgw50d23spqz021ynf8zx6vg";
}
{
module = "oxygen-icons";
- sha256 = "06vn8yn79kxll9f7gpsa7ihw6waj5qgz752zh9h8bycqc1m1i6nb";
+ sha256 = "1qz9c6d3m0lb20f1hb7bpgrfyv2rc0z4zkbhm51nr5p0p5m2mpdj";
+}
+{
+ module = "parley";
+ sha256 = "03nlfvy5cls51np77n4id0blkrpz31ad7vd2cilhsfws965lmi6a";
+}
+{
+ module = "perlkde";
+ sha256 = "06qggm4sxs8mlhmhrkxfjinvwi0m2vm2plxgz0l92rm7kbvr3g6l";
+}
+{
+ module = "perlqt";
+ sha256 = "00xa1g5n4jwncv73gjfc5hay9lfh94mx3amhpss0fmvzz2j3j1xk";
+}
+{
+ module = "pykde4";
+ sha256 = "1qns08xfj3yxrqhr2k1parmaphf7m0m4fks3s42mj30ksx6ayx2x";
+}
+{
+ module = "qtruby";
+ sha256 = "130dbr4c81zn53h6v79q6ffk3rsp4zzxa2qkzmml9236gswfbvkw";
+}
+{
+ module = "qyoto";
+ sha256 = "0dnvbjpmcflcpnyhp9ivn87iq7ff6ifp874ds34mzrk5yr48c9fn";
+}
+{
+ module = "rocs";
+ sha256 = "11fzfsip6jr4dxxznrxcx6pab6h83a0m2l5bccd1c72q3pjhsv42";
+}
+{
+ module = "smokegen";
+ sha256 = "0wnbsg2178rryx6jl9n6r73b5h9cgdhbhypfhq9w9javijlyrbbr";
+}
+{
+ module = "smokekde";
+ sha256 = "1jqwqpw0n60ll88i2i6wkw1kqpi8jcar6sjg0ayh0b3fvzgas4yn";
+}
+{
+ module = "smokeqt";
+ sha256 = "12q34lp4gs55svblqf12rh4fbzfh5r34mz1apnsfxwvv1anzvb9l";
+}
+{
+ module = "step";
+ sha256 = "0vbxag6dcc32y048sll42081xzh5sbi7r6rlv0ic75bpj7bj65b0";
+}
+{
+ module = "svgpart";
+ sha256 = "1c3kh3kj0dbps7vnz5a9lmqkimgdlmkhwdvcc2x74jwcnb4d5d3z";
}
]
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libs/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/default.nix Wed Jul 6
14:00:09 2011 (r27617)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libs/default.nix Thu Jul
7 20:48:51 2011 (r27645)
@@ -1,34 +1,42 @@
{ kde, gcc, cmake, perl
, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
-, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr,
shared_desktop_ontologies, libXScrnSaver
+, xz, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies,
libXScrnSaver
, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
-, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, hspell
+, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
+, getopt, udev
}:
kde.package {
- buildInputs = [
- cmake perl xz flex bison bzip2 pcre fam libxml2 libxslt shared_mime_info
- giflib jasper /*openexr*/ aspell avahi kerberos acl attr libXScrnSaver
- enchant libdbusmenu_qt polkit_qt_1 automoc4 hspell
- ];
-
-# TODO: make sonnet plugins (dictionaries) really work.
-# There are a few hardcoded paths.
-# Let kdelibs find openexr
-# Split plugins from libs?
+ buildInputs =
+ [ acl attr attica automoc4 avahi bzip2 cmake
+ enchant fam getopt giflib jasper libdbusmenu_qt libXScrnSaver libxslt
pcre perl perl polkit_qt_1
+ qt4 shared_mime_info strigi udev
+ xz
+ ];
+
+ #buildInputs = [
+ # cmake perl xz flex bison bzip2 pcre fam libxml2 libxslt shared_mime_info
+ # giflib jasper /*openexr*/ aspell avahi kerberos acl attr libXScrnSaver
+ # enchant libdbusmenu_qt polkit_qt_1 automoc4 hspell
+ #];
+
+ # TODO: make sonnet plugins (dictionaries) really work.
+ # There are a few hardcoded paths.
+ # Let kdelibs find openexr
+ # Split plugins from libs?
- propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2
- shared_desktop_ontologies ];
+ #propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2
+ # shared_desktop_ontologies ];
- patches = [ ./polkit-install.patch ];
+ #patches = [ ./polkit-install.patch ];
# cmake fails to find acl.h because of C++-style comment
- # TODO: OpenEXR, hspell
- cmakeFlags = ''
- -DHAVE_ACL_LIBACL_H=ON -DHAVE_SYS_ACL_H=ON
- -DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook
- -DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook
+ # TODO: OpenEXR
+ cmakeFlags =
+ ''
+ -DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook
+ -DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook
'';
meta = {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
