From ecea8900e7f7278b58d7604aa8a3d5a7ba65bc8f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 26 Jan 2012 08:36:28 +0000 Subject: [PATCH] KDE-4.8.0 svn path=/nixpkgs/trunk/; revision=31845 --- pkgs/desktops/kde-4.8/default.nix | 2 +- .../files/kde-wallpapers-buildsystem.patch | 17 + pkgs/desktops/kde-4.8/kde-package/4.8.0.nix | 299 ++++++++++++++++++ pkgs/desktops/kde-4.8/kde-wallpapers.nix | 9 +- pkgs/desktops/kde-4.8/oxygen-icons.nix | 2 +- 5 files changed, 324 insertions(+), 5 deletions(-) create mode 100644 pkgs/desktops/kde-4.8/files/kde-wallpapers-buildsystem.patch create mode 100644 pkgs/desktops/kde-4.8/kde-package/4.8.0.nix diff --git a/pkgs/desktops/kde-4.8/default.nix b/pkgs/desktops/kde-4.8/default.nix index d8bbdd860756..fd0cc516b137 100644 --- a/pkgs/desktops/kde-4.8/default.nix +++ b/pkgs/desktops/kde-4.8/default.nix @@ -1,7 +1,7 @@ { callPackage, callPackageOrig, stdenv, qt48 }: let - release = "4.7.97"; + release = "4.8.0"; # Need callPackageOrig to avoid infinite cycle kde = callPackageOrig ./kde-package { diff --git a/pkgs/desktops/kde-4.8/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.8/files/kde-wallpapers-buildsystem.patch new file mode 100644 index 000000000000..378cdb646940 --- /dev/null +++ b/pkgs/desktops/kde-4.8/files/kde-wallpapers-buildsystem.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3d3e247..f78db67 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,10 @@ +-find_package(KDE4 REQUIRED) +-include(KDE4Defaults) ++project(kde-wallpapers NONE) ++if( WALLPAPER_INSTALL_DIR ) ++ message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}") ++else() ++ find_package(KDE4 REQUIRED) ++ include(KDE4Defaults) ++endif() + + install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE) + diff --git a/pkgs/desktops/kde-4.8/kde-package/4.8.0.nix b/pkgs/desktops/kde-4.8/kde-package/4.8.0.nix new file mode 100644 index 000000000000..f2affd330958 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kde-package/4.8.0.nix @@ -0,0 +1,299 @@ +{stable=true; +hashes=builtins.listToAttrs[ + {name="analitza";value="080s52jr6qbag4v5z2yw6jps5r8am2vfw6g8lih7ipq2vhf9rzbp";} + {name="ark";value="1mvdalg45nn33bgfddqimv06b6l25ja0na2vvcfdmk1jxw7yzcr7";} + {name="blinken";value="0ajgh45y8p8db6yx36vrl6a81h7wylx074wv4lii28gqvgdb0qip";} + {name="cantor";value="16s03wjm7yz0fck754d1590g5n0nv4nsqf9da32nyjlivlp5vh9x";} + {name="filelight";value="1rsb5n3fx90f2ln2bxc7m2d6f7fg45f02ch0dapv2qkrzc2li4jf";} + {name="gwenview";value="1131nx5a95mshj55gqgixsh4lslk9rsl78pm98mydqsdqvlns8v0";} + {name="jovie";value="1bg64z3yxwi85pl0yimzbb7a7r9hjqpmplcjb6v3qp6mazymavin";} + {name="kaccessible";value="1dk9m2mmm553mx9jjmvg8qpvrkjzkbzy4gqk35yz33nkfdpcqdgb";} + {name="kactivities";value="1bk8prycvck4ad86d5pj77czrbwfl5s1a3iq7245i30wl0nkdpr6";} + {name="kalgebra";value="08azpq13wm8crgmwkvrhz77gzhywy6h079q36wffm1d0nr5r1f6x";} + {name="kalzium";value="00q8alp4kry9q21nf29w9mj19m4c108mdn3c8rfz55yyy6mkcr2p";} + {name="kamera";value="0lqw2zdc4vpdhgdg430b07gcd73kann4x054gbg3cgvrkjm2kw3x";} + {name="kanagram";value="0z37x65m8p01msl5zg3lqfzb09wali0wnl72rqr65rvzn2h52j08";} + {name="kate";value="01mqahcp0c7n90m734ky455nlrgciqg5ranp5bvffkw3zj0i6qx1";} + {name="kbruch";value="0z1602khvp1h1xc2d4vf6gxvr7slfq79n403gmqxy0a2qdnxdi8b";} + {name="kcalc";value="1q1j93ivq2p8dxz2lf9ylp3jh70136iy9l7n1k06y072kjamwcig";} + {name="kcharselect";value="0q67cngwyadks66a3imgw4iqkjinb7hdlgah0lx8gb2nn0pdk0n5";} + {name="kcolorchooser";value="0h909x9wiwlfk0bk5yjzdpd7x14rqbnz353svkraw54k1p73y4ga";} + {name="kdeadmin";value="1c23b54gia9829nblicys0vpb2lz3cya4s9h3637jsv0ksxql8jy";} + {name="kdeartwork";value="05bk1m8nz6m1px8fha82iwjs73yakjn5g0kmsplnxk2f8213r9v7";} + {name="kde-baseapps";value="1qrl4df3340iqshp54f2f2xqjzc87byvknjdhc9xx0npq8y8mn4w";} + {name="kdegames";value="1d0cw0ri9bcrk89ai1bx6cqw6jxa2f13bzf9qx8ychgcpmp7raqa";} + {name="kdegraphics-mobipocket";value="0mvqa4ln9gbpisqmdksmg3jizaxwwp3d45c97fg3pspybmj2mi4r";} + {name="kdegraphics-strigi-analyzer";value="1d6hf876ssql4zkvkwp34q73rd38c528i2xda35gd56rg9baszz9";} + {name="kdegraphics-thumbnailers";value="0arpazfah4v1db1bh1hf1qzv1mjgvgs9czm5bi8k28xsfm99yqzj";} + {name="kdelibs";value="17haj04m7af5xh92l5z6a42nscdgsw2cfkp50ikr6crqqr816967";} + {name="kdemultimedia";value="14678fbjban7yz89wqsrbyn050myh1py9d6d9811njvv1kjj56kb";} + {name="kdenetwork";value="1qyr9lx8hrw4dp27p72zwnhyiammiv69rydr2d9yajrl7b69ipz6";} + {name="kdepim";value="0n05hgzazc55s04kglv2bgjx1kri1pjf0rdy2y6lwfwqchzmnnz6";} + {name="kdepimlibs";value="0zl3pf7nhg21b999pbhhz3ppdr0n5y3gibws57r483zb9g6c8iq7";} + {name="kdepim-runtime";value="19whdvwjf56s2gq4ihvlxd761bvlzv8kagcvzdrhnrdapilf2l57";} + {name="kdeplasma-addons";value="0sq5mnzhnrzhlgw79mwr764gahqd1prj9gn41hxmlnmqd8mqfycw";} + {name="kde-runtime";value="0lx7qq78y8xlm3wmyms1zzj5z4wy1iw69pv1xknz6dnx5s3znx86";} + {name="kdesdk";value="0wy7li6agzbfhwza9zqbpfnmxigjilsf0cg47lnz9cc35k1ddq5r";} + {name="kdetoys";value="1rimzsjdj8ikvw97cjzdc7v6xcib7b9v7fvdff2rij6caqlqy9ha";} + {name="kde-wallpapers";value="0jf3fb33vlc1srwmyqhd19rjllyp4vjfs8hcp4yp1z6chf817x7m";} + {name="kdewebdev";value="0mssi6k2dxb2cszc43ffiw8n879ccyx0znr9lqvgn1xj6lbq0xd9";} + {name="kde-workspace";value="1vmv0kzh91lfa4kyvp111hf85fn2480rc4dhld26a7jck1arcsqi";} + {name="kdf";value="1ymaiy6mlq44c7cma4ka9214vb44sgd5qijhv8q6cc02i1n7pzij";} + {name="kfloppy";value="06jdskyfmcckyvmhh7h689j2pdrn10w3zafasssvibz9vs7ckk6h";} + {name="kgamma";value="18ywm3801vpi4lza5n23476irk3m3djf9cbya468kvs23m67604w";} + {name="kgeography";value="0dkb7riqbigak5bznfmq0l0pvacskcxjxwgnh2q9pzdsbax6g0y9";} + {name="kgpg";value="0b3pdv4xnlh6xg7vvr3vnzlcggrk8a9a8cq9lwwlzgjvhn2ljk7x";} + {name="khangman";value="0ykz88q3w527avjqq4zz9dbklkwhv3x52fk7x5bd352n3yvzc39g";} + {name="kig";value="0wkw2jngjc04g0ydc6rz6abnlqpi9l57yf9q6ad2xwavf8naawhh";} + {name="kimono";value="037l6d5g0zx7x52nd36rz9yylnpinpj7cgdw2laiczyq15r3w9wh";} + {name="kiten";value="0jnkw324plbp7h4ah75k98nai4vpw1nmsr4hg5cflzc2nqmvyigh";} + {name="klettres";value="0b9p5hlx3pk8h9p8z7y62mvx96k4blv73nmw7c7338apj0xk2xn7";} + {name="kmag";value="0hcy8y7y6w746p6ka30npsnmhwcr3s2263s7kspcm8k4xf43z51m";} + {name="kmousetool";value="1gqdsfzywj5iz8skn75nwa6gvzfzd4i3vma9c098pa508srachf8";} + {name="kmouth";value="1jijjpppr49za141fzq21bn7mgfp9z3vsyrrb8ik7v84zx4f46dk";} + {name="kmplot";value="0mzr4pf2z5j2b7af4rfrn5spzcb1nllk7zkn460izhmr5k59hrzl";} + {name="kolourpaint";value="1r2lcrfswm9mivmjwj37w9hkhl9zbmn7shrwl0xjgsdpkfqzd130";} + {name="konsole";value="1k1r85j72vbkxg0balj95d2b24gycbqlfp4632krkp98p27k9d3r";} + {name="korundum";value="1xy0gqms9fa0a48z1bwf0p6293q23fz4hyrm02b4c4bn08c2izp4";} + {name="kremotecontrol";value="05rmjq67bxssfyzc82ba1b77zv3nwmjyqf9qh43izj5vlf9cd0d5";} + {name="kross-interpreters";value="1dw5n6z29mlgc8x9za914ppd6f7maik9b61pn6m9b53rjcf3xx10";} + {name="kruler";value="1cw37khl676l1jqzm74bajdjzky0w43y4kidy7x5ycbm1bw1wqmj";} + {name="ksaneplugin";value="0vmamcmy8g9k63dm9vnbqhyjdalh8a0ypw8xc1wyanwnh3plvjxn";} + {name="ksecrets";value="0yb4dlg6spzgspg6ax9lhajzp201v5dblrldmbg0yja8w40vz4cb";} + {name="ksnapshot";value="0bwm48a22xm57zw0wznm9frslabzlrsl701krf4dggwvjgxjcz7f";} + {name="kstars";value="0swqj1pvlb2nmm8bfw00nna2m481545271hnpk5mhrmmxzmmdvs1";} + {name="ktimer";value="1isx067ccg5w95wlrs1z6xcc0qkdbr6ngi6i7qh7zb4f4v594gkg";} + {name="ktouch";value="1nggn0qw2wf86cgsy1hnk99f5zrfmw5x3gzwm9czpniyvh6w7yyv";} + {name="kturtle";value="0sb7pkx75i7dc0qg6kbb7hdjkfkkbbsadrvygk1rq5wmahh1piaw";} + {name="kwallet";value="0jizkaxa5y95h8fh07yfij89zw1jidr8ysgf71d8fmaswblqkv7f";} + {name="kwordquiz";value="02sdpr9jy738rhlmxllzpri1f6hmc9qb47fki8lb2wqiz5rr57j9";} + {name="libkdcraw";value="0xnb5ksydkvdcvagsfk5bksz2k2kwawjxl6v6pr0dld86d621051";} + {name="libkdeedu";value="11dnnfnxcc130qrmmr7kjafy2b91z3zh4k4sqsfq5v054kmr5vvc";} + {name="libkexiv2";value="1knn3igvpwc9knvb83yq2r05aax7pwv33khcjhhmxh55ms1kiz31";} + {name="libkipi";value="1pbrplwy8r58h04b96dil20a31bn14szz71siy1h3whn2qg3hda4";} + {name="libksane";value="19r6lnr92yp3v0w9rplggyfrnw19k1x2nwsvv7rhapwxqpqszpks";} + {name="marble";value="0bkihnkmzwqgq0fghb0qilhw2j66kkbal0nds0h4zgjml2mvf4kk";} + {name="okular";value="0hzj4rn9vdisq2v6lka6986slcb04h7s3svrgk9mh56l062vavsd";} + {name="oxygen-icons";value="1jwb95zscvqrj6g7a8kmzzywyq72wwldkkkf0klwczpd6kclzbf0";} + {name="parley";value="0ja3fahwc0dpfnabvpa1gsqqwqdb72wbvnl79m1asd7f7hlj9s1v";} + {name="perlkde";value="1nsaqp3pyyf8lpnnqw28h3gsg1f0dgbf1cavl1k00w997v6ih1k9";} + {name="perlqt";value="082fn1bgj5ws1df8ixnxj7z4n4x5b1mn8wfkszr33wgf9jf9sa7s";} + {name="printer-applet";value="0sx0rly7rlnvd6hcrnh8yn35r4vpx8lkvlfgjkqp5bksm3bc3ybd";} + {name="pykde4";value="1b00xswl5ixi84dk3c2c4wn4cywpj0bgmg57mhilq23r9dp38dwl";} + {name="qtruby";value="00qqhv2l7ad4qm2rwf7iw4f2vgz3slxvlmzsz1wd7j6m1z5n2zqr";} + {name="qyoto";value="0nhw0l0gn08h6fp3msfn5iq2q49pkmfi611a11nw1n3057ppiis0";} + {name="rocs";value="09a9jgb2088xp1z150zjr36nzsrxgzkqhvy2rxq8qj0ls7m2mcnn";} + {name="smokegen";value="1wp7kq7j3vgrnzj4g8fqmmhdg1nkkprnm6g25sn9zw9s0f4228l1";} + {name="smokekde";value="17sb2fpb84s15pza92ah3g1cbjyxjjpxb6ni2qjpin45llwdpz06";} + {name="smokeqt";value="0zdckhi52hjd5ajlzaas8ykcm5qh5yp48vrdh4cwvj8sv32bhbgd";} + {name="step";value="1ai50fc75ahbzac7ssvwhz81wg75w755pxx2w68ibplrw1qihrsh";} + {name="superkaramba";value="0gqg2g1h9h16wsfmw7875njdj2p0n51p03d0x10i2zajf9d34hhp";} + {name="svgpart";value="09zsdz69n08ifkq8f27av360zky4qpvrn234xnbyq48y0dcvjv2f";} + {name="sweeper";value="1wajv5jnx1nbckg6zrqy0imdrb8hb4nfb6xg2fs9rqx942c0bhzz";} +]; +modules=[ +{ + module="kdegraphics"; + split=true; + pkgs=[ + { name="gwenview"; } + { name="kamera"; } + { name="kcolorchooser"; } + { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; } + { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } + { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } + { name="kgamma"; } + { name="kolourpaint"; } + { name="kruler"; } + { name="ksaneplugin"; } + { name="ksnapshot"; } + { name="libkdcraw"; } + { name="libkexiv2"; } + { name="libkipi"; } + { name="libksane"; } + { name="okular"; } + { name="svgpart"; } + ]; +} +{ + module="kdeutils"; + split=true; + pkgs=[ + { name="ark"; } + { name="filelight"; } + { name="kcalc"; } + { name="kcharselect"; } + { name="kdf"; } + { name="kfloppy"; } + { name="kgpg"; } + { name="kremotecontrol"; } + { name="ksecrets"; } + { name="ktimer"; } + { name="kwallet"; } + { name="printer-applet"; sane="printer_applet"; } + { name="superkaramba"; } + { name="sweeper"; } + ]; +} +{ + module="kdeedu"; + split=true; + pkgs=[ + { name="analitza"; } + { name="blinken"; } + { name="cantor"; } + { name="kalgebra"; } + { name="kalzium"; } + { name="kanagram"; } + { name="kbruch"; } + { name="kgeography"; } + { name="khangman"; } + { name="kig"; } + { name="kiten"; } + { name="klettres"; } + { name="kmplot"; } + { name="kstars"; } + { name="ktouch"; } + { name="kturtle"; } + { name="kwordquiz"; } + { name="libkdeedu"; } + { name="marble"; } + { name="parley"; } + { name="rocs"; } + { name="step"; } + ]; +} +{ + module="kdebindings"; + split=true; + pkgs=[ + { name="kimono"; } + { name="korundum"; } + { name="kross-interpreters"; sane="kross_interpreters"; } + { name="perlkde"; } + { name="perlqt"; } + { name="pykde4"; } + { name="qtruby"; } + { name="qyoto"; } + { name="smokegen"; } + { name="smokekde"; } + { name="smokeqt"; } + ]; +} +{ + module="kdeaccessibility"; + split=true; + pkgs=[ + { name="jovie"; } + { name="kaccessible"; } + { name="kmag"; } + { name="kmousetool"; } + { name="kmouth"; } + ]; +} +{ + module="kde-baseapps"; +sane="kde_baseapps"; split=true; + pkgs=[ + { name="kate"; } + { name="kde-baseapps"; sane="kde_baseapps"; } + { name="konsole"; } + ]; +} +{ module="kactivities"; split=false;} +{ module="kdeadmin"; split=false; + pkgs=[ + { name="strigi-analyzer"; sane="strigi_analyzer";} + { name="kuser"; } + { name="kcron"; } + { name="ksystemlog"; } + { name="system-config-printer-kde"; sane="system_config_printer_kde";} + ]; + +} +{ module="kdeartwork"; split=false; + pkgs=[ + { name="ColorSchemes"; } + { name="IconThemes"; } + { name="emoticons"; } + { name="kscreensaver"; } + { name="kwin-styles"; sane="kwin_styles";} + { name="sounds"; } + { name="styles"; } + { name="wallpapers"; } + { name="HighResolutionWallpapers"; } + { name="WeatherWallpapers"; } + { name="desktopthemes"; } + { name="aurorae"; } + ]; + +} +{ module="kdegames"; split=false;} +{ module="kdelibs"; split=false;} +{ module="kdemultimedia"; split=false;} +{ module="kdenetwork"; split=false; + pkgs=[ + { name="kfile-plugins"; sane="kfile_plugins";} + { name="kget"; } + { name="kopete"; } + { name="krdc"; } + { name="kppp"; } + { name="krfb"; } + { name="kdnssd"; } + { name="filesharing"; } + ]; + +} +{ module="kdepim"; split=false;} +{ module="kdepimlibs"; split=false;} +{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} +{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} +{ module="kde-runtime"; sane="kde_runtime"; split=false;} +{ module="kdesdk"; split=false; + pkgs=[ + { name="cervisia"; } + { name="lokalize"; } + { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";} + { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; } + { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; } + { name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins/hg"; } + { name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins/bazaar"; } + { name="kcachegrind"; } + { name="kapptemplate"; } + { name="kpartloader"; } + { name="strigi-analyzer"; sane="strigi_analyzer";} + { name="kioslave"; } + { name="okteta"; } + { name="kmtrace"; } + { name="kompare"; } + { name="kprofilemethod"; } + { name="kstartperf"; } + { name="kuiviewer"; } + { name="poxml"; } + { name="scripts"; } + { name="umbrello"; } + ]; + +} +{ module="kdetoys"; split=false; + pkgs=[ + { name="kteatime"; } + { name="ktux"; } + { name="amor"; } + ]; + +} +{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} +{ module="kdewebdev"; split=false; + pkgs=[ + { name="klinkstatus"; } + { name="kfilereplace"; } + { name="kimagemapeditor"; } + { name="kommander"; } + ]; + +} +{ module="kde-workspace"; sane="kde_workspace"; split=false;} +{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} +]; +} diff --git a/pkgs/desktops/kde-4.8/kde-wallpapers.nix b/pkgs/desktops/kde-4.8/kde-wallpapers.nix index 97bfc1bfabf5..5de0caf4ba9e 100644 --- a/pkgs/desktops/kde-4.8/kde-wallpapers.nix +++ b/pkgs/desktops/kde-4.8/kde-wallpapers.nix @@ -1,12 +1,15 @@ -{ kde, kdelibs }: +{ kde, cmake }: kde { + buildNativeInputs = [ cmake ]; - buildInputs = [ kdelibs ]; + patches = [ ./files/kde-wallpapers-buildsystem.patch ]; + + cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers"; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "101v30x8sw96mq43hs7wzppjc8xhh2wn4qpqbi3nxrb16fw6svad"; + outputHash = "208ebe74f3ffc83fc51cd1197ceb2c5b8b8de8f33fab86b760bfc41d31c2aab6"; meta = { description = "Wallpapers for KDE"; diff --git a/pkgs/desktops/kde-4.8/oxygen-icons.nix b/pkgs/desktops/kde-4.8/oxygen-icons.nix index 6297a55df764..7896e804aa9d 100644 --- a/pkgs/desktops/kde-4.8/oxygen-icons.nix +++ b/pkgs/desktops/kde-4.8/oxygen-icons.nix @@ -3,7 +3,7 @@ kde { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "ca03ee0a7bbd35ee70f84d32b6f861ee8c019473f16c6ecf6309885317bcfe51"; + outputHash = "dec510cb1dd47d4254e97021964dcbdcfe4541368a0694ee986666ff745b6860"; buildNativeInputs = [ cmake ];