KDE-4.6.0 (not ready yet!!)

Mostly automatic changes. Will fix evaluation/compilation later.

svn path=/nixpkgs/trunk/; revision=25933

pkgs/desktops/kde-4.6/admin/default.nix

@@ -18,9 +18,6 @@ kde.package {
   meta = {
     description = "KDE Administration Utilities";
     license = "GPL";
-    kde = {
-      name = "kdeadmin";
-      version = "4.5.90";
-    };
+    kde.module = "kdeadmin";
   };
 }

pkgs/desktops/kde-4.6/base-runtime/default.nix

@@ -19,9 +19,6 @@ kde.package {
     description = "KDE runtime";
     longDescription = "Libraries and tools which supports running KDE desktop applications";
     license = "LGPL";
-    kde = {
-      name = "kdebase-runtime";
-      version = "4.5.90";
-    };
+    kde.module = "kdebase-runtime";
   };
 }

pkgs/desktops/kde-4.6/base-workspace/default.nix

@@ -19,9 +19,6 @@ kde.package {
     description = "KDE base platform-specific components";
     longDescription = "KDE base components that are only required to work with X11 such KDM and KWin";
     license = "GPL";
-    kde = {
-      name = "kdebase-workspace";
-      version = "4.5.90";
-    };
+    kde.module = "kdebase-workspace";
   };
 }

pkgs/desktops/kde-4.6/base/default.nix

@@ -11,9 +11,6 @@ kde.package {
     description = "KDE Base components";
     longDescription = "Applications that form the KDE desktop, like Plasma, System Settings, Konqueror, Dolphin, Kate, and Konsole";
     license = "GPL";
-    kde = {
-      name = "kdebase";
-      version = "4.5.90";
-    };
+    kde.module = "kdebase";
   };
 }

pkgs/desktops/kde-4.6/bindings/default.nix

@@ -28,10 +28,7 @@ kde.package rec {
     description = "KDE bindings";
     longDescription = "Provides KDE bindings for several languages such as Java, Smoke and Python";
     license = "LGPL";
-    kde = {
-      name = "kdebindings";
-      version = "4.5.90";
-    };
+    kde.module = "kdebindings";
   };
 }
 

pkgs/desktops/kde-4.6/default.nix

@@ -2,14 +2,14 @@
 
 let
 
-  version = "4.5.90";
+  release = "4.6.0";
 
   # Various packages (e.g. kdesdk) have been split up into many
   # smaller packages.  Some people may want to install the entire
   # package, so provide a wrapper package that recombines them.
   combinePkgs = name: pkgs:
     let pkgs' = stdenv.lib.attrValues pkgs; in
-    runCommand "${name}-${version}" ({ passthru = pkgs // { inherit pkgs; }; })
+    runCommand "${name}-${release}" ({ passthru = pkgs // { inherit pkgs; }; })
       ''
         mkdir -p $out/nix-support
         echo ${toString pkgs'} > $out/nix-support/propagated-user-env-packages
@@ -18,13 +18,14 @@ let
 in
 
 rec {
+  recurseForRelease = true;
   inherit callPackage stdenv;
 
   qt4 = qt47;
 
   phonon = null;
 
-  kde = callPackage ./kde-package { };
+  kde = callPackage ./kde-package { inherit release; };
 
 ### SUPPORT
   akonadi = callPackage ./support/akonadi { };
@@ -35,7 +36,7 @@ rec {
 
   eigen = callPackage ./support/eigen { };
 
-  oxygen_icons = callPackage ./support/oxygen-icons { };
+  oxygen_icons = callPackage ./oxygen-icons { };
 
   polkit_qt_1 = callPackage ./support/polkit-qt-1 { };
 
@@ -138,6 +139,7 @@ rec {
     printer_applet = callPackage ./utils/printer-applet.nix { };
     superkaramba = callPackage ./utils/superkaramba.nix { };
     sweeper = callPackage ./utils/sweeper.nix { };
+    wacomtablet = callPackage ./utils/wacomtablet.nix { };
   };
 
   kdewebdev = combinePkgs "kdewebdev" {
@@ -154,7 +156,7 @@ rec {
 
   kdebindings = callPackage ./bindings { };
 
-  l10n = callPackage ./l10n { };
+  l10n = callPackage ./l10n { inherit release; };
 
   # Make the split packages visible to `nix-env -q'.
   misc = recurseIntoAttrs

pkgs/desktops/kde-4.6/edu/default.nix

@@ -27,9 +27,6 @@ kde.package {
   meta = {
     description = "KDE Educative software";
     license = "GPL";
-    kde = {
-      name = "kdeedu";
-      version = "4.5.90";
-    };
+    kde.module = "kdeedu";
   };
 }

pkgs/desktops/kde-4.6/games/default.nix

@@ -14,9 +14,6 @@ kde.package {
   meta = {
     description = "KDE Games";
     license = "GPL";
-    kde = {
-      name = "kdegames";
-      version = "4.5.90";
-    };
+    kde.module = "kdegames";
   };
 }

pkgs/desktops/kde-4.6/graphics/default.nix

@@ -15,9 +15,6 @@ kde.package {
       Okular  document reader.
     '';
     license = "GPL";
-    kde = {
-      name = "kdegraphics";
-      version = "4.5.90";
-    };
+    kde.module = "kdegraphics";
   };
 }

pkgs/desktops/kde-4.6/kde-package/default.nix

@@ -1,39 +1,25 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, release }:
 
 rec {
-  defaultArgs = {name, stable ? null, version,
-    module ? name, release ? version, ... }:
+  inherit release;
 
-    assert (name == module) -> (release == version);
+  manifest = import (./manifest + "-${release}.nix");
+
+  defaultArgs = { module, name ? module, ... }:
 
     (
       {
-        name = "${name}-${version}";
+        name = "${name}-${release}";
 
-        src =
-          let
-            manifest = (import (./manifest + "-${release}.nix"));
-            _stable = if stable == null then manifest.stable else stable;
-            stableString = if _stable then "stable" else "unstable";
-          in
-          fetchurl {
-            url = "mirror://kde/${stableString}/${release}/src/${module}-${release}.tar.bz2";
-            sha256 = stdenv.lib.maybeAttr
-              module
-              (throw "No module ${module} in release ${release}!")
-              manifest.packages;
-          };
+        src = fetchurl {
+          url = "mirror://kde/" + (if manifest.stable then "" else "un")
+            + "stable/${release}/src/${module}-${release}.tar.bz2";
+          sha256 = builtins.getAttr module manifest.packages;
+        };
 
         meta = {
           maintainers = with stdenv.lib.maintainers; [ sander urkud ];
           platforms = stdenv.lib.platforms.linux;
-          homepage = if name == module
-            then http://www.kde.org
-            else assert builtins.substring 0 3 module == "kde";
-              "http://"
-              + builtins.substring 3
-                (builtins.sub (builtins.stringLength module) 3) module
-              + ".kde.org/projects/${name}";
         };
       } // (if module == name then { } else {
         cmakeFlags = ''

pkgs/desktops/kde-4.6/kde-package/manifest-4.6.0.nix

@@ -0,0 +1,85 @@
+{
+  stable = true;
+  packages = builtins.listToAttrs [
+    {
+      name = "kdeaccessibility";
+      value = "06b1w7gnfga4nd0spx48s5cx5jfsc9mxzc5yncns0471ia98ww92";
+    }
+    {
+      name = "kdeadmin";
+      value = "0nl3smhlsa4f68qq6p1kjbai2v5lbji2v84k96jfqvpjbkygkq27";
+    }
+    {
+      name = "kdeartwork";
+      value = "1qy0qwl3p0k5myd2f2ky400r5wvaq8gbvgb7mq6093amq0fghxlx";
+    }
+    {
+      name = "kdebase";
+      value = "095k83i1wd3cpk1pyc451gc4fajjynfknf83jsb6vxqisvm2mjn2";
+    }
+    {
+      name = "kdebase-runtime";
+      value = "1vwjly7p28sbhkg1vvnm0l94l2kwcs64jfh9hxlrgfz2bqp48b87";
+    }
+    {
+      name = "kdebase-workspace";
+      value = "10jkv4si6v12m9gspb7yk6x34lanwrnwfdw68jr59wp1ibcpkzzl";
+    }
+    {
+      name = "kdebindings";
+      value = "1xggvgryadi93hn3223614z4qajvypllxjscixv5zc9mvyh9z3ng";
+    }
+    {
+      name = "kdeedu";
+      value = "1x3s0dz8kyd8x7parzks434ifr8mj3w3lwaw30np4khgva258r2n";
+    }
+    {
+      name = "kdegames";
+      value = "1p8d9sy9mafza428wkj5g8hnfl8d06wqf74pdd39yr1ilmw0w1rb";
+    }
+    {
+      name = "kdegraphics";
+      value = "0j28aa2bglhpi9ck6a7334q603k7lfmfsr47grab81ic9aw6x38n";
+    }
+    {
+      name = "kdelibs";
+      value = "1pfydrdi4zwyxpygfmvk2jnfjal747kpf1m2az4fhvv91kx4clpd";
+    }
+    {
+      name = "kdemultimedia";
+      value = "1dhi7m5f22pz7sdrcl9g8zwf0mqcxzcys8hgbxzjfwjkg6h8mz28";
+    }
+    {
+      name = "kdenetwork";
+      value = "0d37db21nz3kjrr1swqykdbzwq3x4kapy3b9pbjic38phfnxksrs";
+    }
+    {
+      name = "kdepimlibs";
+      value = "1377lhlkfadfsqylkjm8hs8csak2cr6lwgimv97wxmp3x8v3lddq";
+    }
+    {
+      name = "kdeplasma-addons";
+      value = "0p8vzvnf0alk9yfv2ynawfbb33h68yhgc3f2ibgm1sdyg4gqx615";
+    }
+    {
+      name = "kdesdk";
+      value = "12hm20pzxj1k42l52dvjl64xda2r2gnvzlmf9kx9c5ccc0p8ch9z";
+    }
+    {
+      name = "kdetoys";
+      value = "0qaxy74n9g0vd6vqqwj3avbi3zhxikxk5aghdy2ynininmwzvqd9";
+    }
+    {
+      name = "kdeutils";
+      value = "1nv2fk8i77vc4jz9cbg4hvw5azw7ncvs3ircj74xy3ndw5b3fhxa";
+    }
+    {
+      name = "kdewebdev";
+      value = "0yl21qixd2ch6jxxccy03qnwnrws4lhbzj5hiv9pkw8w6zm16503";
+    }
+    {
+      name = "oxygen-icons";
+      value = "0a56q2d6nz3nsh8l5cycjiw7dq6ffkgyg3gyqql5iszcp6hrif3b";
+    }
+  ];
+}

pkgs/desktops/kde-4.6/l10n/default.nix

@@ -1,26 +1,18 @@
-{ stdenv, fetchurl, cmake, kdelibs, gettext, perl, automoc4 }:
+{ stdenv, fetchurl, cmake, kdelibs, gettext, perl, automoc4, release }:
 
 let
-  overrides = { };
 
-  defaultRelease = "4.5.90";
-  releases = [ "4.5.90" ];
+  inherit (stdenv.lib) attrByPath singleton;
 
-  sanitizeString = replaceChars [ "@" "." ] [ "_" "_" ];
-  getOverride = name: attrByPath [name] {} overrides;
+  kdeL10nDerivation =
+    { lang, saneName, sha256 }:
 
-  inherit (stdenv.lib) replaceChars attrByPath singleton;
+    stdenv.mkDerivation rec {
+      name = "kde-l10n-${saneName}-${release}";
 
-  kdeL10nDerivation = {lang, sha256, release} :
-    let
-      name = "kde-l10n-${lang}-${release}";
-      saneName = "kde-l10n-${sanitizeString lang}-${release}";
-    in
-    stdenv.mkDerivation ({
-      name = saneName;
       src = fetchurl {
-        url = "mirror://kde/unstable/${release}/src/kde-l10n/${name}.tar.bz2";
-        name = "${saneName}.tar.bz2";
+        url = "mirror://kde/stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2";
+        name = "${name}.tar.bz2";
         inherit sha256;
       };
 
@@ -31,19 +23,14 @@ let
         license = "GPL";
         inherit (kdelibs.meta) maintainers platforms homepage;
       };
-    }
-    // (getOverride lang) // (getOverride name)
-  );
+    };
 
-  kdeL10nRelease = release:
-    let
-      releaseStr = sanitizeString release;
-    in
+  kdeL10nRelease =
     builtins.listToAttrs (
-      map ({lang, sha256}:
+      map ({lang, saneName, sha256}:
         {
-          name = "${sanitizeString lang}";
-          value = kdeL10nDerivation { inherit lang release sha256;};
+          name = saneName;
+          value = kdeL10nDerivation { inherit lang saneName sha256; };
         }
       ) (import (./manifest + "-${release}.nix"))
     );
@@ -52,7 +39,4 @@ in
 {
   inherit kdeL10nDerivation;
   recurseForDerivations = true;
-}
-// builtins.listToAttrs (map (r : { name = sanitizeString r; value =
-kdeL10nRelease r; }) releases)
-// (kdeL10nRelease defaultRelease)
+} // kdeL10nRelease

pkgs/desktops/kde-4.6/l10n/l10n-manifest.sh

@@ -24,6 +24,7 @@ for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.bz2`; do
   hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
   echo "{"
   echo "  lang = \"${lang}\";"
+  echo "  saneName = \"$(echo $lang | sed s^@^_^g)\";"
   echo "  sha256 = \"${hash}\";"
   echo "}"
   echo $hash >&2

pkgs/desktops/kde-4.6/l10n/manifest-4.6.0.nix

@@ -0,0 +1,267 @@
+[
+{
+  lang = "ar";
+  saneName = "ar";
+  sha256 = "1dadlmd3s3752hcssnpzagly18yx7bj3r9pkc5qcb8nn9h91a92x";
+}
+{
+  lang = "bg";
+  saneName = "bg";
+  sha256 = "1nhqxdllfsljfnpw6ii78nfbv4rqncha1jjz9x9mz59qw4671a6n";
+}
+{
+  lang = "ca";
+  saneName = "ca";
+  sha256 = "1siha5sihazjdp7r26isi2m1s6nhzg4f7z2qqghh64lj3pw4xbzc";
+}
+{
+  lang = "ca@valencia";
+  saneName = "ca_valencia";
+  sha256 = "1d977lm78s1jq49ss5k6a6ixz1wiaq03i6pdjpl09jyirmlkg7dw";
+}
+{
+  lang = "cs";
+  saneName = "cs";
+  sha256 = "193xk5xsqq81xqcwmpix4dcz4l3qbwnvk1bc6awapcr8g56cgxbx";
+}
+{
+  lang = "da";
+  saneName = "da";
+  sha256 = "1y3b36y6w3ca238bnyvfvbkvpadbyvch40p4g82fg16ifnqpxrc7";
+}
+{
+  lang = "de";
+  saneName = "de";
+  sha256 = "1h38dxq6ggrvmc6b2w825xk7sf1032m9psfpg04gzarq6qicskdw";
+}
+{
+  lang = "el";
+  saneName = "el";
+  sha256 = "0ngs7k9nd7vz54804jnbvm10d8iiajvkiz01g9pimkiwlid325d3";
+}
+{
+  lang = "en_GB";
+  saneName = "en_GB";
+  sha256 = "12fr4npqcrsnndlz8qvbca5v6r0da53phxa1mks8ka603gh76hg3";
+}
+{
+  lang = "es";
+  saneName = "es";
+  sha256 = "1mf034ha0n27f82cx20cfr1jsbiapz4zs8bwwhjbdbiizsxivanj";
+}
+{
+  lang = "et";
+  saneName = "et";
+  sha256 = "1x1b8kn8fnv6dvg6f2j6h8kg1g4z3j9zb16likiwb6rp7fy0a859";
+}
+{
+  lang = "eu";
+  saneName = "eu";
+  sha256 = "1y2gwi2x5qx04yfqhn21asgsc67kn895l4npi8nhzv2pa0w8mif6";
+}
+{
+  lang = "fi";
+  saneName = "fi";
+  sha256 = "0lfw1s7ryl5fmrj07390ldayxkfsrc3haxfi8987pg8vxwsicb7n";
+}
+{
+  lang = "fr";
+  saneName = "fr";
+  sha256 = "00i2ziid18c5hz468rv1mljzpyky84r03bmszy8hlakd2jmsbm9r";
+}
+{
+  lang = "ga";
+  saneName = "ga";
+  sha256 = "0qg200sqbnq00qpcmgw10xl6hyjk50m1zks5nly5lxpfxqkmpqzh";
+}
+{
+  lang = "gl";
+  saneName = "gl";
+  sha256 = "0mivdn6hq7icl41pkaim6rc4z3ilsiqlaj84s8q46f8dmh9hdvnv";
+}
+{
+  lang = "gu";
+  saneName = "gu";
+  sha256 = "1h2df76bqhnxmgwgbck69f58p616fra7jqwdi91n5zdga975y4ag";
+}
+{
+  lang = "he";
+  saneName = "he";
+  sha256 = "1gfq82666x3rvrd84qfy51638gbi6r081fxd19av52k00npkrgi5";
+}
+{
+  lang = "hi";
+  saneName = "hi";
+  sha256 = "1k8916yv4bs5h40dvh9p4vgpyk1ylyckliazkwaldqdhghzfkzp3";
+}
+{
+  lang = "hr";
+  saneName = "hr";
+  sha256 = "011pkb42m0arlkkcmlj2r353k7ybglhfsb2hjh5b3bg2sq8cmpcm";
+}
+{
+  lang = "hu";
+  saneName = "hu";
+  sha256 = "124x73ag3nhs9ghfn4lpw29zjyycbj9zxin2d5rb2zdj8r9p2dcw";
+}
+{
+  lang = "ia";
+  saneName = "ia";
+  sha256 = "1j592k8z7d08sngazjqv6fpym4863s0hg1swcvnmys5ighm69dvh";
+}
+{
+  lang = "id";
+  saneName = "id";
+  sha256 = "01h3ax0dqca05qn2vm9v12wd4iyhk2q69lwa6zic6maqnj47s50s";
+}
+{
+  lang = "is";
+  saneName = "is";
+  sha256 = "0qgwfr9k2zqqcxwh82bf0x58h9wd03l9j87hz4xpw2k3jc82fpbk";
+}
+{
+  lang = "it";
+  saneName = "it";
+  sha256 = "1rmqp0v018na4s60cq5j5nqpvz94fyvhklwb1zjhdlfd2lfwcjrc";
+}
+{
+  lang = "ja";
+  saneName = "ja";
+  sha256 = "1qhibkrm2qmra6ib1973dqwz43w1sd87ys8hnnnjn52fwshpcm5z";
+}
+{
+  lang = "kk";
+  saneName = "kk";
+  sha256 = "1si8kfsw0h1jr4grgy6b7q3gnlv6pxpr7rlgl3g9b2f62zc1xaxd";
+}
+{
+  lang = "km";
+  saneName = "km";
+  sha256 = "1gs09hxd66qxl5kwg1rd9xfqvy8l1s49lc09971rr9qw9kxy43ks";
+}
+{
+  lang = "kn";
+  saneName = "kn";
+  sha256 = "13jgfbac3b5zsjgfw7zqk5l7wxnhsnf1kpa5ski002jcxb354n7q";
+}
+{
+  lang = "ko";
+  saneName = "ko";
+  sha256 = "0k0jgf6w94fd21ah609axqdgwn8rmx3j09cn95i0g258f8mvibhg";
+}
+{
+  lang = "lt";
+  saneName = "lt";
+  sha256 = "0nh57snn8ar077k6fj9j2fza9wpwc7j8lvwzfab7i5gka7js9vj5";
+}
+{
+  lang = "lv";
+  saneName = "lv";
+  sha256 = "0a2w06gvgxzh312fqnagp7r8hcbry61mvy9d4lh3kvd13gkgzi9z";
+}
+{
+  lang = "mai";
+  saneName = "mai";
+  sha256 = "1l8y0ck50h4wmirk3vkmj5lbcv0h8pir1wlfs15mbsk93r89fyys";
+}
+{
+  lang = "nb";
+  saneName = "nb";
+  sha256 = "1qw29p7w4ik8wnipsmiyfgp3k438ndr8c4m3c4p2gwx6v06vfynx";
+}
+{
+  lang = "nds";
+  saneName = "nds";
+  sha256 = "1gp0bqmrzpi0fsp919sj057q8c4zzyi7hxanrns6kc4q42x17xd2";
+}
+{
+  lang = "nl";
+  saneName = "nl";
+  sha256 = "1k6694lxp0szkqdb68zsvpq15zlvi51zxz9samgd7z4ng99hvv12";
+}
+{
+  lang = "nn";
+  saneName = "nn";
+  sha256 = "19sp5zaccvlkfjh29dz7i9d6whxa3ap6ji0g3dxkfix76xjchlir";
+}
+{
+  lang = "pa";
+  saneName = "pa";
+  sha256 = "09x53m297jiqv1qclp532c6g0d9d9z5k7kdaivhi69vj2bikf63p";
+}
+{
+  lang = "pl";
+  saneName = "pl";
+  sha256 = "0ygajy6mmdkxidq72qhbacn8hfq8rjvc0frz0jrvv2s2ywawknpn";
+}
+{
+  lang = "pt";
+  saneName = "pt";
+  sha256 = "1333564qpzvdx6qv9hs6n4yssh3lakskdr69hmbjyvnmjdx07f1y";
+}
+{
+  lang = "pt_BR";
+  saneName = "pt_BR";
+  sha256 = "1p378b8nncr55vkk9sfry6zj1zhjrvswwsb5az9q1yk14wgc050a";
+}
+{
+  lang = "ro";
+  saneName = "ro";
+  sha256 = "15lpmdidf3as9pbw7qgryvwk26sjb9lw9v3bvxx34aq299ifb6hf";
+}
+{
+  lang = "ru";
+  saneName = "ru";
+  sha256 = "1n8zwhlkn9sf256jdp7fh9qazwvn95qmr789ndg1xr7xm87y87fw";
+}
+{
+  lang = "sk";
+  saneName = "sk";
+  sha256 = "1q3bg2kw5fghzjx6a9j0029f11w7hir67ll8pl8xi4dpw4fxdqy1";
+}
+{
+  lang = "sl";
+  saneName = "sl";
+  sha256 = "17xr2p3nwx3sswc3qq6qqh671h6i3rvvprhnv86axddj369dhaai";
+}
+{
+  lang = "sr";
+  saneName = "sr";
+  sha256 = "0kflgcbw17flk9qyk631qqkw74v7k9cyrdag3v15rpcrmvvyzxmk";
+}
+{
+  lang = "sv";
+  saneName = "sv";
+  sha256 = "056i52sv5zml6c9wciqbh3v6ghgvmwq8s5wzpqx7nwnl5m9cb2x8";
+}
+{
+  lang = "th";
+  saneName = "th";
+  sha256 = "0bk31gady68rp650a4d0w3zx0cz095sjqmg2j09pjsc0j29dfsf9";
+}
+{
+  lang = "tr";
+  saneName = "tr";
+  sha256 = "0y3vk3csx3z54lqncpcyr31ivldbn6wkhsgycghrzg7yb3n6w5pa";
+}
+{
+  lang = "uk";
+  saneName = "uk";
+  sha256 = "0jqsqakz2xniw9bh0dz7w1vslvkwgpibhny7yb01g604l1zz1znn";
+}
+{
+  lang = "wa";
+  saneName = "wa";
+  sha256 = "0jbmgh1sbfkqxim7wkn29kl5m22k105daz2ypih4f31vzdsqzn9h";
+}
+{
+  lang = "zh_CN";
+  saneName = "zh_CN";
+  sha256 = "1l4slrz0bhbhsarf4pcr86qph1ry1477y7w1956a22p8a4a4ywr3";
+}
+{
+  lang = "zh_TW";
+  saneName = "zh_TW";
+  sha256 = "11harkdwzl328b3m25l8fkc77g0mbpprgaw41bdq3pf0j6wjmd3m";
+}
+]

pkgs/desktops/kde-4.6/libs/default.nix

@@ -34,9 +34,6 @@ kde.package {
   meta = {
     description = "KDE libraries";
     license = "LGPL";
-    kde = {
-      name = "kdelibs";
-      version = "4.5.90";
-    };
+    kde.module = "kdelibs";
   };
 }

pkgs/desktops/kde-4.6/multimedia/default.nix

@@ -12,9 +12,6 @@ kde.package {
       Contains various Multimedia utilties for KDE such as a movie player and sound volume mixer.
     '';
     license = "GPL";
-    kde = {
-      name = "kdemultimedia";
-      version = "4.5.90";
-    };
+    kde.module = "kdemultimedia";
   };
 }

pkgs/desktops/kde-4.6/network/default.nix

@@ -28,9 +28,6 @@ kde.package {
     description = "KDE network utilities";
     longDescription = "Various network utilities for KDE such as a messenger client and network configuration interface";
     license = "GPL";
-    kde = {
-      name = "kdenetwork";
-      version = "4.5.90";
-    };
+    kde.module = "kdenetwork";
   };
 }

pkgs/desktops/kde-4.6/oxygen-icons/default.nix

@@ -3,16 +3,13 @@
 kde.package {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "0yl5clp4dyxk6pg8lp3w3z44ayjhn7i47ww8n952mam5il6mlfl1";
+  outputHash = "1qqdmg4q145gac23b0kyarslfwnlkngcxm6x37b03vr1srccycmx";
 
   buildInputs = [ cmake ];
   meta = {
     description = "KDE Oxygen theme icons";
     longDescription = "Contains icons for the KDE Oxygen theme, which is the default icon theme since KDE 4.3";
     license = "GPL";
-    kde = {
-      name = "oxygen-icons";
-      version = "4.5.90";
-    };
+    kde.module = "oxygen-icons";
   };
 }

pkgs/desktops/kde-4.6/pim-runtime/default.nix

@@ -11,7 +11,7 @@ kde.package rec {
   '';
 
   src = fetchurl {
-    url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.name}-${meta.kde.version}.tar.bz2";
+    url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.module}-${meta.kde.version}.tar.bz2";
     sha256 = "029a0i83b2yrc1xn9as7gc9rakpxjh5cjmqcmhrrj0xwalqz490n";
   };
 
@@ -19,9 +19,6 @@ kde.package rec {
     description = "KDE PIM runtime";
     homepage = http://www.kde.org;
     license = "GPL";
-    kde = {
-      name = "kdepim-runtime";
-      version = "4.4.8";
-    };
+    kde.module = "kdepim-runtime";
   };
 }

pkgs/desktops/kde-4.6/pim/default.nix

@@ -15,7 +15,7 @@ kde.package rec {
   '';
 
   src = fetchurl {
-    url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.name}-${meta.kde.version}.tar.bz2";
+    url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.module}-${meta.kde.version}.tar.bz2";
     sha256 = "02nbdn8s4504ljqz0qylm1jyw4hpg5fjw3vi6sbzm522xvkax4wh";
   };
 
@@ -26,9 +26,6 @@ kde.package rec {
     '';
     license = "GPL";
     homepage = http://pim.kde.org;
-    kde = {
-      name = "kdepim";
-      version = "4.4.8";
-    };
+    kde.module = "kdepim";
   };
 }

pkgs/desktops/kde-4.6/pimlibs/default.nix

@@ -10,9 +10,6 @@ kde.package {
   meta = {
     description = "KDE PIM libraries";
     license = "LGPL";
-    kde = {
-      name = "kdepimlibs";
-      version = "4.5.90";
-    };
+    kde.module = "kdepimlibs";
   };
 }

pkgs/desktops/kde-4.6/plasma-addons/default.nix

@@ -15,9 +15,6 @@ kde.package {
   meta = {
     description = "KDE Plasma Addons";
     license = "GPL";
-    kde = {
-      name = "kdeplasma-addons";
-      version = "4.5.90";
-    };
+    kde.module = "kdeplasma-addons";
   };
 }