diff options
80 files changed, 445 insertions, 193 deletions
diff --git a/pkgs/desktops/kde-4.5/accessibility/color-schemes.nix b/pkgs/desktops/kde-4.5/accessibility/color-schemes.nix index ff82529fded9c..1fdc02daaf8fe 100644 --- a/pkgs/desktops/kde-4.5/accessibility/color-schemes.nix +++ b/pkgs/desktops/kde-4.5/accessibility/color-schemes.nix @@ -8,7 +8,7 @@ kde.package { kde = { name = "ColorSchemes"; module = "kdeaccessibility"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/accessibility/icon-themes.nix b/pkgs/desktops/kde-4.5/accessibility/icon-themes.nix index 85280f9abbe94..7fc795b595bd0 100644 --- a/pkgs/desktops/kde-4.5/accessibility/icon-themes.nix +++ b/pkgs/desktops/kde-4.5/accessibility/icon-themes.nix @@ -8,7 +8,7 @@ kde.package { kde = { name = "IconThemes"; module = "kdeaccessibility"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/accessibility/jovie.nix b/pkgs/desktops/kde-4.5/accessibility/jovie.nix index f86f047811bfa..139895ff3cdb6 100644 --- a/pkgs/desktops/kde-4.5/accessibility/jovie.nix +++ b/pkgs/desktops/kde-4.5/accessibility/jovie.nix @@ -10,7 +10,7 @@ kde.package { name = "jovie"; module = "kdeaccessibility"; version = "0.6.0"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "jovie/jovie/main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.5/accessibility/kmag.nix b/pkgs/desktops/kde-4.5/accessibility/kmag.nix index 4800cb4d702d7..9609588371683 100644 --- a/pkgs/desktops/kde-4.5/accessibility/kmag.nix +++ b/pkgs/desktops/kde-4.5/accessibility/kmag.nix @@ -9,7 +9,7 @@ kde.package { name = "kmag"; module = "kdeaccessibility"; version = "1.0"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "kmag/version.h"; }; }; diff --git a/pkgs/desktops/kde-4.5/accessibility/kmousetool.nix b/pkgs/desktops/kde-4.5/accessibility/kmousetool.nix index 1c7f97304b07a..7c6fb234a17d4 100644 --- a/pkgs/desktops/kde-4.5/accessibility/kmousetool.nix +++ b/pkgs/desktops/kde-4.5/accessibility/kmousetool.nix @@ -9,7 +9,7 @@ kde.package { name = "kmousetool"; module = "kdeaccessibility"; version = "1.12"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "kmousetool/kmousetool/version.h"; }; }; diff --git a/pkgs/desktops/kde-4.5/accessibility/kmouth.nix b/pkgs/desktops/kde-4.5/accessibility/kmouth.nix index c8d5aa2b4e89d..3626c63e1435f 100644 --- a/pkgs/desktops/kde-4.5/accessibility/kmouth.nix +++ b/pkgs/desktops/kde-4.5/accessibility/kmouth.nix @@ -9,7 +9,7 @@ kde.package { name = "kmouth"; module = "kdeaccessibility"; version = "1.1.1"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "kmouth/version.h"; }; }; diff --git a/pkgs/desktops/kde-4.5/admin/default.nix b/pkgs/desktops/kde-4.5/admin/default.nix index 3165054774548..6e0793f4df49d 100644 --- a/pkgs/desktops/kde-4.5/admin/default.nix +++ b/pkgs/desktops/kde-4.5/admin/default.nix @@ -20,7 +20,7 @@ kde.package { license = "GPL"; kde = { name = "kdeadmin"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/artwork/aurorae.nix b/pkgs/desktops/kde-4.5/artwork/aurorae.nix index 84f821c3a785e..fc79a54c352f3 100644 --- a/pkgs/desktops/kde-4.5/artwork/aurorae.nix +++ b/pkgs/desktops/kde-4.5/artwork/aurorae.nix @@ -8,7 +8,7 @@ kde.package rec { kde = { name = "aurorae"; module = "kdeartwork"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/artwork/color-schemes.nix b/pkgs/desktops/kde-4.5/artwork/color-schemes.nix index cbd78971fba6c..8643c22a33acd 100644 --- a/pkgs/desktops/kde-4.5/artwork/color-schemes.nix +++ b/pkgs/desktops/kde-4.5/artwork/color-schemes.nix @@ -9,7 +9,7 @@ kde.package rec { kde = { name = "ColorSchemes"; module = "kdeartwork"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/artwork/desktop-themes.nix b/pkgs/desktops/kde-4.5/artwork/desktop-themes.nix index 6bf44984bf03c..417f96ecc1cda 100644 --- a/pkgs/desktops/kde-4.5/artwork/desktop-themes.nix +++ b/pkgs/desktops/kde-4.5/artwork/desktop-themes.nix @@ -9,7 +9,7 @@ kde.package rec { kde = { name = "desktopthemes"; module = "kdeartwork"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/artwork/emoticons.nix b/pkgs/desktops/kde-4.5/artwork/emoticons.nix index 63f1500a05a20..64dc90a95c6aa 100644 --- a/pkgs/desktops/kde-4.5/artwork/emoticons.nix +++ b/pkgs/desktops/kde-4.5/artwork/emoticons.nix @@ -9,7 +9,7 @@ kde.package rec { kde = { name = "emoticons"; module = "kdeartwork"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/artwork/high-resolution-wallpapers.nix b/pkgs/desktops/kde-4.5/artwork/high-resolution-wallpapers.nix index e8ab8037ff820..0f1b782c93946 100644 --- a/pkgs/desktops/kde-4.5/artwork/high-resolution-wallpapers.nix +++ b/pkgs/desktops/kde-4.5/artwork/high-resolution-wallpapers.nix @@ -9,7 +9,7 @@ kde.package rec { kde = { name = "HighResolutionWallpapers"; module = "kdeartwork"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix b/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix index 791364b236f6c..0390231a816af 100644 --- a/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix +++ b/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix @@ -9,7 +9,7 @@ kde.package rec { name = "kscreensaver"; module = "kdeartwork"; version = "1.0"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "kscreensaver/kpartsaver/kpartsaver.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.5/artwork/nuvola-icon-theme.nix b/pkgs/desktops/kde-4.5/artwork/nuvola-icon-theme.nix index 05148567ea7d9..a105148845df8 100644 --- a/pkgs/desktops/kde-4.5/artwork/nuvola-icon-theme.nix +++ b/pkgs/desktops/kde-4.5/artwork/nuvola-icon-theme.nix @@ -10,7 +10,7 @@ kde.package rec { kde = { name = "IconThemes"; module = "kdeartwork"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/artwork/phase-style.nix b/pkgs/desktops/kde-4.5/artwork/phase-style.nix index 64ad1e4a983a2..0c05c263c30d3 100644 --- a/pkgs/desktops/kde-4.5/artwork/phase-style.nix +++ b/pkgs/desktops/kde-4.5/artwork/phase-style.nix @@ -9,7 +9,7 @@ kde.package rec { kde = { name = "styles"; module = "kdeartwork"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/artwork/sounds.nix b/pkgs/desktops/kde-4.5/artwork/sounds.nix index 29622bf5bc6dd..ca708d98f81ff 100644 --- a/pkgs/desktops/kde-4.5/artwork/sounds.nix +++ b/pkgs/desktops/kde-4.5/artwork/sounds.nix @@ -9,7 +9,7 @@ kde.package rec { kde = { name = "sounds"; module = "kdeartwork"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/artwork/wallpapers.nix b/pkgs/desktops/kde-4.5/artwork/wallpapers.nix index 923814f6ca8d3..705ff5762b5bf 100644 --- a/pkgs/desktops/kde-4.5/artwork/wallpapers.nix +++ b/pkgs/desktops/kde-4.5/artwork/wallpapers.nix @@ -9,7 +9,7 @@ kde.package rec { kde = { name = "wallpapers"; module = "kdeartwork"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/artwork/weather-wallpapers.nix b/pkgs/desktops/kde-4.5/artwork/weather-wallpapers.nix index bfee1a86e789d..bc495d2a8ff52 100644 --- a/pkgs/desktops/kde-4.5/artwork/weather-wallpapers.nix +++ b/pkgs/desktops/kde-4.5/artwork/weather-wallpapers.nix @@ -9,7 +9,7 @@ kde.package rec { kde = { name = "WeatherWallpapers"; module = "kdeartwork"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/base-runtime/default.nix b/pkgs/desktops/kde-4.5/base-runtime/default.nix index aa44b9d2e8c91..8cc432be69561 100644 --- a/pkgs/desktops/kde-4.5/base-runtime/default.nix +++ b/pkgs/desktops/kde-4.5/base-runtime/default.nix @@ -21,7 +21,7 @@ kde.package { license = "LGPL"; kde = { name = "kdebase-runtime"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/base-workspace/default.nix b/pkgs/desktops/kde-4.5/base-workspace/default.nix index 916e302acdf1b..9c4c5ead3602f 100644 --- a/pkgs/desktops/kde-4.5/base-workspace/default.nix +++ b/pkgs/desktops/kde-4.5/base-workspace/default.nix @@ -21,7 +21,7 @@ kde.package { license = "GPL"; kde = { name = "kdebase-workspace"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/base/default.nix b/pkgs/desktops/kde-4.5/base/default.nix index f06bf0033085c..545621b5ed9fc 100644 --- a/pkgs/desktops/kde-4.5/base/default.nix +++ b/pkgs/desktops/kde-4.5/base/default.nix @@ -13,7 +13,7 @@ kde.package { license = "GPL"; kde = { name = "kdebase"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/bindings/default.nix b/pkgs/desktops/kde-4.5/bindings/default.nix index 03a2051321e0e..4928e883e6c94 100644 --- a/pkgs/desktops/kde-4.5/bindings/default.nix +++ b/pkgs/desktops/kde-4.5/bindings/default.nix @@ -30,7 +30,7 @@ kde.package rec { license = "LGPL"; kde = { name = "kdebindings"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index 23be3c9812983..7702dbc898057 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -2,7 +2,7 @@ let - version = "4.5.2"; + version = "4.5.4"; # Various packages (e.g. kdesdk) have been split up into many # smaller packages. Some people may want to install the entire diff --git a/pkgs/desktops/kde-4.5/edu/default.nix b/pkgs/desktops/kde-4.5/edu/default.nix index 883bf1a22734c..852453df4c37f 100644 --- a/pkgs/desktops/kde-4.5/edu/default.nix +++ b/pkgs/desktops/kde-4.5/edu/default.nix @@ -23,7 +23,7 @@ kde.package { license = "GPL"; kde = { name = "kdeedu"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/games/default.nix b/pkgs/desktops/kde-4.5/games/default.nix index c8f90d134123c..02c7b9bf5b961 100644 --- a/pkgs/desktops/kde-4.5/games/default.nix +++ b/pkgs/desktops/kde-4.5/games/default.nix @@ -16,7 +16,7 @@ kde.package { license = "GPL"; kde = { name = "kdegames"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/graphics/default.nix b/pkgs/desktops/kde-4.5/graphics/default.nix index b9c2d8955d943..45b588af25e2d 100644 --- a/pkgs/desktops/kde-4.5/graphics/default.nix +++ b/pkgs/desktops/kde-4.5/graphics/default.nix @@ -17,7 +17,7 @@ kde.package { license = "GPL"; kde = { name = "kdegraphics"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/kde-package/default.nix b/pkgs/desktops/kde-4.5/kde-package/default.nix index 9e20b983e194e..433e12f453997 100644 --- a/pkgs/desktops/kde-4.5/kde-package/default.nix +++ b/pkgs/desktops/kde-4.5/kde-package/default.nix @@ -1,19 +1,7 @@ { stdenv, fetchurl }: rec { - manifest = import ./manifest.nix; - - kdeSrc = { stable ? true, subdir ? null, module, release, sha256 ? null } : - fetchurl { - url = "mirror://kde/" + (if stable then "" else "un") + "stable/" - + (if subdir == null then "${release}/src" else subdir) - + "/${module}-${release}.tar.bz2"; - sha256 = - if sha256 != null then sha256 - else builtins.getAttr "${module}-${release}.tar.bz2" manifest; - }; - - defaultArgs = {name, stable ? true, subdir ? null, version, + defaultArgs = {name, stable ? true, version, module ? name, release ? version, ... }: assert (name == module) -> (release == version); @@ -22,7 +10,15 @@ rec { { name = "${name}-${version}"; - src = kdeSrc { inherit stable subdir module release; }; + src = fetchurl { + url = "mirror://kde/" + (if stable then "" else "un") + + "stable/${release}/src/${module}-${release}.tar.bz2"; + sha256 = (stdenv.lib.findFirst + (x: x.module == module) + (throw "No module ${module} in release ${release}!") + (import (./manifest + "-${release}.nix")) + ).sha256; + }; meta = { maintainers = with stdenv.lib.maintainers; [ sander urkud ]; diff --git a/pkgs/desktops/kde-4.5/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.5/kde-package/kde-manifest.sh new file mode 100755 index 0000000000000..3811769c57ae6 --- /dev/null +++ b/pkgs/desktops/kde-4.5/kde-package/kde-manifest.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +# Usage: download kde release to $dir, then run +# $0 $dir + +dir=$1 + +if [[ ! -d "${dir}" ]]; then + echo "${dir} is not a directory (or doesn't exist)!" >&2 + exit 1 +fi + +release=$(ls "${dir}"/kdelibs-*.tar.bz2 | \ + sed -e 's/.*kdelibs-//' -e 's/\.tar\.bz2//') + +echo "Detected release ${release}" >&2 + +exec > "manifest-${release}.nix" +echo "[" +for i in `cd "${dir}"; ls *-${release}.tar.bz2`; do + module=${i%-${release}.tar.bz2} + echo -n "${module}.. " >&2 + hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}") + echo "{" + echo " module = \"${module}\";" + echo " sha256 = \"${hash}\";" + echo "}" + echo $hash >&2 +done +echo "]" diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest-4.5.4.nix b/pkgs/desktops/kde-4.5/kde-package/manifest-4.5.4.nix new file mode 100644 index 0000000000000..b00a5025fa7f1 --- /dev/null +++ b/pkgs/desktops/kde-4.5/kde-package/manifest-4.5.4.nix @@ -0,0 +1,82 @@ +[ +{ + module = "kdeaccessibility"; + sha256 = "0jd07n143r2610a261xx193zkigs30a4p645pzyw3dsi6la8ms0r"; +} +{ + module = "kdeadmin"; + sha256 = "0frf4clljqnynxv67hqypsfaifdrgbgc0zb9lcckjialc03f2kfm"; +} +{ + module = "kdeartwork"; + sha256 = "08260bml12y3xwr61q2qxrp0aqcshi14h7n93b12q0m9fs8n87x0"; +} +{ + module = "kdebase"; + sha256 = "1k9hla4qwrgz12g4n72c46w6b1srjnwf95zxhj2axqdw4k4hfj6z"; +} +{ + module = "kdebase-runtime"; + sha256 = "0rqrx9hz266dc9l7sn2pakqy36w5919gchwc4ghb5qzira3jjg1h"; +} +{ + module = "kdebase-workspace"; + sha256 = "09a4jsa3w4v4ldsh244isbbrsv350xcmd2py0sb3lvja7gf9wqhw"; +} +{ + module = "kdebindings"; + sha256 = "0vx7fhg74g0b2xcaxjybxci34kyc10h1i29qsdqr1005j01cdvj0"; +} +{ + module = "kdeedu"; + sha256 = "080pw86l55jfhdxm3a18qh4h1p7k6w3cb37g8ymfsyx3k3diil6x"; +} +{ + module = "kdegames"; + sha256 = "12p209n673fxnm9wsgc7by46z4hs3d7b3hzwgcxggzag0kyhx3s5"; +} +{ + module = "kdegraphics"; + sha256 = "1b4n1ss5pg213blqrkbk0pqchfr336rybqfkcb8scv1blx0w83qs"; +} +{ + module = "kdelibs"; + sha256 = "0c4ybrpdw3dblv68mj6sa7q13kx1z64f8lpakxf6f7vw1ish2dph"; +} +{ + module = "kdemultimedia"; + sha256 = "16k8l5h4m2wjpzpzflk2agmg48m1gj4fyzjp67z446lmb1m8jap7"; +} +{ + module = "kdenetwork"; + sha256 = "1g0hy92ixh2nzvasjm4ms8n8jyy777d909gjv16ph8g5w2pxj61w"; +} +{ + module = "kdepimlibs"; + sha256 = "1yc615qf3qihlj69glm4amdrbck33vagp5xmgnp6mny5vhvdc85b"; +} +{ + module = "kdeplasma-addons"; + sha256 = "0q9r8lafc3aa15smaj1r5kcyz2jw7lpbnp6qxanllfbv7c4b37nb"; +} +{ + module = "kdesdk"; + sha256 = "1ia336cfs42h8b3jahd9hb2ynahyiccx6y8dfk420xvyy024i2ra"; +} +{ + module = "kdetoys"; + sha256 = "12755p77r5fv2lfr78jrvcx8vg1mnsfsb1g8hpr6b59w5hh2k2mm"; +} +{ + module = "kdeutils"; + sha256 = "07g96bwy8h4ydj8gdnm1cs7vgm96s3m9c2d36d8r3w6apvh5pjkc"; +} +{ + module = "kdewebdev"; + sha256 = "1ng0rbrizqmqm4l0j9xahf0dwh5674cimzkzrlgj09dl4a603xar"; +} +{ + module = "oxygen-icons"; + sha256 = "0j9d4h3nl3vqwh4fi1zysahgvwd0xswqa25p8jl6hl86rnawhjcy"; +} +] diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix deleted file mode 100644 index 230533aaeb7c7..0000000000000 --- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix +++ /dev/null @@ -1,94 +0,0 @@ -builtins.listToAttrs -[ -{ - name = "polkit-qt-1-0.96.1.tar.bz2"; - value = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr"; -} -{ - name = "kdeaccessibility-4.5.2.tar.bz2"; - value = "1iv94vvngxs94vl3ssjq1y2sd50wcc7s7gvngwqj534qjd1fj3a2"; -} -{ - name = "kdeadmin-4.5.2.tar.bz2"; - value = "1gy0p9vfx8k1ni92n6p8fhq32i7dazs2vls7f5na8hc6s5wsn861"; -} -{ - name = "kdeartwork-4.5.2.tar.bz2"; - value = "0y7rj70x861a07r80skldzkkbqhh41gsv2vh8cg1n4hqq4l5nj5y"; -} -{ - name = "kdebase-4.5.2.tar.bz2"; - value = "1hwcd3k25bhi73hps4rqc3rh87sdf8syvv0jx4prc6qd2cpjxvp6"; -} -{ - name = "kdebase-runtime-4.5.2.tar.bz2"; - value = "04dbjhkl1zfys6rhjrk3dmqqwzw4hh0hyrm6rn8f1gbiqfcgrkfy"; -} -{ - name = "kdebase-workspace-4.5.2.tar.bz2"; - value = "17jd2ixvsk9f0z30ksmjaasdfza39c80d0ylzkpdjf9nkiiv1pn8"; -} -{ - name = "kdebindings-4.5.2.tar.bz2"; - value = "077n2g4mmfkg7xvz7v8f0m79sp2f72f56ari14j4x073vgf51hfs"; -} -{ - name = "kdeedu-4.5.2.tar.bz2"; - value = "1ljp5jm5iml2s1jdi1n5h8hzqsl7pq98vcdj9bi1pjq3l87gh4i5"; -} -{ - name = "kdegames-4.5.2.tar.bz2"; - value = "0vld69dz2src7ya92a5nqi0739whldxvgphyxm9bavk69x6g129c"; -} -{ - name = "kdegraphics-4.5.2.tar.bz2"; - value = "0zl1df2srnf7xsivyws3zicrj6bginjn6rgi0iq6hx3q9l5lah2d"; -} -{ - name = "kdelibs-4.5.2.tar.bz2"; - value = "1hxlqvcwys1snhahrv1lryv95sh042jikscqmm6vind03pcqrq09"; -} -{ - name = "kdemultimedia-4.5.2.tar.bz2"; - value = "1gxmal28m83r9imasv3nw4c091kllpkivfws8aal63r0dg5n5fy2"; -} -{ - name = "kdenetwork-4.5.2.tar.bz2"; - value = "0k59zf8m34b7xp4h9mj328gjnr73l2d7vf4b4aikv0m2damryp7a"; -} -{ - name = "kdepimlibs-4.5.2.tar.bz2"; - value = "0bag9jhr1azadcz01rfdhdl8nfk6w4cjw3w2zxardar5ri129v2b"; -} -{ - name = "kdeplasma-addons-4.5.2.tar.bz2"; - value = "1pdlwbadk3qyh9rxj4j2b2wjfn7dmi9jcargahc7p7pb8mf0pizw"; -} -{ - name = "kdesdk-4.5.2.tar.bz2"; - value = "0ii7gmshw4207i0hlzz3fl5kc21i4vx2v29jw10ri1vz7pmv9v9q"; -} -{ - name = "kdetoys-4.5.2.tar.bz2"; - value = "01kn14lh00ig33r98xjly37ad7w1cwvc4l02hswbqr99smksxn33"; -} -{ - name = "kdeutils-4.5.2.tar.bz2"; - value = "1rh4s60wx253adw7z1j0sp29l43y7xvd2516bwxq0sn8bmp3w7nr"; -} -{ - name = "kdewebdev-4.5.2.tar.bz2"; - value = "02baf8h4v688x03hxr8kliglia1chlarnmzc0gbpnpry9zhwpp5p"; -} -{ - name = "oxygen-icons-4.5.2.tar.bz2"; - value = "0c8hy3vsqpm6n52v6w3igj78s0qy6cb3m6fm8qh795rpw495d5yj"; -} -{ - name = "kdepim-4.4.7.tar.bz2"; - value = "0jjv1y23hwlkwdvqf3pcs37hzcnnxz5baa4vw1wznj4v816ixj1s"; -} -{ - name = "kdepim-runtime-4.4.7.tar.bz2"; - value = "196gkz2jbphw4r9i91jaz6wd4wnyxavc1na2kpp9s9cvmiafcp7m"; -}] diff --git a/pkgs/desktops/kde-4.5/l10n/manifest-4.5.4.nix b/pkgs/desktops/kde-4.5/l10n/manifest-4.5.4.nix new file mode 100644 index 0000000000000..99d4e4b0d86d3 --- /dev/null +++ b/pkgs/desktops/kde-4.5/l10n/manifest-4.5.4.nix @@ -0,0 +1,222 @@ +[ +{ + lang = "ar"; + sha256 = "1yn5dvd2d6wk12434x7v463ywz0sn1d9z2fhsbhclwzns3p07brn"; +} +{ + lang = "bg"; + sha256 = "0dnhywbld5ll4wvpl42kn6bnffjr72d4wp36446ffnwkqvhwg0bm"; +} +{ + lang = "ca"; + sha256 = "0i6cplf7fsr4q6yyv2y4sj1d44zd4d81h3mh6fbc0icq42im4pyq"; +} +{ + lang = "ca@valencia"; + sha256 = "1p55xn6k47ag4ph8byaasp27sczh6asqj0x8677hacmm01vps4xy"; +} +{ + lang = "cs"; + sha256 = "16yz0yc8b0g2kzpywi4a0xys6rkj47n45l3i4f39ycypxavqya0v"; +} +{ + lang = "da"; + sha256 = "0pc4im8rd4n6wn65gwyiyl4c414kp1gspw45xzj3mssbpghhn0ic"; +} +{ + lang = "de"; + sha256 = "1apdjmyb3f07rjld43yabr3bvvb8xikhlzr0zmv37y43bzbvlk9x"; +} +{ + lang = "el"; + sha256 = "1irh0pjaxfx893792s3wl0k8m9cy6c428isdlnij1mdbpyg4pw9d"; +} +{ + lang = "en_GB"; + sha256 = "08248znhd1pxgx6izi8pfrccm31fm083bq4i9d9f4m3b9svxj63i"; +} +{ + lang = "eo"; + sha256 = "1ydizv2sggfdwlh9vlf9dzf7pwjvqj3aa1vx1wdb1qzp913kixy9"; +} +{ + lang = "es"; + sha256 = "11545n83bknw6a1h1dw3sxlswhqj8mm0nm9nricrmjwxhi2r2gma"; +} +{ + lang = "et"; + sha256 = "1dpk4h5yfg5ljf5l6yg5i8r4v4k5cq4dq8bdir883lwlkvzmql5j"; +} +{ + lang = "eu"; + sha256 = "1qfhqbpxh1mgxbzh7l8gb0xsm9pi50mq48ya32s8a502khwwxh41"; +} +{ + lang = "fi"; + sha256 = "11a03s37sd1fn0s0yx8lf369l8da3qmf6aqagrlsn3cj9rwa3pn6"; +} +{ + lang = "fr"; + sha256 = "0f739jlpxfqyd41y0l5ydmdjwmn3ihvcxihl3v2cmwyaxfhvapbj"; +} +{ + lang = "fy"; + sha256 = "057n58mnryjxqh3v9vyf5qysf6xilmiw1p6gnsdnmqvznccmx7j7"; +} +{ + lang = "ga"; + sha256 = "1wbc9mxj7yf630x3dqabv783dv012k6xna362a7cy3pzbdr49kl2"; +} +{ + lang = "gl"; + sha256 = "0vg248wbmfmcdskq60nafnkly9l3i32yz21xbwjmnvs2drwphayz"; +} +{ + lang = "gu"; + sha256 = "14misxmdi5v26fql40vqwjci93l5jrjqrwd049pj5i0jnrjhy5rd"; +} +{ + lang = "he"; + sha256 = "19h2ca93kqr293qjg0gy5mpgw0x3cgdmjs70k42781zl4xz1prjp"; +} +{ + lang = "hi"; + sha256 = "0qhp5ml6jindbxds8mllnsyi5c0mlnmwppfdxjapg0m229f6dgh6"; +} +{ + lang = "hr"; + sha256 = "08i7lg3rii1lciy42ny65k43sn4lv85jl3464rn7a91yvbk18iym"; +} +{ + lang = "hu"; + sha256 = "0wfxqcjpi0yl7xsnpb5k25jl0c7haf9dr2f85wmw6iv2iamdkfmh"; +} +{ + lang = "ia"; + sha256 = "1ixqr026g4fi7fbrr7wi49h3662b3jdb8nsfqs5dd41mjchk20c8"; +} +{ + lang = "id"; + sha256 = "079n7q5nx5mass01dqqngvajjfs4qdcdl9d9jdzkn4fzhffpgdap"; +} +{ + lang = "is"; + sha256 = "150snwlbyv7461bh6yfl8cq5dv5alxf37grdgq2zynkpnx9i3s8k"; +} +{ + lang = "it"; + sha256 = "07bza0by629gywqxkxchzvlw8fs1swg7ivpr3zn48lm8ka9xqx3s"; +} +{ + lang = "ja"; + sha256 = "0bpjahc276wm0fscnlffqq2m838jkir17s4v12q0zr0dmryxd7lc"; +} +{ + lang = "kk"; + sha256 = "11cyklk2j6igmq71j7fcr9gg8jn99lq6z9yi77p7hn4rid7dflgp"; +} +{ + lang = "km"; + sha256 = "0d7f7zz6ys3yfq3wlbk621yy7zzblzb3zv8g849mbpb5m5rl6bsg"; +} +{ + lang = "kn"; + sha256 = "0hcri8am13sy7qnl0459b7cphb0jw4fc40nqw3crrdrsr8677abj"; +} +{ + lang = "ko"; + sha256 = "0zz6k2xgfvb80031dinsyp6crgr1iy0iv1d0m2bq1985aa98rrih"; +} +{ + lang = "lt"; + sha256 = "1knzjdhl98h8jdad5dwkqkiqs7wwib57jvs3jf0zacvqbcpchwb7"; +} +{ + lang = "lv"; + sha256 = "0pm9k4ww10dnyvkgkm6n8cddwlj5431k17sbshgmgjnw9bszk798"; +} +{ + lang = "ml"; + sha256 = "06j6124q2mmpjs5y3gqy7fxgldwnvq5683394s3m23n8q81yg0wj"; +} +{ + lang = "nb"; + sha256 = "180vsfx87ynizzga878757qjnj1k91qad57iisw5hqcxk2fg3v22"; +} +{ + lang = "nds"; + sha256 = "16i9wz1lzkqij61raffm8h4l6fjri4h9ybbgxy7nlqiqaj67jghl"; +} +{ + lang = "nl"; + sha256 = "1clrmccm2vdvi9v7f2yqhhf69iln57m7hpw2638is6fs31ivyr1v"; +} +{ + lang = "nn"; + sha256 = "0447v1wzbb7bvmpbcyav3gv45vv4zl9p9nj3sk45c8md1by82hc3"; +} +{ + lang = "pa"; + sha256 = "1fbrfczjp2yliz13swha2f4767jwzy9bi1hb1dqi2yjhyqhj7k6p"; +} +{ + lang = "pl"; + sha256 = "1xzsfrxwgf6kmfa1j5dy699rxaxmc3vpcv8zgqi96kwwhqmmwn9p"; +} +{ + lang = "pt"; + sha256 = "08gdvkbqfshbgf6zwyg05g05kc7hm81s01z7p67jc2q80vkl7ahz"; +} +{ + lang = "pt_BR"; + sha256 = "05x600wzp7x1hx262pmb27js146j6sv9c3mbw748q1l3c7cdp0xs"; +} +{ + lang = "ro"; + sha256 = "13r08mka2j6zyz4a3ycs57zaj4ipjdv12sbag0bjwk9dx5x45xs5"; +} +{ + lang = "ru"; + sha256 = "0yw8aax09yl89ab15rlc66lmx4x552hkg5fd89vnhlbk2h9v1rms"; +} +{ + lang = "sk"; + sha256 = "1k905nmvbig7qmbq83y9jbgp72vg9l1mj2iahqz4r726zpqz4fxq"; +} +{ + lang = "sl"; + sha256 = "1ywy35wj8aa17q7hf692dwi7s0xi8ns9p0pmfm13nz8214rbmc4q"; +} +{ + lang = "sr"; + sha256 = "0rqycg08wgrcvphd4mxjsk460nflpv78r0wil4bsqfa8i774v8r0"; +} +{ + lang = "sv"; + sha256 = "0rl2hdnhn9r5yk4zp1sxbxhqchs411kffs5krdym19a3kl83zp36"; +} +{ + lang = "th"; + sha256 = "0n62zs6sjfdkyxs7n6hmji8bzl9y2r4gsqs0jysmjkz23y6160bh"; +} +{ + lang = "tr"; + sha256 = "0phc1cbp98bilvscxnxnbzwgk85ilws5l3n3bsgbkqrh5rqz9fyn"; +} +{ + lang = "uk"; + sha256 = "1hy7hriikvmpjgmxf1zw2j0hkv6f8ig8v20damcivkid3maj307g"; +} +{ + lang = "wa"; + sha256 = "11zwqkv1qpqgxxqvq0y92xyq88czzyx76krx1qbc0d50mv5zk91r"; +} +{ + lang = "zh_CN"; + sha256 = "0pn3xd91ka20mf35rsdyf9sp3cwf9dpxn7lradz2380mkira6mp0"; +} +{ + lang = "zh_TW"; + sha256 = "0zx879d0fkgblfq6574kq4wdhip729ni8v1cjhg0v97l7pnridzk"; +} +] diff --git a/pkgs/desktops/kde-4.5/libs/default.nix b/pkgs/desktops/kde-4.5/libs/default.nix index 91afbf826fe7f..a0b4681769f1c 100644 --- a/pkgs/desktops/kde-4.5/libs/default.nix +++ b/pkgs/desktops/kde-4.5/libs/default.nix @@ -36,7 +36,7 @@ kde.package { license = "LGPL"; kde = { name = "kdelibs"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/multimedia/default.nix b/pkgs/desktops/kde-4.5/multimedia/default.nix index 192a85efa7618..eb0574a8fc55e 100644 --- a/pkgs/desktops/kde-4.5/multimedia/default.nix +++ b/pkgs/desktops/kde-4.5/multimedia/default.nix @@ -14,7 +14,7 @@ kde.package { license = "GPL"; kde = { name = "kdemultimedia"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/network/default.nix b/pkgs/desktops/kde-4.5/network/default.nix index 42feaacefdb12..244935ec397ec 100644 --- a/pkgs/desktops/kde-4.5/network/default.nix +++ b/pkgs/desktops/kde-4.5/network/default.nix @@ -30,7 +30,7 @@ kde.package { license = "GPL"; kde = { name = "kdenetwork"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/pim-runtime/default.nix b/pkgs/desktops/kde-4.5/pim-runtime/default.nix index 98a04d00f1c65..d92f1eecc73ba 100644 --- a/pkgs/desktops/kde-4.5/pim-runtime/default.nix +++ b/pkgs/desktops/kde-4.5/pim-runtime/default.nix @@ -1,22 +1,27 @@ -{ kde, cmake, qt4, perl, libxml2, libxslt, boost, shared_mime_info +{ kde, fetchurl, cmake, qt4, perl, libxml2, libxslt, boost, shared_mime_info , kdelibs, kdepimlibs , automoc4, phonon, akonadi, soprano, strigi}: -kde.package { +kde.package rec { buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info kdelibs kdepimlibs automoc4 phonon akonadi soprano strigi ]; prePatch = '' find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@" ''; + + src = fetchurl { + url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.name}-${meta.kde.version}.tar.bz2"; + sha256 = "029a0i83b2yrc1xn9as7gc9rakpxjh5cjmqcmhrrj0xwalqz490n"; + }; + meta = { description = "KDE PIM runtime"; homepage = http://www.kde.org; license = "GPL"; - kde = rec { + kde = { name = "kdepim-runtime"; - version = "4.4.7"; - subdir = "kdepim-${version}/src"; + version = "4.4.8"; }; }; } diff --git a/pkgs/desktops/kde-4.5/pim/default.nix b/pkgs/desktops/kde-4.5/pim/default.nix index 360719a8b4370..cdcc3dc023dbf 100644 --- a/pkgs/desktops/kde-4.5/pim/default.nix +++ b/pkgs/desktops/kde-4.5/pim/default.nix @@ -1,8 +1,8 @@ -{ kde, cmake, perl, boost, gpgme, libassuan, libgpgerror, libxslt +{ kde, fetchurl, cmake, perl, boost, gpgme, libassuan, libgpgerror, libxslt , shared_mime_info, libXScrnSaver, kdelibs, kdepimlibs, kdepim_runtime , automoc4, akonadi, qca2}: -kde.package { +kde.package rec { buildInputs = [ cmake boost gpgme libassuan libgpgerror libxslt shared_mime_info libXScrnSaver kdelibs kdepimlibs automoc4 akonadi ]; @@ -13,6 +13,12 @@ kde.package { mkdir -p $out/nix-support/ echo ${akonadi} ${kdepimlibs} ${kdepim_runtime} > $out/nix-support/propagated-user-env-packages ''; + + src = fetchurl { + url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.name}-${meta.kde.version}.tar.bz2"; + sha256 = "02nbdn8s4504ljqz0qylm1jyw4hpg5fjw3vi6sbzm522xvkax4wh"; + }; + meta = { description = "KDE PIM tools"; longDescription = '' @@ -20,10 +26,9 @@ kde.package { ''; license = "GPL"; homepage = http://pim.kde.org; - kde = rec { + kde = { name = "kdepim"; - version = "4.4.7"; - subdir = "kdepim-${version}/src"; + version = "4.4.8"; }; }; } diff --git a/pkgs/desktops/kde-4.5/pimlibs/default.nix b/pkgs/desktops/kde-4.5/pimlibs/default.nix index cb375faad7ac6..cbda200c607fb 100644 --- a/pkgs/desktops/kde-4.5/pimlibs/default.nix +++ b/pkgs/desktops/kde-4.5/pimlibs/default.nix @@ -12,7 +12,7 @@ kde.package { license = "LGPL"; kde = { name = "kdepimlibs"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/plasma-addons/default.nix b/pkgs/desktops/kde-4.5/plasma-addons/default.nix index 2071c18ba0bb5..e0a31d499b0dc 100644 --- a/pkgs/desktops/kde-4.5/plasma-addons/default.nix +++ b/pkgs/desktops/kde-4.5/plasma-addons/default.nix @@ -17,7 +17,7 @@ kde.package { license = "GPL"; kde = { name = "kdeplasma-addons"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/sdk/cervisia.nix b/pkgs/desktops/kde-4.5/sdk/cervisia.nix index afaeb39ef7934..7a7ef2767d1c5 100644 --- a/pkgs/desktops/kde-4.5/sdk/cervisia.nix +++ b/pkgs/desktops/kde-4.5/sdk/cervisia.nix @@ -9,7 +9,7 @@ kde.package { name = "cervisia"; module = "kdesdk"; version = "3.5.0"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "cervisia/version.h"; }; }; diff --git a/pkgs/desktops/kde-4.5/sdk/dolphin-plugins.nix b/pkgs/desktops/kde-4.5/sdk/dolphin-plugins.nix index 0710dfdc5239c..d0753c8f2958d 100644 --- a/pkgs/desktops/kde-4.5/sdk/dolphin-plugins.nix +++ b/pkgs/desktops/kde-4.5/sdk/dolphin-plugins.nix @@ -10,7 +10,7 @@ kde.package { kde = { name = "dolphin-plugins"; module = "kdesdk"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/sdk/kapptemplate.nix b/pkgs/desktops/kde-4.5/sdk/kapptemplate.nix index 33fcd31d256db..c4ea482d78d2a 100644 --- a/pkgs/desktops/kde-4.5/sdk/kapptemplate.nix +++ b/pkgs/desktops/kde-4.5/sdk/kapptemplate.nix @@ -10,7 +10,7 @@ kde.package { name = "kapptemplate"; module = "kdesdk"; version = "0.1"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "kapptemplate/main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.5/sdk/kate.nix b/pkgs/desktops/kde-4.5/sdk/kate.nix index 7519811c545f2..336781a44ca98 100644 --- a/pkgs/desktops/kde-4.5/sdk/kate.nix +++ b/pkgs/desktops/kde-4.5/sdk/kate.nix @@ -10,7 +10,7 @@ kde.package { name = "kate"; module = "kdesdk"; version = "3.5.2"; # (release.major-1).(release.minor).(release.patch) - release = "4.5.2"; + release = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/sdk/kbugbuster.nix b/pkgs/desktops/kde-4.5/sdk/kbugbuster.nix index f8c4e200524b3..d02d2bf7ce77a 100644 --- a/pkgs/desktops/kde-4.5/sdk/kbugbuster.nix +++ b/pkgs/desktops/kde-4.5/sdk/kbugbuster.nix @@ -10,7 +10,7 @@ kde.package { name = "kbugbuster"; module = "kdesdk"; version = "3.80.3"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "version.h"; }; }; diff --git a/pkgs/desktops/kde-4.5/sdk/kcachegrind.nix b/pkgs/desktops/kde-4.5/sdk/kcachegrind.nix index 7fbd7b75a9294..e4f1381e8cad3 100644 --- a/pkgs/desktops/kde-4.5/sdk/kcachegrind.nix +++ b/pkgs/desktops/kde-4.5/sdk/kcachegrind.nix @@ -10,7 +10,7 @@ kde.package { name = "kcachegrind"; module = "kdesdk"; version = "0.6"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "CMakeLists.txt"; }; }; diff --git a/pkgs/desktops/kde-4.5/sdk/kdeaccounts-plugin.nix b/pkgs/desktops/kde-4.5/sdk/kdeaccounts-plugin.nix index fcc83ae6bbce0..dab7becac2741 100644 --- a/pkgs/desktops/kde-4.5/sdk/kdeaccounts-plugin.nix +++ b/pkgs/desktops/kde-4.5/sdk/kdeaccounts-plugin.nix @@ -9,7 +9,7 @@ kde.package { kde = { name = "kdeaccounts-plugin"; module = "kdesdk"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/sdk/kioslave-perldoc.nix b/pkgs/desktops/kde-4.5/sdk/kioslave-perldoc.nix index bf5a1428b2a12..0b6f262a2c7aa 100644 --- a/pkgs/desktops/kde-4.5/sdk/kioslave-perldoc.nix +++ b/pkgs/desktops/kde-4.5/sdk/kioslave-perldoc.nix @@ -11,7 +11,7 @@ kde.package { name = "kioslave-perldoc"; module = "kdesdk"; version = "0.9.1"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "kioslave/perldoc/perldoc.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.5/sdk/kioslave-svn.nix b/pkgs/desktops/kde-4.5/sdk/kioslave-svn.nix index b88631a032902..3a9bc48faf6df 100644 --- a/pkgs/desktops/kde-4.5/sdk/kioslave-svn.nix +++ b/pkgs/desktops/kde-4.5/sdk/kioslave-svn.nix @@ -11,7 +11,7 @@ kde.package { kde = { name = "kioslave-svn"; module = "kdesdk"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/sdk/kmtrace.nix b/pkgs/desktops/kde-4.5/sdk/kmtrace.nix index 9128d905925b9..89927e67b80cc 100644 --- a/pkgs/desktops/kde-4.5/sdk/kmtrace.nix +++ b/pkgs/desktops/kde-4.5/sdk/kmtrace.nix @@ -10,7 +10,7 @@ kde.package { kde = { name = "kmtrace"; module = "kdesdk"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/sdk/kompare.nix b/pkgs/desktops/kde-4.5/sdk/kompare.nix index b7f8e581572b7..4d74d182b5c95 100644 --- a/pkgs/desktops/kde-4.5/sdk/kompare.nix +++ b/pkgs/desktops/kde-4.5/sdk/kompare.nix @@ -10,7 +10,7 @@ kde.package { name = "kompare"; module = "kdesdk"; version = "4.0.0"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.5/sdk/kpartloader.nix b/pkgs/desktops/kde-4.5/sdk/kpartloader.nix index 4b5938cbac1ec..e48166617e585 100644 --- a/pkgs/desktops/kde-4.5/sdk/kpartloader.nix +++ b/pkgs/desktops/kde-4.5/sdk/kpartloader.nix @@ -10,7 +10,7 @@ kde.package { name = "kpartloader"; module = "kdesdk"; version = "1.0"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "kpartloader.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.5/sdk/kprofilemethod.nix b/pkgs/desktops/kde-4.5/sdk/kprofilemethod.nix index 008ea14879315..a85f30345ea2e 100644 --- a/pkgs/desktops/kde-4.5/sdk/kprofilemethod.nix +++ b/pkgs/desktops/kde-4.5/sdk/kprofilemethod.nix @@ -10,7 +10,7 @@ kde.package { kde = { name = "kprofilemethod"; module = "kdesdk"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/sdk/kstartperf.nix b/pkgs/desktops/kde-4.5/sdk/kstartperf.nix index bf7bc9c62e429..23fa4f80cfb36 100644 --- a/pkgs/desktops/kde-4.5/sdk/kstartperf.nix +++ b/pkgs/desktops/kde-4.5/sdk/kstartperf.nix @@ -10,7 +10,7 @@ kde.package { name = "kstartperf"; module = "kdesdk"; version = "1.0"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "kstartperf.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.5/sdk/kuiviewer.nix b/pkgs/desktops/kde-4.5/sdk/kuiviewer.nix index 5631e79a5c962..c75f1be1a7403 100644 --- a/pkgs/desktops/kde-4.5/sdk/kuiviewer.nix +++ b/pkgs/desktops/kde-4.5/sdk/kuiviewer.nix @@ -10,7 +10,7 @@ kde.package { name = "kuiviewer"; module = "kdesdk"; version = "0.1"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.5/sdk/lokalize.nix b/pkgs/desktops/kde-4.5/sdk/lokalize.nix index af0fbd2122615..671e5c10bf7ed 100644 --- a/pkgs/desktops/kde-4.5/sdk/lokalize.nix +++ b/pkgs/desktops/kde-4.5/sdk/lokalize.nix @@ -13,7 +13,7 @@ kde.package { name = "lokalize"; module = "kdesdk"; version = "1.1"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "src/version.h"; }; }; diff --git a/pkgs/desktops/kde-4.5/sdk/poxml.nix b/pkgs/desktops/kde-4.5/sdk/poxml.nix index 677d960fa61eb..72e929c2bbf5b 100644 --- a/pkgs/desktops/kde-4.5/sdk/poxml.nix +++ b/pkgs/desktops/kde-4.5/sdk/poxml.nix @@ -9,7 +9,7 @@ kde.package { kde = { name = "poxml"; module = "kdesdk"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/sdk/scripts.nix b/pkgs/desktops/kde-4.5/sdk/scripts.nix index 1e65501865112..36bdb778b58d4 100644 --- a/pkgs/desktops/kde-4.5/sdk/scripts.nix +++ b/pkgs/desktops/kde-4.5/sdk/scripts.nix @@ -9,7 +9,7 @@ kde.package { kde = { name = "scripts"; module = "kdesdk"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/sdk/strigi-analyzer.nix b/pkgs/desktops/kde-4.5/sdk/strigi-analyzer.nix index b4d5ea5d22a7f..20d484f561e8e 100644 --- a/pkgs/desktops/kde-4.5/sdk/strigi-analyzer.nix +++ b/pkgs/desktops/kde-4.5/sdk/strigi-analyzer.nix @@ -9,7 +9,7 @@ kde.package { kde = { name = "strigi-analyzer"; module = "kdesdk"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/sdk/umbrello.nix b/pkgs/desktops/kde-4.5/sdk/umbrello.nix index c4d877277204e..48a9d0fdfbd45 100644 --- a/pkgs/desktops/kde-4.5/sdk/umbrello.nix +++ b/pkgs/desktops/kde-4.5/sdk/umbrello.nix @@ -10,7 +10,7 @@ kde.package { name = "umbrello"; module = "kdesdk"; version = "2.5.2"; # release - 200 - release = "4.5.2"; + release = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix b/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix index 4a65999a3472c..b4bc205ce87a8 100644 --- a/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix +++ b/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix @@ -12,7 +12,7 @@ kde.package { license = "GPL"; kde = { name = "oxygen-icons"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix b/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix index f01eac882ef1e..9ff43ef5f9b10 100644 --- a/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix +++ b/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix @@ -1,11 +1,17 @@ -{ kde, cmake, qt4, pkgconfig, polkit, automoc4, glib }: +{ kde, fetchurl, cmake, qt4, pkgconfig, polkit, automoc4, glib }: -kde.package { +kde.package rec { buildInputs = [ cmake qt4 automoc4 ]; propagatedBuildInputs = [ polkit glib ]; + + src = fetchurl { + url = with meta.kde; + "mirror://kde/stable/apps/KDE4.x/admin/${name}-${version}.tar.bz2"; + sha256 = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr"; + }; + meta.kde = { name = "polkit-qt-1"; version = "0.96.1"; - subdir = "apps/KDE4.x/admin"; }; } diff --git a/pkgs/desktops/kde-4.5/toys/amor.nix b/pkgs/desktops/kde-4.5/toys/amor.nix index e7e3ad8210829..e994dea088461 100644 --- a/pkgs/desktops/kde-4.5/toys/amor.nix +++ b/pkgs/desktops/kde-4.5/toys/amor.nix @@ -9,7 +9,7 @@ kde.package { name = "amor"; module = "kdetoys"; version = "2.4.0"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "src/version.h"; }; }; diff --git a/pkgs/desktops/kde-4.5/toys/kteatime.nix b/pkgs/desktops/kde-4.5/toys/kteatime.nix index 90ce0fa71c1e6..601de020a6c5b 100644 --- a/pkgs/desktops/kde-4.5/toys/kteatime.nix +++ b/pkgs/desktops/kde-4.5/toys/kteatime.nix @@ -9,7 +9,7 @@ kde.package { name = "kteatime"; module = "kdetoys"; version = "1.2.1"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "src/main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.5/toys/ktux.nix b/pkgs/desktops/kde-4.5/toys/ktux.nix index ae1b407a43013..0a2deec43e589 100644 --- a/pkgs/desktops/kde-4.5/toys/ktux.nix +++ b/pkgs/desktops/kde-4.5/toys/ktux.nix @@ -9,7 +9,7 @@ kde.package { name = "ktux"; module = "kdetoys"; version = "1.0.1"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "src/sprite.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.5/utils/ark.nix b/pkgs/desktops/kde-4.5/utils/ark.nix index 32ff0440862b1..0437406f72f8c 100644 --- a/pkgs/desktops/kde-4.5/utils/ark.nix +++ b/pkgs/desktops/kde-4.5/utils/ark.nix @@ -14,7 +14,7 @@ kde.package { name = "ark"; module = "kdeutils"; version = "2.15"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "app/main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.5/utils/kcalc.nix b/pkgs/desktops/kde-4.5/utils/kcalc.nix index e35aee61862ca..05aa5f752e4ec 100644 --- a/pkgs/desktops/kde-4.5/utils/kcalc.nix +++ b/pkgs/desktops/kde-4.5/utils/kcalc.nix @@ -9,7 +9,7 @@ kde.package { name = "kcalc"; module = "kdeutils"; version = "2.7"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "version.h"; }; }; diff --git a/pkgs/desktops/kde-4.5/utils/kcharselect.nix b/pkgs/desktops/kde-4.5/utils/kcharselect.nix index 10e038fe3a302..069ab67669c3a 100644 --- a/pkgs/desktops/kde-4.5/utils/kcharselect.nix +++ b/pkgs/desktops/kde-4.5/utils/kcharselect.nix @@ -9,7 +9,7 @@ kde.package { name = "kcharselect"; module = "kdeutils"; version = "1.7"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "main.cc"; }; }; diff --git a/pkgs/desktops/kde-4.5/utils/kdf.nix b/pkgs/desktops/kde-4.5/utils/kdf.nix index efe735486f013..23a9bfa68959e 100644 --- a/pkgs/desktops/kde-4.5/utils/kdf.nix +++ b/pkgs/desktops/kde-4.5/utils/kdf.nix @@ -9,7 +9,7 @@ kde.package { name = "kdf"; module = "kdeutils"; version = "0.11"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "kdf.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.5/utils/kfloppy.nix b/pkgs/desktops/kde-4.5/utils/kfloppy.nix index faafcfc062999..f7ff38b851069 100644 --- a/pkgs/desktops/kde-4.5/utils/kfloppy.nix +++ b/pkgs/desktops/kde-4.5/utils/kfloppy.nix @@ -8,7 +8,7 @@ kde.package { kde = { name = "kfloppy"; module = "kdeutils"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/utils/kgpg.nix b/pkgs/desktops/kde-4.5/utils/kgpg.nix index 8f41e5472f102..62cf26df915e7 100644 --- a/pkgs/desktops/kde-4.5/utils/kgpg.nix +++ b/pkgs/desktops/kde-4.5/utils/kgpg.nix @@ -9,7 +9,7 @@ kde.package { name = "kgpg"; module = "kdeutils"; version = "2.4.1"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.5/utils/kremotecontrol.nix b/pkgs/desktops/kde-4.5/utils/kremotecontrol.nix index 7dcf4bb5789fb..b353bdba53cf2 100644 --- a/pkgs/desktops/kde-4.5/utils/kremotecontrol.nix +++ b/pkgs/desktops/kde-4.5/utils/kremotecontrol.nix @@ -8,7 +8,7 @@ kde.package { kde = { name = "kremotecontrol"; module = "kdeutils"; - version = "4.5.2"; + version = "4.5.4"; }; }; } diff --git a/pkgs/desktops/kde-4.5/utils/ktimer.nix b/pkgs/desktops/kde-4.5/utils/ktimer.nix index 6595e625b1254..a2193d283b1af 100644 --- a/pkgs/desktops/kde-4.5/utils/ktimer.nix +++ b/pkgs/desktops/kde-4.5/utils/ktimer.nix @@ -9,7 +9,7 @@ kde.package { name = "ktimer"; module = "kdeutils"; version = "0.6"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.5/utils/kwallet.nix b/pkgs/desktops/kde-4.5/utils/kwallet.nix index d5f048ba57f76..d8ee32ff79487 100644 --- a/pkgs/desktops/kde-4.5/utils/kwallet.nix +++ b/pkgs/desktops/kde-4.5/utils/kwallet.nix @@ -9,7 +9,7 @@ kde.package { name = "kwallet"; module = "kdeutils"; version = "1.6"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.5/utils/okteta.nix b/pkgs/desktops/kde-4.5/utils/okteta.nix index ecff1942dcd32..1390960aefe9b 100644 --- a/pkgs/desktops/kde-4.5/utils/okteta.nix +++ b/pkgs/desktops/kde-4.5/utils/okteta.nix @@ -9,7 +9,7 @@ kde.package { name = "okteta"; module = "kdeutils"; version = "0.5.2"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "program/about.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.5/utils/printer-applet.nix b/pkgs/desktops/kde-4.5/utils/printer-applet.nix index a7e7938320f44..6b2a297a2654f 100644 --- a/pkgs/desktops/kde-4.5/utils/printer-applet.nix +++ b/pkgs/desktops/kde-4.5/utils/printer-applet.nix @@ -15,7 +15,7 @@ kde.package { name = "printer-applet"; module = "kdeutils"; version = "1.5"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "printer-applet.py"; }; }; diff --git a/pkgs/desktops/kde-4.5/utils/superkaramba.nix b/pkgs/desktops/kde-4.5/utils/superkaramba.nix index 75460935e2775..407f924e241ef 100644 --- a/pkgs/desktops/kde-4.5/utils/superkaramba.nix +++ b/pkgs/desktops/kde-4.5/utils/superkaramba.nix @@ -11,7 +11,7 @@ kde.package { name = "superkaramba"; module = "kdeutils"; version = "0.55"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "src/main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.5/utils/sweeper.nix b/pkgs/desktops/kde-4.5/utils/sweeper.nix index 7a10910ced1d0..feef23c75524d 100644 --- a/pkgs/desktops/kde-4.5/utils/sweeper.nix +++ b/pkgs/desktops/kde-4.5/utils/sweeper.nix @@ -9,7 +9,7 @@ kde.package { name = "sweeper"; module = "kdeutils"; version = "1.5"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.5/webdev/kfilereplace.nix b/pkgs/desktops/kde-4.5/webdev/kfilereplace.nix index bd3518f9c9d36..c90c151b3bff2 100644 --- a/pkgs/desktops/kde-4.5/webdev/kfilereplace.nix +++ b/pkgs/desktops/kde-4.5/webdev/kfilereplace.nix @@ -10,7 +10,7 @@ kde.package { name = "kfilereplace"; module = "kdewebdev"; version = "0.1"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.5/webdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.5/webdev/kimagemapeditor.nix index ecc1f845b8f7d..93a06b21ae581 100644 --- a/pkgs/desktops/kde-4.5/webdev/kimagemapeditor.nix +++ b/pkgs/desktops/kde-4.5/webdev/kimagemapeditor.nix @@ -10,7 +10,7 @@ kde.package { name = "kimagemapeditor"; module = "kdewebdev"; version = "3.9.0"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "version.h"; }; }; diff --git a/pkgs/desktops/kde-4.5/webdev/klinkstatus.nix b/pkgs/desktops/kde-4.5/webdev/klinkstatus.nix index e87832ee62f8e..8c27fbf418655 100644 --- a/pkgs/desktops/kde-4.5/webdev/klinkstatus.nix +++ b/pkgs/desktops/kde-4.5/webdev/klinkstatus.nix @@ -12,7 +12,7 @@ kde.package { name = "klinkstatus"; module = "kdewebdev"; version = "0.7.0"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "src/main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.5/webdev/kommander.nix b/pkgs/desktops/kde-4.5/webdev/kommander.nix index 00d238c769397..0dc23b2152d2c 100644 --- a/pkgs/desktops/kde-4.5/webdev/kommander.nix +++ b/pkgs/desktops/kde-4.5/webdev/kommander.nix @@ -9,7 +9,7 @@ kde.package { name = "kommander"; module = "kdewebdev"; version = "1.91"; - release = "4.5.2"; + release = "4.5.4"; versionFile = "lib/kommanderversion.h"; }; }; |