Author: urkud
Date: Thu Mar 8 06:53:44 2012
New Revision: 32874
URL: https://nixos.org/websvn/nix/?rev=32874&sc=1
Log:
KDE-4.8.1
* Switch to .tar.xz.
* Update fixed-output derivations hashes.
* Add kde-base-artwork (ksplashx themes)
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.8/files/kde-base-artwork-nokde.patch
nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-base-artwork.nix
nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-package/4.8.1.nix
nixpkgs/trunk/pkgs/desktops/kde-4.8/l10n/manifest-4.8.1.nix
Deleted:
nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-package/4.8.0.nix
nixpkgs/trunk/pkgs/desktops/kde-4.8/l10n/manifest-4.8.0.nix
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.8/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-package/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh
nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-wallpapers.nix
nixpkgs/trunk/pkgs/desktops/kde-4.8/l10n/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.8/l10n/l10n-manifest.sh
nixpkgs/trunk/pkgs/desktops/kde-4.8/oxygen-icons.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.8/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.8/default.nix Thu Mar 8 05:45:23
2012 (r32873)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/default.nix Thu Mar 8 06:53:44
2012 (r32874)
@@ -1,7 +1,7 @@
{ callPackage, callPackageOrig, stdenv, qt48 }:
let
- release = "4.8.0";
+ release = "4.8.1";
# Need callPackageOrig to avoid infinite cycle
kde = callPackageOrig ./kde-package {
Added: nixpkgs/trunk/pkgs/desktops/kde-4.8/files/kde-base-artwork-nokde.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/files/kde-base-artwork-nokde.patch
Thu Mar 8 06:53:44 2012 (r32874)
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 04d2142..294b9a8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-find_package(KDE4 REQUIRED)
+-include(KDE4Defaults)
++if(NOT DATA_INSTALL_DIR)
++ find_package(KDE4 REQUIRED)
++ include(KDE4Defaults)
++endif()
+
+ add_subdirectory( ksplashx-themes )
Added: nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-base-artwork.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-base-artwork.nix Thu Mar 8
06:53:44 2012 (r32874)
@@ -0,0 +1,17 @@
+{ kde, cmake }:
+
+kde {
+ buildNativeInputs = [ cmake ];
+
+ patches = [ ./files/kde-base-artwork-nokde.patch ];
+
+ cmakeFlags = "-DDATA_INSTALL_DIR=share";
+
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash =
"2ab8942ba6813c21859077faa2c9fea88ec9a2d7af73bb5911cc4edbe1a04a04";
+
+ meta = {
+ description = "KDE KSplashx themes";
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-package/4.8.1.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-package/4.8.1.nix Thu Mar 8
06:53:44 2012 (r32874)
@@ -0,0 +1,301 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+
{name="analitza";value="0hz8bryfxbf0ri0572drf79v582pjbhyag076nr7k80cbsvgcb95";}
+ {name="ark";value="1l5jrhj303fcbn34zpgcczajaknrj3ynqqw1kfsdz2jzan7pi620";}
+
{name="blinken";value="04dk6kdigmbaysi3q5f6qgy1aqigflf465np5waav9ydm6yfx9xr";}
+ {name="cantor";value="0gz338d5vi89i9c6r8lcrkvm3a0fi7kjfp5ql530p70rmyj0h4g5";}
+
{name="filelight";value="0fqxpx7zm6x601ph1n46mamwpgiffbkv5vqyy06z5cb6hbhip3g5";}
+
{name="gwenview";value="0f1knjmg2k5g0nikz4jxhf5d8ipp6qc6aw34yi0zanyg3h3jicql";}
+ {name="jovie";value="116yr8hhc18fl176lv8pqz1qjah7rlzavx7kcxq6ghvmaiv0yfxr";}
+
{name="kaccessible";value="167x5cmzspsriim8162lf361xs3g9ancfy88arwlvp5kwrs61ply";}
+
{name="kactivities";value="04sz2rjs15p2yhi9wchdkiclcc4pgd3bpsi20kcnnn5jwx2rvgim";}
+
{name="kalgebra";value="11fisig1zay8kb2i4sr4sba7889np3qbg46l823a89v7rwm6qc32";}
+
{name="kalzium";value="0n63s85y3ddr93wiyhhrfg3h2nv68f7rzfxdd200y0gjrkfb1yxs";}
+ {name="kamera";value="1fv1zr5zfs68yd09lg2gapha9cjh7lljvyrrcmhyn7yjkz2kn7r0";}
+
{name="kanagram";value="00h9ljx518sp950wc8h40c2qn1xh3499isy8hm1danal1y3m3n2v";}
+ {name="kate";value="0d35mydj6fzzjzk2qm6amlpb6hdg46cf1iqp52fj7d3i7vhwvzz7";}
+ {name="kbruch";value="1d9n2pbimkq56a0sc1khh8zvnaf84c1r9s96qs71nv93ka3248qw";}
+ {name="kcalc";value="11bailcjvlx7ggjj7jahh3l1p85w7s3wp1001cchm36qdmisbhyg";}
+
{name="kcharselect";value="10fzkh142b7k5rvar200zzpds6pgjbz3rapa7l8hcxpcgb9fxqvf";}
+
{name="kcolorchooser";value="04h8g2g47780jcrbnwdjivgkxb6sabqr2hr57dlycw7lsmxfj2v3";}
+
{name="kdeadmin";value="11fndxajknxwsshrmxa4hsbx8ycysbcq8kc4p0zqq508s9z0p4wf";}
+
{name="kdeartwork";value="0g3s1cn9w0mkrcwg8f6qc3v8iy3qxf1mkj8jaqdh98c7k8q906m9";}
+
{name="kde-baseapps";value="0gdfiw6bjhijvp8jf5ny8979km0fabjs6jp8fqdqnb0ybc6yi3sh";}
+
{name="kde-base-artwork";value="0qd1yc1g8wzi01hmrwfbyp80drk42k3h5g46hzk3y81pb3gg5490";}
+
{name="kdegames";value="0jbvr9baspdh7z9gxjhbz316097c99wkvhiniwx8wfbrj3nfsvkx";}
+
{name="kdegraphics-mobipocket";value="03gx1y9xdrc5imbc5hb3r17i693vgfcix4slm8i7xs7fz3f9x6jx";}
+
{name="kdegraphics-strigi-analyzer";value="0g674b0ba0bmgnaq8qspasbw40r7i60s0n27imh3f46isj34w0d2";}
+
{name="kdegraphics-thumbnailers";value="01a79779hjv19q3fxmwr05flcz75fpmivjysv3bj32jz72f4fk79";}
+
{name="kdelibs";value="1v2zkj76bf62fl3ykzx6r24c37amf2a8v1qrvhi2ibq7g7nfnasa";}
+
{name="kdemultimedia";value="0656135yq3d9j9hc974bm6zqszcq3prllhk7dfxd9wxkyf1jbifq";}
+
{name="kdenetwork";value="00f9284y2rb0b0f8j9a17kn8i1k7zdm8nypxf6hg51zphn91hnib";}
+ {name="kdepim";value="0fvvnab971k2a9gaavf17k7hvvz4n6dyrx9q0w9af821pf77asbm";}
+
{name="kdepimlibs";value="1jzw9ad5bzhcpfjgmqfzk8hjj8g6ivm7y31psckhgcasni7lv4hx";}
+
{name="kdepim-runtime";value="1k0hnmg73i02f5pddpva47mnfnnl9ydsdycnb4kaslyv8lzb7p19";}
+
{name="kdeplasma-addons";value="178y3h8j1nn0j421rp49b9q7jphhhrqd37y4jcisx37lky8dgdmb";}
+
{name="kde-runtime";value="06y5g7vfwdfin6xyia0j5flk5bbwa82ki3lnaz9zz4sz0x8swb8z";}
+ {name="kdesdk";value="1q4rcm7zagam44dr07mjr08drmncfk1w50kia159kgsx74n0rsqp";}
+
{name="kdetoys";value="0i49zvq2h2md4xmbzbw9s23yd3y7vmbp6y7b121j1pv9v8jkpa8c";}
+
{name="kde-wallpapers";value="131j2217c50addi02qldyx83y8afxwqaazldmvbfbk5ampkszkwr";}
+
{name="kdewebdev";value="1yjibwk4nihrwzbcz8bmylx0paprklgxkky9iy86pp20a4ndzy2x";}
+
{name="kde-workspace";value="1czlxxnldarp45yl2n5yin298rs8zdwjl9bzm55l5x27xaw5zlfq";}
+ {name="kdf";value="1gs57qnrhnxq8xbypn9dp8rpk9xz1rv29d4l0n23fbnhfw42fzw9";}
+
{name="kfloppy";value="09v7zv0s93qmir3vlkh4vf45v11k92jd6cv6j14hmgx3lpr289yj";}
+ {name="kgamma";value="169d2rjk45zr1a58fnn81myydzj1pjxjfglk3lyd9g21mwka8nng";}
+
{name="kgeography";value="087cz0wm2pfrh803kc8a0hh6nhk82w42fchpll0bv953adqi2dww";}
+ {name="kgpg";value="1mghmnjpy8jzzp43bg6z1nqlyir22wsa2nz7bpzigc1zv7i85pf9";}
+
{name="khangman";value="11m1s9rzlvg5p7wzy1zlgm3f743k4m7jfwv08g82mk3k9dcqnbq7";}
+ {name="kig";value="1kd042d7v56daxjwvvi026kh3bi7p8prxf5a3rpdmnbr2awd8qb6";}
+ {name="kimono";value="00vif9dmlp1lmv3fyjacd4jp8w84kq3fxsmsv72fbvxs66pa3a9y";}
+ {name="kiten";value="0xl1pqb5la2cnpi39npyal65yrqf87nqkxcbxli4ynw37k1x95pm";}
+
{name="klettres";value="0g1wryfhbaphmhkj3nisfgadray1nnrn3m1fd5rq774rhk7rnlfr";}
+ {name="kmag";value="12cfx5mj22lwbqnmd8sbjyfxxmgnql4q2hmgj4hx7izfl91zw4fb";}
+
{name="kmousetool";value="0ynr2zdxmisvs1jancisc0a2djap345b2bhp8dpssx48pxbf72r0";}
+ {name="kmouth";value="06wnsgrirdnk9h2vdxhfkcvf950hhryzg8qmwpm4pg53gsqfm3sb";}
+ {name="kmplot";value="0yr7mgcbr54djk521g5mxj87slps41473rfmf8hv0rbymnv5qfmf";}
+
{name="kolourpaint";value="148sp5bzkrlaq6mnh4996zm52m0jncbrldd93qkpbms1b0qpx0fk";}
+
{name="konsole";value="1lcj9bbfmyw2bv9cvhfsv9fk3szgvd2kmmrxsf3r1hcb6a1x3ab5";}
+
{name="korundum";value="0dfkl5wya041yrq9zhbrfklzlc41kp19icn34bjsgin4gfw2bds1";}
+
{name="kremotecontrol";value="05pzq3n5a75ccdznrw93ic0gadh24r9bjl9cdz8caj1skhyyzqcg";}
+
{name="kross-interpreters";value="1ix67rcyxqyaacfkmx3nccy2pyirsx0ykc4lycjhv5d7zlc2682c";}
+ {name="kruler";value="1k73wm2lca3p9x504il73sk5k21fm8f57m5a8d46cp5xh3hcyz54";}
+
{name="ksaneplugin";value="1zwmzl4bqmjnvbapcdy60avydgbidrhr87q4cb79wbqbif8g3941";}
+
{name="ksecrets";value="1b4ld8snnw42yg54sndlrv9j1rjryxlsbx6pdjwsrg35x4cf3l8x";}
+
{name="ksnapshot";value="1c64igffxz9lgl6izqxi9j5ahpcl34gm06i5bz42mwgwffsyqdkk";}
+ {name="kstars";value="0ids1mpscvrcdjjns6pvishr16ack160q6bp628sw53gx6f0cf3i";}
+ {name="ktimer";value="0zqwnjpql6qan6z2dlb9y3irs3785cnav6zcpnxrgi0i5n0v4kyx";}
+ {name="ktouch";value="0r050awybjz5cjcjy8ivj0h8f95m1mqqcrvpg0gk07fphs68i2na";}
+
{name="kturtle";value="0bdyyf0dfwmqc42d7xx82bkaygj2znzxbidwfza1w9lzizsmmkqv";}
+
{name="kwallet";value="1jpxalr8k2mydias4xgifacswy8f6ma4dcf2kpx49sq7hlnx4rdi";}
+
{name="kwordquiz";value="1zi6pkn55cf62f8bmhfdxpykxk2hcl5bc9zqcp2gcapg5ap58gj8";}
+
{name="libkdcraw";value="0imyxfppk75zf97p8y7mnzx40vg7wbdqf6qlp1m9yraz4ply9bf1";}
+
{name="libkdeedu";value="19x0hajs82kimm8i80vxdzz5xkdhhv2vjnv1anx1nkb9fpgmz22y";}
+
{name="libkexiv2";value="020k8lbh4ad67ybfj5hvbpb0qp6kcwq4yb63as2hgvpvajny0rzr";}
+
{name="libkipi";value="040wsm35sbbfkdp9yak496w6h2wc3mswab17240c3xl7mbfx405h";}
+
{name="libksane";value="15cf360jxd27098g7rx7g2rnd3ffpbrj8flkn1913ibccbc44kvn";}
+ {name="marble";value="0kpln6nhyv6vvy2x64lr4dmf7scvq4k8i6f60flyrc0vll51w0xv";}
+ {name="okular";value="0jgg6ar1b9zahh1cgkz0yksxq55vjyflp8xc6m9fy0diw4cjhi2i";}
+
{name="oxygen-icons";value="045fh2609fyn8q22r0w14xa3b0ji9k1xkhh2yb25nnjyh3b10a8w";}
+ {name="parley";value="00ab2xvmlxzn4rdbnp56yf3jsx02rjxf9f6m4516sb5dgf0gmsvq";}
+
{name="perlkde";value="138hq7njf9394564addslwy1zibmy7pnsj3ckzwhacab4497pyj4";}
+ {name="perlqt";value="0lrdf2gl8kw3rkyhy1a1fwnazpziai57w3k1nr0bv1g7s49ri84r";}
+
{name="printer-applet";value="00c5nh6rm3ixfqn1ahb2hcdijnkdrj2381m1m9l4vxikdchb6whl";}
+ {name="pykde4";value="087srnqva1kqmgqvsyc54yr8i19xaxl1ax7w6acdk00bz0pyw76i";}
+ {name="qtruby";value="0imy1afh0w5rx97cxcp4bg2h95wn687sj7dlm09nd6hrpr31ivqd";}
+ {name="qyoto";value="1gndimc95s6b6m2bgh3z7pwb9p9jlj8z7sypz72py9aza5hkxiyn";}
+ {name="rocs";value="13gj83a4j202f0980v3ihlw3w5w4f5xh610plc5fnnba5csrpil4";}
+
{name="smokegen";value="08jz7v86lr6n743cr1ig9lb05wq9f0fyrrgwnn9wzmnfyrlqny0z";}
+
{name="smokekde";value="1z6hwkv6c5kx12gzi2kld2596az8gyc1aw83091bkkcj7885sai3";}
+
{name="smokeqt";value="0s3dz9vyhkazd68j9185rgjk3rkwgdfg53pxq10fqldv7pavw230";}
+ {name="step";value="0xgv7cbs540sk18915v3m4hq09j8j844briic5wy7mgn46gwlycc";}
+
{name="superkaramba";value="0gck0v9nrg4040w011yhwpj282kkhk2mwdwd0vkgl4760qqfgr2j";}
+
{name="svgpart";value="1yzrniz0h36v9xw0nglylv043gzlzcm7zzcv7j4p9faicl154vb8";}
+
{name="sweeper";value="1xyg2qwmwi5jajijamavgq7qqb52iphg6xad3y5r7i52172j7am1";}
+];
+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="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
+{ 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;}
+];
+}
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-package/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-package/default.nix Thu Mar 8
05:45:23 2012 (r32873)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-package/default.nix Thu Mar 8
06:53:44 2012 (r32874)
@@ -12,7 +12,7 @@
# src attribute for $name tarball
kdesrc = name: fetchurl {
url = "mirror://kde/" + (if manifest.stable then "" else "un")
- + "stable/${release}/src/${name}-${release}.tar.bz2";
+ + "stable/${release}/src/${name}-${release}.tar.xz";
sha256 = getAttr name manifest.hashes;
};
@@ -37,7 +37,7 @@
# API.
kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
- # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.bz2
+ # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz
kdeSubdirPkg = module:
{name, subdir ? name, sane ? name}:
let name_ = name; in
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh Thu Mar
8 05:45:23 2012 (r32873)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh Thu Mar
8 06:53:44 2012 (r32874)
@@ -11,8 +11,8 @@
exit 1
fi
-release=$(ls "${dir}"/kdelibs-*.tar.bz2 | \
- sed -e 's/.*kdelibs-//' -e 's/\.tar\.bz2//')
+release=$(ls "${dir}"/kdelibs-*.tar.xz | \
+ sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//')
if [[ ${release##*.} -gt 50 ]]; then
stable="false"
@@ -45,8 +45,8 @@
fi
}
-for i in `cd "${dir}"; ls *-${release}.tar.bz2`; do
- package=${i%-${release}.tar.bz2}
+for i in `cd "${dir}"; ls *-${release}.tar.xz`; do
+ package=${i%-${release}.tar.xz}
packages+=( "$package" )
echo -n "${package}.. " >&2
hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
@@ -99,7 +99,7 @@
echo -n "$1 ... " >&2
echo -n " split=false;"
cml="$1-$release/CMakeLists.txt"
- tar -xf "${dir}/$1-${release}.tar.bz2" "$cml"
+ tar -xf "${dir}/$1-${release}.tar.xz" "$cml"
if grep '^[^#]*add_subdirectory' $cml >/dev/null; then
if grep '^[^#]*add_subdirectory' $cml | grep -v
macro_optional_add_subdirectory >/dev/null; then
echo " is monolithic (has unconditionally added subdirs)" >&2
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-wallpapers.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-wallpapers.nix Thu Mar 8
05:45:23 2012 (r32873)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-wallpapers.nix Thu Mar 8
06:53:44 2012 (r32874)
@@ -9,7 +9,7 @@
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash =
"208ebe74f3ffc83fc51cd1197ceb2c5b8b8de8f33fab86b760bfc41d31c2aab6";
+ outputHash =
"326b19180e1a03c9fbf5e99f1a3ee6d4dfd0bd6fde5c0ef4b7a5608b20e75a5f";
meta = {
description = "Wallpapers for KDE";
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.8/l10n/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.8/l10n/default.nix Thu Mar 8
05:45:23 2012 (r32873)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/l10n/default.nix Thu Mar 8
06:53:44 2012 (r32874)
@@ -11,8 +11,8 @@
name = "kde-l10n-${saneName}-${release}";
src = fetchurl {
- url = "mirror://kde/${if stable then "" else
"un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2";
- name = "${name}.tar.bz2";
+ url = "mirror://kde/${if stable then "" else
"un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.xz";
+ name = "${name}.tar.xz";
inherit sha256;
};
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.8/l10n/l10n-manifest.sh
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.8/l10n/l10n-manifest.sh Thu Mar 8
05:45:23 2012 (r32873)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/l10n/l10n-manifest.sh Thu Mar 8
06:53:44 2012 (r32874)
@@ -10,15 +10,15 @@
exit 1
fi
-release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.bz2 | \
- sed -e 's/.*en_GB-//' -e 's/\.tar\.bz2//')
+release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.xz | \
+ sed -e 's/.*en_GB-//' -e 's/\.tar\.xz//')
echo "Detected release ${release}" >&2
exec > "manifest-${release}.nix"
echo "["
-for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.bz2`; do
- lang=${i%-${release}.tar.bz2}
+for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.xz`; do
+ lang=${i%-${release}.tar.xz}
lang=${lang#kde-l10n-}
echo -n "${lang}.. " >&2
hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
Added: nixpkgs/trunk/pkgs/desktops/kde-4.8/l10n/manifest-4.8.1.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/l10n/manifest-4.8.1.nix Thu Mar 8
06:53:44 2012 (r32874)
@@ -0,0 +1,277 @@
+[
+{
+ lang = "ar";
+ saneName = "ar";
+ sha256 = "0yzirmv6275479xifhipajdrmnf85xlb7nr00b9r73ghz5y9i8la";
+}
+{
+ lang = "bg";
+ saneName = "bg";
+ sha256 = "14fkmr0ixnrn4v2xs3hffiipk4dfdw2c2nyldlljlls3wim9kg5k";
+}
+{
+ lang = "bs";
+ saneName = "bs";
+ sha256 = "11f2n5rb5vq64lj2w913xkfvbw0rn31nnf1bpaywd86jh4sr4h6v";
+}
+{
+ lang = "ca";
+ saneName = "ca";
+ sha256 = "1c2j18gjlj778f97k44xk1pnxx696gsmlqjjsmanw9r0jnbkvp6z";
+}
+{
+ lang = "ca@valencia";
+ saneName = "ca_valencia";
+ sha256 = "1zhpbk2bdw40hss80zfnhq3ml9s9hlyayg6gsqg1jqwkfjxy0fdi";
+}
+{
+ lang = "cs";
+ saneName = "cs";
+ sha256 = "04jpi5lhx5lj15vxlh22g08zjqwzp7fjj2hy84axjm2q57vmgxfh";
+}
+{
+ lang = "da";
+ saneName = "da";
+ sha256 = "14qivzzhzv5z7yc3l8xvhwvspn1834r6zvf7pfiqmb4anhf3k26q";
+}
+{
+ lang = "de";
+ saneName = "de";
+ sha256 = "1l2s1yzi58f6nixw86k0rg0irpj786hcb07q3b1n7p991a0x34ij";
+}
+{
+ lang = "el";
+ saneName = "el";
+ sha256 = "044r8c0w3avcfb7wl7v8zaw05hyvif9cdp482fwrggg6v61fz0h6";
+}
+{
+ lang = "en_GB";
+ saneName = "en_GB";
+ sha256 = "15z1w8vkfq19z6wyi0zlbbh4ysv66jf74y68qz544d6riqzj61ii";
+}
+{
+ lang = "es";
+ saneName = "es";
+ sha256 = "1154wmjcgasvh48cli8zdbf1bqk9w3jvrq12g03jdr66mqgs2fry";
+}
+{
+ lang = "et";
+ saneName = "et";
+ sha256 = "0yww5pa7bm0fdcai1w1jrfvcwjcrzw0yp2r5vxggwlwjlslahzsp";
+}
+{
+ lang = "eu";
+ saneName = "eu";
+ sha256 = "1xrd91d0k14mk826a6277sghbaji2lr7yjlggbjshh59qrwnmm5f";
+}
+{
+ lang = "fa";
+ saneName = "fa";
+ sha256 = "0zy0slm6zn3b3zhvygfac0cnsgnc3bfx4wzd0rdiy2270idkvk9s";
+}
+{
+ lang = "fi";
+ saneName = "fi";
+ sha256 = "1nazarjvf7w1pvwca9igsp0w1fa2qgk2h45rrm4vpq05r2j9pd16";
+}
+{
+ lang = "fr";
+ saneName = "fr";
+ sha256 = "1b17lbjqaflz21ciijs4d2dr8r2jc781yf62gk6pgw3r91wd9gla";
+}
+{
+ lang = "ga";
+ saneName = "ga";
+ sha256 = "1wq67fi3r09ymz95pxc5nrjs01kdf7xlb2z11snzvjfbpyxg0fpp";
+}
+{
+ lang = "gl";
+ saneName = "gl";
+ sha256 = "046kvzqgxs2phgrdx736ydv4q9jc594hb32lj2qaysm378w67hz3";
+}
+{
+ lang = "he";
+ saneName = "he";
+ sha256 = "1ywfd2fv806v4ilin3b99rcajwsczbmghl8y152nkyza8vak33rv";
+}
+{
+ lang = "hr";
+ saneName = "hr";
+ sha256 = "0r77sh2s5kvh7pb1v7fvl8cxckx7jh8i46lrrli6hyvfi8gwdzl0";
+}
+{
+ lang = "hu";
+ saneName = "hu";
+ sha256 = "0jjm1kl2lc2pdyhyxz6jljsbdc8b6msyp01bwyldgd9pannrixfi";
+}
+{
+ lang = "ia";
+ saneName = "ia";
+ sha256 = "0sl28a39v9gb7fj7rfyrn2wqn41l7q1zzfkhgjac273wb9cwisfq";
+}
+{
+ lang = "id";
+ saneName = "id";
+ sha256 = "0whbnl3rglv9bwp4x2f6p8v6w0ns87l6fkz74qgwqq9xf5h7cq8w";
+}
+{
+ lang = "is";
+ saneName = "is";
+ sha256 = "0951lcd6if6ylwx2gpq0kg08134g02wfnwpvi9w7jsxia6c3byv9";
+}
+{
+ lang = "it";
+ saneName = "it";
+ sha256 = "0radqz2nicji3sm2nhr9sy250s015vccx7g1k6zz30qfs6v7d081";
+}
+{
+ lang = "ja";
+ saneName = "ja";
+ sha256 = "0n5hhq0h7xvxnxmd3k2wv6p5n5raqyq667f1x1vvfx3gjgl8l6za";
+}
+{
+ lang = "kk";
+ saneName = "kk";
+ sha256 = "12fd76wcr141pqd9lcpwzi0fvd8r66551vcd3rz1p5gkl41wnzih";
+}
+{
+ lang = "km";
+ saneName = "km";
+ sha256 = "0y7gaa19ycbp4v97rwf7h2ijam68fjzpx62iab4q8p925d5bf5gz";
+}
+{
+ lang = "ko";
+ saneName = "ko";
+ sha256 = "1bvlw16wvj9k82c00p6vbwvc1f6y4lgq7yfwi3d62wjmq34ry9y3";
+}
+{
+ lang = "lt";
+ saneName = "lt";
+ sha256 = "10zjs4a8chsf6i8v9xbzqikz7j1kqwaxv6hbzphz5qlabxx1vfhh";
+}
+{
+ lang = "lv";
+ saneName = "lv";
+ sha256 = "0bzh4j9m8jmandrx6y7pl2dm8xlp0m4vw5lnz0mhbzrpbf9y91f5";
+}
+{
+ lang = "nb";
+ saneName = "nb";
+ sha256 = "1imkd6540npybpg34vz00z7x3c2vgzigkjz0ha8xhsnsrbsyph1c";
+}
+{
+ lang = "nds";
+ saneName = "nds";
+ sha256 = "1jqpmqma7pwgpfhlz5rf9jbda3y6psd9ikbpl0r18kwbjxmmydbf";
+}
+{
+ lang = "nl";
+ saneName = "nl";
+ sha256 = "0rv81v06m27kk922d7cy58jm7rxx3lwhy7hnwc3iym0kzlb1kn8k";
+}
+{
+ lang = "nn";
+ saneName = "nn";
+ sha256 = "1z9wysi99sb7whrqbjsywvzr99bbph8ajlrpgjx2sc6r0pq9kiz2";
+}
+{
+ lang = "pa";
+ saneName = "pa";
+ sha256 = "1cj65wnkzrkd9bpjaihgzqhcjmjrjlfzvcc5w66wy976lj3bmhbj";
+}
+{
+ lang = "pl";
+ saneName = "pl";
+ sha256 = "17ilmmdjzlk16avr6v37fwx50gn70ds0s66i1pr6bgfjwzirhbwr";
+}
+{
+ lang = "pt";
+ saneName = "pt";
+ sha256 = "0c3ibrnhfhgpn51bzkx9skqzhbc3y3b9z8x9mqfj8qb88y8daxr6";
+}
+{
+ lang = "pt_BR";
+ saneName = "pt_BR";
+ sha256 = "07aazd6326jnl98xsw60d2a23cgqz9hlhr3359ing0f85y0h4553";
+}
+{
+ lang = "ro";
+ saneName = "ro";
+ sha256 = "18d8xmvppp8y01g9kbfchd4ppbgc0xzd0s2xhicglsjq0mxgsl1d";
+}
+{
+ lang = "ru";
+ saneName = "ru";
+ sha256 = "0mxrikinff8a94pjag1dw6d4ywx1f8niy6160cfy9yhzww7kxdid";
+}
+{
+ lang = "si";
+ saneName = "si";
+ sha256 = "1a8wqihfxqvwxpz1x46kq88jwh3gbilqiba6sk9bq2mszp4p67rm";
+}
+{
+ lang = "sk";
+ saneName = "sk";
+ sha256 = "0x07css69r5ji9k3xz6b86945zawhnx3cxx8mjc21yhb88ns9abg";
+}
+{
+ lang = "sl";
+ saneName = "sl";
+ sha256 = "157b1qbv68455gxjfw0a16pn754cwsslr7rjj98m3wxb0x2l6jm6";
+}
+{
+ lang = "sr";
+ saneName = "sr";
+ sha256 = "1hj0z12g6srhhl3rim8ch2a51jxmzgbrd3wz9x1dcbb280qvx7dh";
+}
+{
+ lang = "sv";
+ saneName = "sv";
+ sha256 = "0caji21v1lb6kqb12rrd0ff4pi4kr5533x686c8aqmj82dldc0i1";
+}
+{
+ lang = "tg";
+ saneName = "tg";
+ sha256 = "0v4kggr5k0nl0kj2y2diw37mdi51p76wmwxjldlhvkxind40sab9";
+}
+{
+ lang = "th";
+ saneName = "th";
+ sha256 = "13vvfl1nkm8a3vd1h95rs73cvh4q84vdgnvy1144v2lfg62qz2wr";
+}
+{
+ lang = "tr";
+ saneName = "tr";
+ sha256 = "0nc8c68y6ykplkhh0pij2lwwq5pa0sgwdiarwmjlwiy2rzyjm49c";
+}
+{
+ lang = "ug";
+ saneName = "ug";
+ sha256 = "1rw2jq6899xkn39ij6w6k7qgnv94w6rivx56czwpldxslzw5aikf";
+}
+{
+ lang = "uk";
+ saneName = "uk";
+ sha256 = "0w42f4fg4pk4ny1sldhv4nsganid5jayc0n5m1slsvd70f89l4cq";
+}
+{
+ lang = "vi";
+ saneName = "vi";
+ sha256 = "093d4fsf38kxlpr99yf7nnr4amvlwsj92h9ix3hh2mql1vcrjzxh";
+}
+{
+ lang = "wa";
+ saneName = "wa";
+ sha256 = "048awkb3a07bxd2kbfv05ig49r2hix6glag5wdjsmn3dmjlf7lam";
+}
+{
+ lang = "zh_CN";
+ saneName = "zh_CN";
+ sha256 = "0hkrj9j6rzxnprvdsf6b0xy2i6mngrq5sgsg6k9dqxwjfnnfd1g5";
+}
+{
+ lang = "zh_TW";
+ saneName = "zh_TW";
+ sha256 = "096mwkla69sj4236f05grhv7wrvfxfq7m7gyq3r58nar37b5nrkz";
+}
+]
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.8/oxygen-icons.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.8/oxygen-icons.nix Thu Mar 8
05:45:23 2012 (r32873)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/oxygen-icons.nix Thu Mar 8
06:53:44 2012 (r32874)
@@ -3,7 +3,7 @@
kde {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash =
"dec510cb1dd47d4254e97021964dcbdcfe4541368a0694ee986666ff745b6860";
+ outputHash =
"78f35ceba58bd34059ca4b2107bb55d4de56733e8932ba2ea22dcac18ee995ce";
buildNativeInputs = [ cmake ];
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
