From 706a9ed1e8ce6ffafe414ad7992996abbac1beef Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 22 Dec 2010 17:03:30 +0000 Subject: [PATCH 01/23] Added MySQL-python + nose (which is a dependency) svn path=/nixpkgs/trunk/; revision=25245 --- pkgs/top-level/python-packages.nix | 32 ++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b3a39592c78..346648c94d3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -479,6 +479,19 @@ rec { }; }); + nose = buildPythonPackage { + name = "nose-0.11.3"; + + src = fetchurl { + url = http://python-nose.googlecode.com/files/nose-0.11.3.tar.gz; + sha256 = "1hl3lbwdfl2a64q3dxc73kbiks4iwx5cixlbavyryd8xdr7iziww"; + }; + + meta = { + description = "A unittest-based testing framework for python that makes writing and running tests easier"; + }; + }; + notify = pkgs.stdenv.mkDerivation (rec { name = "python-notify-0.1.1"; @@ -908,6 +921,25 @@ rec { homepage = https://github.com/ahupp/python-magic; }; }; + + MySQL_python = buildPythonPackage { + name = "MySQL-python-1.2.3"; + + doCheck = false; + + src = fetchurl { + url = mirror://sourceforge/mysql-python/MySQL-python-1.2.3.tar.gz; + sha256 = "0vkyg9dmj29hzk7fy77f42p7bfj28skyzsjsjry4wqr3z6xnzrkx"; + }; + + propagatedBuildInputs = [ pkgs.mysql pkgs.zlib nose ]; + + meta = { + description = "MySQL database binding for Python"; + + homepage = http://sourceforge.net/projects/mysql-python; + }; + }; setuptoolsDarcs = buildPythonPackage { name = "setuptools-darcs-1.2.9"; From 3f7c7b4ad45fc9d4687376640ad32b7a4220e448 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Thu, 23 Dec 2010 13:20:32 +0000 Subject: [PATCH 02/23] update to 1.2.1 svn path=/nixpkgs/trunk/; revision=25254 --- pkgs/games/scummvm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 1397bfef151..2ba2da12b34 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, SDL, zlib, mpeg2dec}: stdenv.mkDerivation { - name = "scummvm-1.2.0"; + name = "scummvm-1.2.1"; src = fetchurl { - url = mirror://sourceforge/scummvm/scummvm-1.2.0.tar.bz2; - sha256 = "1h6sskqjg0cqyan1xkw1vbdqnfpqg42cgbmzpgclmhg3gi6mkz1z"; + url = mirror://sourceforge/scummvm/scummvm-1.2.1.tar.bz2; + sha256 = "029abzvpz85accwk7x79w255wr83gnkqg3yc5n6ryl28zg00z3j8"; }; buildInputs = [SDL zlib mpeg2dec]; From ce6b26042d6c21d9066816159d1daa1d62077a22 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Thu, 23 Dec 2010 13:56:04 +0000 Subject: [PATCH 03/23] update to 2.7.8 svn path=/nixpkgs/trunk/; revision=25257 --- .../networking/instant-messengers/pidgin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 033f239de44..fac93102ea5 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -21,10 +21,10 @@ } : stdenv.mkDerivation { - name = "pidgin-2.7.7"; + name = "pidgin-2.7.8"; src = fetchurl { - url = mirror://sourceforge/pidgin/pidgin-2.7.7.tar.bz2; - sha256 = "079gyxszrmzh4lhn1qk7s3v95amx78dv0yy5z3hpfd8fa4jdrvkc"; + url = mirror://sourceforge/pidgin/pidgin-2.7.8.tar.bz2; + sha256 = "1ci173g1xshfi4pl9wqv9g3fwxyqvdz5v61bgqpfij0hl1ss9k4c"; }; inherit nss ncurses; From 8e81fd9ee8507dff08e6689cb1f9ba5ad38e89da Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 23 Dec 2010 17:35:09 +0000 Subject: [PATCH 04/23] Bumped versions of disnix and disnixos svn path=/nixpkgs/trunk/; revision=25262 --- pkgs/tools/package-management/disnix/default.nix | 6 +++--- pkgs/tools/package-management/disnix/disnixos/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 732ba2ad181..49c51745d46 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv}: stdenv.mkDerivation { - name = "disnix-0.2pre25135"; + name = "disnix-0.2pre25258"; src = fetchurl { - url = http://hydra.nixos.org/build/811133/download/4/disnix-0.2pre25135.tar.gz; - sha256 = "0ivblsgbl6fc4vqhs8zjw2qn463qlhnlzb5h34zyl0lya6wggcsd"; + url = http://hydra.nixos.org/build/824993/download/4/disnix-0.2pre25258.tar.gz; + sha256 = "1lj1mji34s79vhs6r8mcm8l5njbvs9m17nn5r16yqz820wisr4a7"; }; buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 317a47e0783..c7ed91175a6 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, disnix, socat, pkgconfig}: stdenv.mkDerivation { - name = "disnixos"; + name = "disnixos-0.1pre25259"; src = fetchurl { - url = http://hydra.nixos.org/build/812999/download/1/disnixos-0.1pre25200.tar.gz; - sha256 = "1cw0wg5x65nanrjfj67nk1jxngaqh2l7msx03s536hssm9g2mv7r"; + url = http://hydra.nixos.org/build/825090/download/1/disnixos-0.1pre25259.tar.gz; + sha256 = "0g1pjw2f7jacp8kd9q90bihvr3s3cz9l19ddjfajc0harall61ms"; }; buildInputs = [ socat pkgconfig disnix ]; dontStrip = true; From 51d6c8df916ae9fe482655af84562faa0dcd72c6 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Thu, 23 Dec 2010 19:28:06 +0000 Subject: [PATCH 05/23] * Handle variable createFindlibDestdir correctly in ocaml-findlib * Fix HOL Light derivation svn path=/nixpkgs/trunk/; revision=25269 --- pkgs/applications/science/logic/hol_light/default.nix | 8 ++++---- pkgs/development/tools/ocaml/findlib/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 932412daf75..f923095f857 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -1,4 +1,4 @@ -{stdenv, writeText, writeTextFile, ocaml, camlp5_transitional, hol_light_sources}: +{stdenv, writeText, writeTextFile, ocaml, findlib, camlp5_transitional, hol_light_sources}: let version = hol_light_sources.version; @@ -10,11 +10,11 @@ let pa_j_cmo = stdenv.mkDerivation { name = "pa_j.cmo"; inherit ocaml camlp5; - buildInputs = [ ocaml camlp5 ]; + buildInputs = [ ocaml camlp5 findlib ]; buildCommand = '' ocamlc -c \ -pp "camlp5r pa_lexer.cmo pa_extend.cmo q_MLast.cmo" \ - -I "${camlp5}/lib/ocaml/camlp5" \ + -I "$(ocamlfind query camlp5)" \ -o $out \ "${hol_light_src_dir}/pa_j_`ocamlc -version | cut -c1-4`.ml" ''; @@ -22,7 +22,7 @@ let start_ml = writeText "start.ml" '' Topdirs.dir_directory "${hol_light_src_dir}";; - Topdirs.dir_directory "${camlp5}/lib/ocaml/camlp5";; + Topdirs.dir_directory ("${camlp5}/lib/ocaml/"^Sys.ocaml_version^"/site-lib/camlp5");; Topdirs.dir_load Format.std_formatter "camlp5o.cma";; Topdirs.dir_load Format.std_formatter "${pa_j_cmo}";; #use "${hol_light_src_dir}/make.ml";; diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 9a5b9acbef9..a8000d2cf0e 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml_version}/site-lib/" fi export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml_version}/site-lib/" - if test -n $createFindlibDestdir; then + if test -n "$createFindlibDestdir"; then ensureDir $OCAMLFIND_DESTDIR fi } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2eda702e5c7..d4632cdfec8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7035,7 +7035,7 @@ let hol = callPackage ../applications/science/logic/hol { }; hol_light = callPackage ../applications/science/logic/hol_light { - inherit (ocamlPackages) camlp5_transitional; + inherit (ocamlPackages) findlib camlp5_transitional; }; hol_light_sources = callPackage ../applications/science/logic/hol_light/sources.nix { }; From 801ce7d5fb724f52e73c0654a312a58f2e92f4ca Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sat, 25 Dec 2010 15:13:07 +0000 Subject: [PATCH 06/23] Add Concurrent Clean to NixPkgs. svn path=/nixpkgs/trunk/; revision=25276 --- ...port-do-not-rebuild-equal-timestamps.patch | 17 +++++++ pkgs/development/compilers/clean/default.nix | 50 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 69 insertions(+) create mode 100644 pkgs/development/compilers/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch create mode 100644 pkgs/development/compilers/clean/default.nix diff --git a/pkgs/development/compilers/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch b/pkgs/development/compilers/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch new file mode 100644 index 00000000000..3e0fbe6b996 --- /dev/null +++ b/pkgs/development/compilers/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch @@ -0,0 +1,17 @@ +The clean command line compiler clm checks modules for freshness by comparing timestamps. +However, in chroot builds all files installed have the same timestamp. This leads to clm +trying to rebuild the library modules distributed with the Clean install every time a user +compiles any file. This patch changes the freshness check to use less than instead of less +than or equal to in order to avoid this. + +--- clean-upstream/src/tools/clm/clm.c 2010-12-10 06:12:17.000000000 -0430 ++++ clean/src/tools/clm/clm.c 2010-12-25 10:29:09.840675925 -0430 +@@ -250,7 +250,7 @@ + || (t1.dwHighDateTime==t2.dwHighDateTime && (unsigned)(t1.dwLowDateTime)<=(unsigned)(t2.dwLowDateTime))) + #else + typedef unsigned long FileTime; +-# define FILE_TIME_LE(t1,t2) (t1<=t2) ++# define FILE_TIME_LE(t1,t2) (t1 Date: Sat, 25 Dec 2010 18:06:36 +0000 Subject: [PATCH 07/23] Add tex macro lkproof for making proof figures. svn path=/nixpkgs/trunk/; revision=25277 --- pkgs/misc/tex/lkproof/default.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/misc/tex/lkproof/default.nix diff --git a/pkgs/misc/tex/lkproof/default.nix b/pkgs/misc/tex/lkproof/default.nix new file mode 100644 index 00000000000..2d3a1e5f19c --- /dev/null +++ b/pkgs/misc/tex/lkproof/default.nix @@ -0,0 +1,17 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation { + name = "lkproof-3.1"; + + src = fetchurl { + url = http://mirror.ctan.org/macros/latex/contrib/lkproof.zip; + sha256 = "1qjkjhpc4rm62qxn18r83zdlwnj1wvnkcpdiqlv7w4bakh0gvjly"; + }; + + buildInputs = [ unzip ]; + + installPhase = " + ensureDir $out/share/texmf-nix/tex/generic/lkproof + cp -prd *.sty $out/share/texmf-nix/tex/generic/lkproof + "; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d1611b1925..7a9b13a9111 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7270,6 +7270,8 @@ let tex = tetex; }; + lkproof = callPackage ../misc/tex/lkproof { }; + mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench { lua = lua5; inherit (pythonPackages) pexpect paramiko; From 88d5eeda98f89bbdb3c75b59caa21d76ebbb8cb0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 26 Dec 2010 13:14:15 +0000 Subject: [PATCH 08/23] Adding sauerbraten svn path=/nixpkgs/trunk/; revision=25278 --- pkgs/games/sauerbraten/default.nix | 77 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 79 insertions(+) create mode 100644 pkgs/games/sauerbraten/default.nix diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix new file mode 100644 index 00000000000..aca16d14e36 --- /dev/null +++ b/pkgs/games/sauerbraten/default.nix @@ -0,0 +1,77 @@ +x@{builderDefsPackage + , fetchsvn, mesa, SDL, SDL_image, SDL_mixer + , libpng, zlib, libjpeg, imagemagick, libX11 + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + ["fetchsvn"]; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="sauerbraten"; + version="3331"; + name="${baseName}-r${version}"; + url="https://sauerbraten.svn.sourceforge.net/svnroot/sauerbraten"; + hash="0904hk9rz2x941c9587bfxa4rca81260j3m2hjjrp984w67x2w7y"; + }; +in +rec { + srcDrv = a.fetchsvn { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + rev = sourceInfo.version; + }; + + src = srcDrv + "/"; + + inherit (sourceInfo) name version; + inherit buildInputs; + + phaseNames = ["setVars" "doMakeInstall" "doCreateScripts"]; + + setVars = a.noDepEntry '' + export NIX_LDFLAGS="$NIX_LDFLAGS -lX11" + ''; + + doUnpack = a.fullDepEntry '' + ensureDir $out/share/sauerbraten/build-dir + ln -s $out/share/sauerbraten/build-dir + cd $out/share/sauerbraten/build-dir + (cd ${src}; find . -type d) | tail -n +2 | xargs -L 1 mkdir + (cd ${src}; find . -type f) | while read; do ln -s ${src}/"$REPLY" "$(dirname "$REPLY")"; done + cd src + ls + make clean + sed -e '/[.]h[.]gch/,/-o/s@-o@-x c++-header -o@' -i Makefile + '' ["minInit" "addInputs" "defEnsureDir"]; + + doCreateScripts = a.fullDepEntry '' + cd .. + ensureDir $out/bin + echo '#! /bin/sh' >> $out/bin/sauerbraten_server + echo 'cd "'"$out"'/share/sauerbraten/build-dir"' >> $out/bin/sauerbraten_server + echo './bin_unix/native_server "$@"' >> $out/bin/sauerbraten_server + echo '#! /bin/sh' >> $out/bin/sauerbraten_client + echo 'cd "'"$out"'/share/sauerbraten/build-dir"' >> $out/bin/sauerbraten_client + echo './bin_unix/native_client "$@"' >> $out/bin/sauerbraten_client + chmod a+x $out/bin/sauerbraten_* + '' ["minInit" "defEnsureDir"]; + + meta = { + description = ""; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + # raskin: tested amd64-linux; + # not setting platforms because it is 0.5+ GiB of game data + []; + license = "freeware"; # as an aggregate - data files have different licenses + # code is under zlib license + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a9b13a9111..f677783700f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6784,6 +6784,8 @@ let rogue = callPackage ../games/rogue { }; + sauerbraten = callPackage ../games/sauerbraten {}; + scummvm = callPackage ../games/scummvm { }; scorched3d = callPackage ../games/scorched3d { From 58ca4111ade29c79f61d36a5f928c71d3f0e9f93 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 26 Dec 2010 15:26:01 +0000 Subject: [PATCH 09/23] Start kde-4.6: copy 4.5, remove from release svn path=/nixpkgs/trunk/; revision=25279 --- .../kde-4.6/accessibility/color-schemes.nix | 14 ++ .../kde-4.6/accessibility/icon-themes.nix | 15 ++ pkgs/desktops/kde-4.6/accessibility/jovie.nix | 18 ++ pkgs/desktops/kde-4.6/accessibility/kmag.nix | 17 ++ .../kde-4.6/accessibility/kmousetool.nix | 17 ++ .../desktops/kde-4.6/accessibility/kmouth.nix | 17 ++ pkgs/desktops/kde-4.6/admin/builder.sh | 13 + pkgs/desktops/kde-4.6/admin/default.nix | 26 ++ .../kde-4.6/artwork/FindXscreensaver.cmake | 73 ++++++ pkgs/desktops/kde-4.6/artwork/aurorae.nix | 14 ++ .../kde-4.6/artwork/color-schemes.nix | 15 ++ .../kde-4.6/artwork/desktop-themes.nix | 15 ++ pkgs/desktops/kde-4.6/artwork/emoticons.nix | 15 ++ .../artwork/high-resolution-wallpapers.nix | 15 ++ .../desktops/kde-4.6/artwork/kscreensaver.nix | 16 ++ .../kde-4.6/artwork/nuvola-icon-theme.nix | 16 ++ pkgs/desktops/kde-4.6/artwork/phase-style.nix | 15 ++ pkgs/desktops/kde-4.6/artwork/sounds.nix | 15 ++ pkgs/desktops/kde-4.6/artwork/wallpapers.nix | 15 ++ .../kde-4.6/artwork/weather-wallpapers.nix | 15 ++ .../desktops/kde-4.6/base-runtime/default.nix | 27 +++ .../kde-4.6/base-workspace/default.nix | 27 +++ pkgs/desktops/kde-4.6/base/default.nix | 19 ++ pkgs/desktops/kde-4.6/bindings/default.nix | 37 +++ .../python-site-packages-install-dir.diff | 54 +++++ pkgs/desktops/kde-4.6/bindings/sip-4.11.patch | 67 ++++++ pkgs/desktops/kde-4.6/default.nix | 163 +++++++++++++ pkgs/desktops/kde-4.6/edu/default.nix | 29 +++ pkgs/desktops/kde-4.6/games/default.nix | 22 ++ pkgs/desktops/kde-4.6/graphics/default.nix | 23 ++ pkgs/desktops/kde-4.6/kde-package/default.nix | 60 +++++ .../kde-4.6/kde-package/kde-manifest.sh | 30 +++ .../kde-4.6/kde-package/manifest-4.5.4.nix | 82 +++++++ pkgs/desktops/kde-4.6/l10n/default.nix | 58 +++++ pkgs/desktops/kde-4.6/l10n/l10n-manifest.sh | 31 +++ pkgs/desktops/kde-4.6/l10n/manifest-4.5.1.nix | 218 +++++++++++++++++ pkgs/desktops/kde-4.6/l10n/manifest-4.5.2.nix | 222 ++++++++++++++++++ pkgs/desktops/kde-4.6/l10n/manifest-4.5.3.nix | 222 ++++++++++++++++++ pkgs/desktops/kde-4.6/l10n/manifest-4.5.4.nix | 222 ++++++++++++++++++ pkgs/desktops/kde-4.6/libs/default.nix | 42 ++++ .../kde-4.6/libs/polkit-install.patch | 12 + pkgs/desktops/kde-4.6/multimedia/default.nix | 20 ++ pkgs/desktops/kde-4.6/network/default.nix | 36 +++ .../desktops/kde-4.6/network/log-feature.diff | 60 +++++ pkgs/desktops/kde-4.6/pim-runtime/default.nix | 27 +++ pkgs/desktops/kde-4.6/pim/default.nix | 34 +++ pkgs/desktops/kde-4.6/pimlibs/default.nix | 18 ++ .../kde-4.6/plasma-addons/default.nix | 23 ++ pkgs/desktops/kde-4.6/sdk/cervisia.nix | 16 ++ pkgs/desktops/kde-4.6/sdk/dolphin-plugins.nix | 16 ++ pkgs/desktops/kde-4.6/sdk/find-svn.patch | 59 +++++ pkgs/desktops/kde-4.6/sdk/kapptemplate.nix | 17 ++ pkgs/desktops/kde-4.6/sdk/kate.nix | 16 ++ pkgs/desktops/kde-4.6/sdk/kbugbuster.nix | 17 ++ pkgs/desktops/kde-4.6/sdk/kcachegrind.nix | 17 ++ .../kde-4.6/sdk/kdeaccounts-plugin.nix | 15 ++ .../desktops/kde-4.6/sdk/kioslave-perldoc.nix | 18 ++ pkgs/desktops/kde-4.6/sdk/kioslave-svn.nix | 17 ++ pkgs/desktops/kde-4.6/sdk/kmtrace.nix | 16 ++ pkgs/desktops/kde-4.6/sdk/kompare.nix | 17 ++ pkgs/desktops/kde-4.6/sdk/kpartloader.nix | 17 ++ pkgs/desktops/kde-4.6/sdk/kprofilemethod.nix | 16 ++ pkgs/desktops/kde-4.6/sdk/kstartperf.nix | 17 ++ pkgs/desktops/kde-4.6/sdk/kuiviewer.nix | 17 ++ pkgs/desktops/kde-4.6/sdk/lokalize.nix | 20 ++ pkgs/desktops/kde-4.6/sdk/optional-docs.diff | 39 +++ pkgs/desktops/kde-4.6/sdk/poxml.nix | 15 ++ pkgs/desktops/kde-4.6/sdk/scripts.nix | 15 ++ pkgs/desktops/kde-4.6/sdk/strigi-analyzer.nix | 15 ++ pkgs/desktops/kde-4.6/sdk/umbrello.nix | 16 ++ .../kde-4.6/support/akonadi/default.nix | 19 ++ .../fix-broken-datadir-parameter.patch | 17 ++ .../kde-4.6/support/attica/default.nix | 16 ++ .../kde-4.6/support/automoc4/default.nix | 15 ++ .../kde-4.6/support/eigen/default.nix | 20 ++ .../kde-4.6/support/oxygen-icons/default.nix | 18 ++ .../kde-4.6/support/polkit-qt-1/default.nix | 17 ++ .../desktops/kde-4.6/support/qca2/default.nix | 23 ++ pkgs/desktops/kde-4.6/support/qca2/ossl.nix | 32 +++ .../kde-4.6/support/qimageblitz/default.nix | 21 ++ .../kde-4.6/support/soprano/default.nix | 21 ++ .../kde-4.6/support/strigi/default.nix | 29 +++ pkgs/desktops/kde-4.6/toys/amor.nix | 16 ++ pkgs/desktops/kde-4.6/toys/kteatime.nix | 16 ++ pkgs/desktops/kde-4.6/toys/ktux.nix | 16 ++ pkgs/desktops/kde-4.6/utils/ark.nix | 21 ++ pkgs/desktops/kde-4.6/utils/kcalc.nix | 16 ++ pkgs/desktops/kde-4.6/utils/kcharselect.nix | 16 ++ pkgs/desktops/kde-4.6/utils/kdf.nix | 16 ++ pkgs/desktops/kde-4.6/utils/kfloppy.nix | 14 ++ pkgs/desktops/kde-4.6/utils/kgpg.nix | 16 ++ .../desktops/kde-4.6/utils/kremotecontrol.nix | 14 ++ pkgs/desktops/kde-4.6/utils/ktimer.nix | 16 ++ pkgs/desktops/kde-4.6/utils/kwallet.nix | 16 ++ pkgs/desktops/kde-4.6/utils/okteta.nix | 16 ++ .../desktops/kde-4.6/utils/printer-applet.nix | 22 ++ pkgs/desktops/kde-4.6/utils/superkaramba.nix | 18 ++ pkgs/desktops/kde-4.6/utils/sweeper.nix | 16 ++ pkgs/desktops/kde-4.6/webdev/kfilereplace.nix | 17 ++ .../kde-4.6/webdev/kimagemapeditor.nix | 17 ++ pkgs/desktops/kde-4.6/webdev/klinkstatus.nix | 19 ++ pkgs/desktops/kde-4.6/webdev/kommander.nix | 16 ++ pkgs/top-level/all-packages.nix | 10 + 103 files changed, 3281 insertions(+) create mode 100644 pkgs/desktops/kde-4.6/accessibility/color-schemes.nix create mode 100644 pkgs/desktops/kde-4.6/accessibility/icon-themes.nix create mode 100644 pkgs/desktops/kde-4.6/accessibility/jovie.nix create mode 100644 pkgs/desktops/kde-4.6/accessibility/kmag.nix create mode 100644 pkgs/desktops/kde-4.6/accessibility/kmousetool.nix create mode 100644 pkgs/desktops/kde-4.6/accessibility/kmouth.nix create mode 100644 pkgs/desktops/kde-4.6/admin/builder.sh create mode 100644 pkgs/desktops/kde-4.6/admin/default.nix create mode 100644 pkgs/desktops/kde-4.6/artwork/FindXscreensaver.cmake create mode 100644 pkgs/desktops/kde-4.6/artwork/aurorae.nix create mode 100644 pkgs/desktops/kde-4.6/artwork/color-schemes.nix create mode 100644 pkgs/desktops/kde-4.6/artwork/desktop-themes.nix create mode 100644 pkgs/desktops/kde-4.6/artwork/emoticons.nix create mode 100644 pkgs/desktops/kde-4.6/artwork/high-resolution-wallpapers.nix create mode 100644 pkgs/desktops/kde-4.6/artwork/kscreensaver.nix create mode 100644 pkgs/desktops/kde-4.6/artwork/nuvola-icon-theme.nix create mode 100644 pkgs/desktops/kde-4.6/artwork/phase-style.nix create mode 100644 pkgs/desktops/kde-4.6/artwork/sounds.nix create mode 100644 pkgs/desktops/kde-4.6/artwork/wallpapers.nix create mode 100644 pkgs/desktops/kde-4.6/artwork/weather-wallpapers.nix create mode 100644 pkgs/desktops/kde-4.6/base-runtime/default.nix create mode 100644 pkgs/desktops/kde-4.6/base-workspace/default.nix create mode 100644 pkgs/desktops/kde-4.6/base/default.nix create mode 100644 pkgs/desktops/kde-4.6/bindings/default.nix create mode 100644 pkgs/desktops/kde-4.6/bindings/python-site-packages-install-dir.diff create mode 100644 pkgs/desktops/kde-4.6/bindings/sip-4.11.patch create mode 100644 pkgs/desktops/kde-4.6/default.nix create mode 100644 pkgs/desktops/kde-4.6/edu/default.nix create mode 100644 pkgs/desktops/kde-4.6/games/default.nix create mode 100644 pkgs/desktops/kde-4.6/graphics/default.nix create mode 100644 pkgs/desktops/kde-4.6/kde-package/default.nix create mode 100755 pkgs/desktops/kde-4.6/kde-package/kde-manifest.sh create mode 100644 pkgs/desktops/kde-4.6/kde-package/manifest-4.5.4.nix create mode 100644 pkgs/desktops/kde-4.6/l10n/default.nix create mode 100755 pkgs/desktops/kde-4.6/l10n/l10n-manifest.sh create mode 100644 pkgs/desktops/kde-4.6/l10n/manifest-4.5.1.nix create mode 100644 pkgs/desktops/kde-4.6/l10n/manifest-4.5.2.nix create mode 100644 pkgs/desktops/kde-4.6/l10n/manifest-4.5.3.nix create mode 100644 pkgs/desktops/kde-4.6/l10n/manifest-4.5.4.nix create mode 100644 pkgs/desktops/kde-4.6/libs/default.nix create mode 100644 pkgs/desktops/kde-4.6/libs/polkit-install.patch create mode 100644 pkgs/desktops/kde-4.6/multimedia/default.nix create mode 100644 pkgs/desktops/kde-4.6/network/default.nix create mode 100644 pkgs/desktops/kde-4.6/network/log-feature.diff create mode 100644 pkgs/desktops/kde-4.6/pim-runtime/default.nix create mode 100644 pkgs/desktops/kde-4.6/pim/default.nix create mode 100644 pkgs/desktops/kde-4.6/pimlibs/default.nix create mode 100644 pkgs/desktops/kde-4.6/plasma-addons/default.nix create mode 100644 pkgs/desktops/kde-4.6/sdk/cervisia.nix create mode 100644 pkgs/desktops/kde-4.6/sdk/dolphin-plugins.nix create mode 100644 pkgs/desktops/kde-4.6/sdk/find-svn.patch create mode 100644 pkgs/desktops/kde-4.6/sdk/kapptemplate.nix create mode 100644 pkgs/desktops/kde-4.6/sdk/kate.nix create mode 100644 pkgs/desktops/kde-4.6/sdk/kbugbuster.nix create mode 100644 pkgs/desktops/kde-4.6/sdk/kcachegrind.nix create mode 100644 pkgs/desktops/kde-4.6/sdk/kdeaccounts-plugin.nix create mode 100644 pkgs/desktops/kde-4.6/sdk/kioslave-perldoc.nix create mode 100644 pkgs/desktops/kde-4.6/sdk/kioslave-svn.nix create mode 100644 pkgs/desktops/kde-4.6/sdk/kmtrace.nix create mode 100644 pkgs/desktops/kde-4.6/sdk/kompare.nix create mode 100644 pkgs/desktops/kde-4.6/sdk/kpartloader.nix create mode 100644 pkgs/desktops/kde-4.6/sdk/kprofilemethod.nix create mode 100644 pkgs/desktops/kde-4.6/sdk/kstartperf.nix create mode 100644 pkgs/desktops/kde-4.6/sdk/kuiviewer.nix create mode 100644 pkgs/desktops/kde-4.6/sdk/lokalize.nix create mode 100644 pkgs/desktops/kde-4.6/sdk/optional-docs.diff create mode 100644 pkgs/desktops/kde-4.6/sdk/poxml.nix create mode 100644 pkgs/desktops/kde-4.6/sdk/scripts.nix create mode 100644 pkgs/desktops/kde-4.6/sdk/strigi-analyzer.nix create mode 100644 pkgs/desktops/kde-4.6/sdk/umbrello.nix create mode 100644 pkgs/desktops/kde-4.6/support/akonadi/default.nix create mode 100644 pkgs/desktops/kde-4.6/support/akonadi/fix-broken-datadir-parameter.patch create mode 100644 pkgs/desktops/kde-4.6/support/attica/default.nix create mode 100644 pkgs/desktops/kde-4.6/support/automoc4/default.nix create mode 100644 pkgs/desktops/kde-4.6/support/eigen/default.nix create mode 100644 pkgs/desktops/kde-4.6/support/oxygen-icons/default.nix create mode 100644 pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix create mode 100644 pkgs/desktops/kde-4.6/support/qca2/default.nix create mode 100644 pkgs/desktops/kde-4.6/support/qca2/ossl.nix create mode 100644 pkgs/desktops/kde-4.6/support/qimageblitz/default.nix create mode 100644 pkgs/desktops/kde-4.6/support/soprano/default.nix create mode 100644 pkgs/desktops/kde-4.6/support/strigi/default.nix create mode 100644 pkgs/desktops/kde-4.6/toys/amor.nix create mode 100644 pkgs/desktops/kde-4.6/toys/kteatime.nix create mode 100644 pkgs/desktops/kde-4.6/toys/ktux.nix create mode 100644 pkgs/desktops/kde-4.6/utils/ark.nix create mode 100644 pkgs/desktops/kde-4.6/utils/kcalc.nix create mode 100644 pkgs/desktops/kde-4.6/utils/kcharselect.nix create mode 100644 pkgs/desktops/kde-4.6/utils/kdf.nix create mode 100644 pkgs/desktops/kde-4.6/utils/kfloppy.nix create mode 100644 pkgs/desktops/kde-4.6/utils/kgpg.nix create mode 100644 pkgs/desktops/kde-4.6/utils/kremotecontrol.nix create mode 100644 pkgs/desktops/kde-4.6/utils/ktimer.nix create mode 100644 pkgs/desktops/kde-4.6/utils/kwallet.nix create mode 100644 pkgs/desktops/kde-4.6/utils/okteta.nix create mode 100644 pkgs/desktops/kde-4.6/utils/printer-applet.nix create mode 100644 pkgs/desktops/kde-4.6/utils/superkaramba.nix create mode 100644 pkgs/desktops/kde-4.6/utils/sweeper.nix create mode 100644 pkgs/desktops/kde-4.6/webdev/kfilereplace.nix create mode 100644 pkgs/desktops/kde-4.6/webdev/kimagemapeditor.nix create mode 100644 pkgs/desktops/kde-4.6/webdev/klinkstatus.nix create mode 100644 pkgs/desktops/kde-4.6/webdev/kommander.nix diff --git a/pkgs/desktops/kde-4.6/accessibility/color-schemes.nix b/pkgs/desktops/kde-4.6/accessibility/color-schemes.nix new file mode 100644 index 00000000000..1fdc02daaf8 --- /dev/null +++ b/pkgs/desktops/kde-4.6/accessibility/color-schemes.nix @@ -0,0 +1,14 @@ +{ kde, cmake, qt4, perl, automoc4, kdelibs }: + +kde.package { + buildInputs = [ cmake qt4 perl kdelibs automoc4 ]; + + meta = { + description = "KDE Accessibility color schemes"; + kde = { + name = "ColorSchemes"; + module = "kdeaccessibility"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/accessibility/icon-themes.nix b/pkgs/desktops/kde-4.6/accessibility/icon-themes.nix new file mode 100644 index 00000000000..7fc795b595b --- /dev/null +++ b/pkgs/desktops/kde-4.6/accessibility/icon-themes.nix @@ -0,0 +1,15 @@ +{ kde, cmake, qt4, perl, automoc4, kdelibs }: + +kde.package { + buildInputs = [ cmake qt4 perl kdelibs automoc4 ]; + + meta = { + description = "KDE mono icon theme"; + kde = { + name = "IconThemes"; + module = "kdeaccessibility"; + version = "4.5.4"; + }; + }; +} + diff --git a/pkgs/desktops/kde-4.6/accessibility/jovie.nix b/pkgs/desktops/kde-4.6/accessibility/jovie.nix new file mode 100644 index 00000000000..139895ff3cd --- /dev/null +++ b/pkgs/desktops/kde-4.6/accessibility/jovie.nix @@ -0,0 +1,18 @@ +{ kde, cmake, qt4, perl, automoc4, kdelibs }: + +kde.package { + buildInputs = [ cmake qt4 perl kdelibs automoc4 ]; + +#TODO: working backend: speechd or opentts + meta = { + description = "Text-to-speech synthesis daemon"; + kde = { + name = "jovie"; + module = "kdeaccessibility"; + version = "0.6.0"; + release = "4.5.4"; + versionFile = "jovie/jovie/main.cpp"; + }; + }; +} + diff --git a/pkgs/desktops/kde-4.6/accessibility/kmag.nix b/pkgs/desktops/kde-4.6/accessibility/kmag.nix new file mode 100644 index 00000000000..96095883716 --- /dev/null +++ b/pkgs/desktops/kde-4.6/accessibility/kmag.nix @@ -0,0 +1,17 @@ +{ kde, cmake, qt4, perl, automoc4, kdelibs }: + +kde.package { + buildInputs = [ cmake qt4 perl kdelibs automoc4 ]; + + meta = { + description = "Screen magnifier for KDE"; + kde = { + name = "kmag"; + module = "kdeaccessibility"; + version = "1.0"; + release = "4.5.4"; + versionFile = "kmag/version.h"; + }; + }; +} + diff --git a/pkgs/desktops/kde-4.6/accessibility/kmousetool.nix b/pkgs/desktops/kde-4.6/accessibility/kmousetool.nix new file mode 100644 index 00000000000..7c6fb234a17 --- /dev/null +++ b/pkgs/desktops/kde-4.6/accessibility/kmousetool.nix @@ -0,0 +1,17 @@ +{ kde, cmake, qt4, perl, automoc4, kdelibs, libXtst }: + +kde.package { + buildInputs = [ cmake qt4 perl kdelibs automoc4 libXtst ]; + + meta = { + description = "A program that clicks the mouse for you"; + kde = { + name = "kmousetool"; + module = "kdeaccessibility"; + version = "1.12"; + release = "4.5.4"; + versionFile = "kmousetool/kmousetool/version.h"; + }; + }; +} + diff --git a/pkgs/desktops/kde-4.6/accessibility/kmouth.nix b/pkgs/desktops/kde-4.6/accessibility/kmouth.nix new file mode 100644 index 00000000000..3626c63e143 --- /dev/null +++ b/pkgs/desktops/kde-4.6/accessibility/kmouth.nix @@ -0,0 +1,17 @@ +{ kde, cmake, qt4, perl, automoc4, kdelibs }: + +kde.package { + buildInputs = [ cmake qt4 perl kdelibs automoc4 ]; + + meta = { + description = "A type-and-say front end for speech synthesizers"; + kde = { + name = "kmouth"; + module = "kdeaccessibility"; + version = "1.1.1"; + release = "4.5.4"; + versionFile = "kmouth/version.h"; + }; + }; +} + diff --git a/pkgs/desktops/kde-4.6/admin/builder.sh b/pkgs/desktops/kde-4.6/admin/builder.sh new file mode 100644 index 00000000000..78e29543c1f --- /dev/null +++ b/pkgs/desktops/kde-4.6/admin/builder.sh @@ -0,0 +1,13 @@ +source $stdenv/setup + +myPatchPhase() +{ + for i in system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py system-config-printer-kde/system-config-printer-kde.py + do + sed -i -e "s|/usr/share/system-config-printer|$system_config_printer/share/system-config-printer|" $i + done + + sed -i -e "s|import cupshelpers.ppds, cupshelpers.cupshelpers|import ppds, cupshelpers|" system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py +} +patchPhase=myPatchPhase +genericBuild diff --git a/pkgs/desktops/kde-4.6/admin/default.nix b/pkgs/desktops/kde-4.6/admin/default.nix new file mode 100644 index 00000000000..6e0793f4df4 --- /dev/null +++ b/pkgs/desktops/kde-4.6/admin/default.nix @@ -0,0 +1,26 @@ +{ kde, cmake, qt4, pkgconfig, perl, python +, sip, pyqt4, pycups, rhpl, system_config_printer +, kdelibs, kdepimlibs, kdebindings, automoc4}: + +kde.package { + + builder = ./builder.sh; + + inherit system_config_printer; + + # TODO: split, check which packages work on nixos + + PYTHONPATH = "${pycups}/lib/python${python.majorVersion}/site-packages"; + + buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups rhpl system_config_printer + kdelibs kdepimlibs kdebindings automoc4 ]; + + meta = { + description = "KDE Administration Utilities"; + license = "GPL"; + kde = { + name = "kdeadmin"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/artwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.6/artwork/FindXscreensaver.cmake new file mode 100644 index 00000000000..499ed75268e --- /dev/null +++ b/pkgs/desktops/kde-4.6/artwork/FindXscreensaver.cmake @@ -0,0 +1,73 @@ +#Macro to find xscreensaver directory + +# Copyright (c) 2006, Laurent Montel, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if (NOT XSCREENSAVER_FOUND) + FIND_PATH(XSCREENSAVER_DIR deco + HINTS + ${KDE4_INCLUDE_DIR} + PATHS + /usr + /usr/local + /opt/local + /usr/X11R6 + /opt/kde + /opt/kde3 + /usr/kde + /usr/local/kde + /usr/local/xscreensaver + /usr/openwin/lib/xscreensaver + /etc + PATH_SUFFIXES + lib${LIB_SUFFIX}/xscreensaver + lib${LIB_SUFFIX}/misc/xscreensaver + lib/xscreensaver + lib64/xscreensaver + lib/misc/xscreensaver + libexec/xscreensaver + bin/xscreensaver-hacks + hacks) + message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>") + + FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml + PATHS + ${KDE4_INCLUDE_DIR} + /usr/ + /usr/local/ + /opt/local/ + /usr/X11R6/ + /opt/kde/ + /opt/kde3/ + /usr/kde/ + /usr/local/kde/ + /usr/openwin/lib/xscreensaver/ + /etc/ + PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config + ) + MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>") + +endif(NOT XSCREENSAVER_FOUND) + +#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>") +#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>") + +# Need to fix hack +if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR) + set(XSCREENSAVER_FOUND TRUE) +endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR) + +if (XSCREENSAVER_FOUND) + if (NOT Xscreensaver_FIND_QUIETLY) + message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>") + endif (NOT Xscreensaver_FIND_QUIETLY) +else (XSCREENSAVER_FOUND) + if (Xscreensaver_FIND_REQUIRED) + message(FATAL_ERROR "XScreenSaver not found") + endif (Xscreensaver_FIND_REQUIRED) +endif (XSCREENSAVER_FOUND) + + +MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR) diff --git a/pkgs/desktops/kde-4.6/artwork/aurorae.nix b/pkgs/desktops/kde-4.6/artwork/aurorae.nix new file mode 100644 index 00000000000..fc79a54c352 --- /dev/null +++ b/pkgs/desktops/kde-4.6/artwork/aurorae.nix @@ -0,0 +1,14 @@ +{ cmake, kde, automoc4, kdelibs }: + +kde.package rec { + name = "aurorae-themes-${meta.kde.version}"; + + buildInputs = [ cmake automoc4 kdelibs ]; + meta = { + kde = { + name = "aurorae"; + module = "kdeartwork"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/artwork/color-schemes.nix b/pkgs/desktops/kde-4.6/artwork/color-schemes.nix new file mode 100644 index 00000000000..8643c22a33a --- /dev/null +++ b/pkgs/desktops/kde-4.6/artwork/color-schemes.nix @@ -0,0 +1,15 @@ +{ cmake, kde, automoc4, kdelibs }: + +kde.package rec { + name = "kde-color-schemes-${meta.kde.version}"; + + buildInputs = [ cmake automoc4 kdelibs ]; + meta = { + description = "Additional KDE color schemes"; + kde = { + name = "ColorSchemes"; + module = "kdeartwork"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/artwork/desktop-themes.nix b/pkgs/desktops/kde-4.6/artwork/desktop-themes.nix new file mode 100644 index 00000000000..417f96ecc1c --- /dev/null +++ b/pkgs/desktops/kde-4.6/artwork/desktop-themes.nix @@ -0,0 +1,15 @@ +{ cmake, kde, automoc4, kdelibs }: + +kde.package rec { + name = "kde-desktop-themes-${meta.kde.version}"; + + buildInputs = [ cmake automoc4 kdelibs ]; + meta = { + description = "Additional KDE desktop themes"; + kde = { + name = "desktopthemes"; + module = "kdeartwork"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/artwork/emoticons.nix b/pkgs/desktops/kde-4.6/artwork/emoticons.nix new file mode 100644 index 00000000000..64dc90a95c6 --- /dev/null +++ b/pkgs/desktops/kde-4.6/artwork/emoticons.nix @@ -0,0 +1,15 @@ +{ cmake, kde, automoc4, kdelibs }: + +kde.package rec { + name = "kde-emotion-icons-${meta.kde.version}"; + + buildInputs = [ cmake automoc4 kdelibs ]; + meta = { + description = "Additional KDE emotion icons (smiles)"; + kde = { + name = "emoticons"; + module = "kdeartwork"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/artwork/high-resolution-wallpapers.nix b/pkgs/desktops/kde-4.6/artwork/high-resolution-wallpapers.nix new file mode 100644 index 00000000000..0f1b782c939 --- /dev/null +++ b/pkgs/desktops/kde-4.6/artwork/high-resolution-wallpapers.nix @@ -0,0 +1,15 @@ +{ cmake, kde, automoc4, kdelibs }: + +kde.package rec { + name = "kde-wallpapers-high-resolution-${meta.kde.version}"; + + buildInputs = [ cmake automoc4 kdelibs ]; + meta = { + description = "KDE wallpapers in high resolution"; + kde = { + name = "HighResolutionWallpapers"; + module = "kdeartwork"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/artwork/kscreensaver.nix b/pkgs/desktops/kde-4.6/artwork/kscreensaver.nix new file mode 100644 index 00000000000..0390231a816 --- /dev/null +++ b/pkgs/desktops/kde-4.6/artwork/kscreensaver.nix @@ -0,0 +1,16 @@ +{ cmake, kde, automoc4, kdelibs, xscreensaver, kdebase_workspace, eigen }: + +kde.package rec { + buildInputs = [ cmake automoc4 kdelibs xscreensaver kdebase_workspace eigen ]; + preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake"; + meta = { + description = "KDE screen saver and savers"; + kde = { + name = "kscreensaver"; + module = "kdeartwork"; + version = "1.0"; + release = "4.5.4"; + versionFile = "kscreensaver/kpartsaver/kpartsaver.cpp"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/artwork/nuvola-icon-theme.nix b/pkgs/desktops/kde-4.6/artwork/nuvola-icon-theme.nix new file mode 100644 index 00000000000..a105148845d --- /dev/null +++ b/pkgs/desktops/kde-4.6/artwork/nuvola-icon-theme.nix @@ -0,0 +1,16 @@ +{ cmake, kde, automoc4, kdelibs }: + +kde.package rec { + name = "nuvola-icon-theme-${meta.kde.version}"; +# Sources contain primary and kdeclassic as well but they're not installed + + buildInputs = [ cmake automoc4 kdelibs ]; + meta = { + description = "KDE nuvola icon theme"; + kde = { + name = "IconThemes"; + module = "kdeartwork"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/artwork/phase-style.nix b/pkgs/desktops/kde-4.6/artwork/phase-style.nix new file mode 100644 index 00000000000..0c05c263c30 --- /dev/null +++ b/pkgs/desktops/kde-4.6/artwork/phase-style.nix @@ -0,0 +1,15 @@ +{ cmake, kde, automoc4, kdelibs }: + +kde.package rec { + name = "kde-style-phase-${meta.kde.version}"; + + buildInputs = [ cmake automoc4 kdelibs ]; + meta = { + description = "KDE phase style. Clean classical look"; + kde = { + name = "styles"; + module = "kdeartwork"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/artwork/sounds.nix b/pkgs/desktops/kde-4.6/artwork/sounds.nix new file mode 100644 index 00000000000..ca708d98f81 --- /dev/null +++ b/pkgs/desktops/kde-4.6/artwork/sounds.nix @@ -0,0 +1,15 @@ +{ cmake, kde, automoc4, kdelibs }: + +kde.package rec { + name = "kde-sounds-${meta.kde.version}"; + + buildInputs = [ cmake automoc4 kdelibs ]; + meta = { + description = "New login/logout sounds"; + kde = { + name = "sounds"; + module = "kdeartwork"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/artwork/wallpapers.nix b/pkgs/desktops/kde-4.6/artwork/wallpapers.nix new file mode 100644 index 00000000000..705ff5762b5 --- /dev/null +++ b/pkgs/desktops/kde-4.6/artwork/wallpapers.nix @@ -0,0 +1,15 @@ +{ cmake, kde, automoc4, kdelibs }: + +kde.package rec { + name = "kde-wallpapers-${meta.kde.version}"; + + buildInputs = [ cmake automoc4 kdelibs ]; + meta = { + description = "Additional KDE wallpapers"; + kde = { + name = "wallpapers"; + module = "kdeartwork"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/artwork/weather-wallpapers.nix b/pkgs/desktops/kde-4.6/artwork/weather-wallpapers.nix new file mode 100644 index 00000000000..bc495d2a8ff --- /dev/null +++ b/pkgs/desktops/kde-4.6/artwork/weather-wallpapers.nix @@ -0,0 +1,15 @@ +{ cmake, kde, automoc4, kdelibs }: + +kde.package rec { + name = "kde-weather-wallpapers-${meta.kde.version}"; + + buildInputs = [ cmake automoc4 kdelibs ]; + meta = { + description = "Additional KDE wallpapers (weather)"; + kde = { + name = "WeatherWallpapers"; + module = "kdeartwork"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/base-runtime/default.nix b/pkgs/desktops/kde-4.6/base-runtime/default.nix new file mode 100644 index 00000000000..8cc432be695 --- /dev/null +++ b/pkgs/desktops/kde-4.6/base-runtime/default.nix @@ -0,0 +1,27 @@ +{ kde, cmake, perl, bzip2, xz, qt4, alsaLib, xineLib, samba, + shared_mime_info, exiv2, libssh , kdelibs, automoc4, strigi, soprano, + cluceneCore, attica, virtuoso, makeWrapper, oxygen_icons }: + +kde.package { + + buildInputs = [ cmake perl bzip2 xz qt4 alsaLib xineLib samba shared_mime_info + exiv2 libssh kdelibs automoc4 strigi soprano cluceneCore attica + makeWrapper]; + +# TODO: OpenSLP, OpenEXR + postInstall = '' + rm -v $out/share/icons/default.kde4 + wrapProgram "$out/bin/nepomukservicestub" --prefix LD_LIBRARY_PATH : "${virtuoso}/lib" \ + --prefix PATH : "${virtuoso}/bin" + ''; + + meta = { + description = "KDE runtime"; + longDescription = "Libraries and tools which supports running KDE desktop applications"; + license = "LGPL"; + kde = { + name = "kdebase-runtime"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/base-workspace/default.nix b/pkgs/desktops/kde-4.6/base-workspace/default.nix new file mode 100644 index 00000000000..9c4c5ead360 --- /dev/null +++ b/pkgs/desktops/kde-4.6/base-workspace/default.nix @@ -0,0 +1,27 @@ +{ kde, cmake, perl, python, pam, consolekit +, qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings +, libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver +, lm_sensors, libxklavier, libusb, libpthreadstubs, boost +, automoc4, strigi, soprano, qimageblitz, akonadi +, libdbusmenu_qt, libqalculate, pciutils, libraw1394, bluez +}: + +kde.package { + +# TODO: qedje, qzion, ggadgets, libgps + buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst + kdepimlibs kdebindings boost libusb libXi libXau libXdmcp libraw1394 + libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4 + strigi soprano qimageblitz akonadi libpthreadstubs libdbusmenu_qt libqalculate + pciutils bluez ]; + + meta = { + 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.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/base/default.nix b/pkgs/desktops/kde-4.6/base/default.nix new file mode 100644 index 00000000000..545621b5ed9 --- /dev/null +++ b/pkgs/desktops/kde-4.6/base/default.nix @@ -0,0 +1,19 @@ +{ kde, cmake, perl, qt4, kdelibs, pciutils, libraw1394 , automoc4, strigi +, qimageblitz, soprano}: + +kde.package { + preConfigure = "cd apps"; + + buildInputs = [ cmake perl qt4 kdelibs pciutils libraw1394 automoc4 + strigi qimageblitz ]; + + meta = { + 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.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/bindings/default.nix b/pkgs/desktops/kde-4.6/bindings/default.nix new file mode 100644 index 00000000000..4928e883e6c --- /dev/null +++ b/pkgs/desktops/kde-4.6/bindings/default.nix @@ -0,0 +1,37 @@ +{ kde, lib, cmake, perl, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4, boost +, kdelibs, kdepimlibs, automoc4, soprano, akonadi, attica, polkit_qt_1, ruby +}: + +# This function will only build the pykde4 module. I don't need the other bindings and +# some bindings are even broken. + +kde.package rec { + patches = [ ./python-site-packages-install-dir.diff ./sip-4.11.patch ]; + + preConfigure = '' + CUSTOM_RUBY_SITE_ARCH_DIR=$(ruby -r rbconfig -e "print Config::CONFIG['sitearchdir']" | sed -e "s@${ruby}@$out@") + CUSTOM_RUBY_SITE_LIB_DIR=$(ruby -r rbconfig -e "print Config::CONFIG['sitelibdir']" | sed -e "s@${ruby}@$out@") + CUSTOM_PERL_SITE_ARCH_DIR=$(perl -MConfig -e 'print $Config{sitearch}' | sed -e "s@${perl}@$out@") + cmakeFlagsArray+=( + -DSIP_DEFAULT_SIP_DIR=$out/share/sip + -DCUSTOM_RUBY_SITE_ARCH_DIR=$CUSTOM_RUBY_SITE_ARCH_DIR + -DCUSTOM_RUBY_SITE_LIB_DIR=$CUSTOM_RUBY_SITE_LIB_DIR + -DCUSTOM_PERL_SITE_ARCH_DIR=$CUSTOM_PERL_SITE_ARCH_DIR + ) + ''; + + # TODO: okular, qimageblitz, qwt5, qscintilla2, c# + buildInputs = [ cmake perl python sip pyqt4 zlib libpng freetype fontconfig qt4 boost + kdelibs kdepimlibs automoc4 soprano akonadi attica polkit_qt_1 ruby ]; + + meta = { + description = "KDE bindings"; + longDescription = "Provides KDE bindings for several languages such as Java, Smoke and Python"; + license = "LGPL"; + kde = { + name = "kdebindings"; + version = "4.5.4"; + }; + }; +} + diff --git a/pkgs/desktops/kde-4.6/bindings/python-site-packages-install-dir.diff b/pkgs/desktops/kde-4.6/bindings/python-site-packages-install-dir.diff new file mode 100644 index 00000000000..7fe64e7eff5 --- /dev/null +++ b/pkgs/desktops/kde-4.6/bindings/python-site-packages-install-dir.diff @@ -0,0 +1,54 @@ +diff --git a/python/pykde4/CMakeLists.txt b/python/pykde4/CMakeLists.txt +index 01b69dc..375661d 100644 +--- a/python/pykde4/CMakeLists.txt ++++ b/python/pykde4/CMakeLists.txt +@@ -188,12 +188,12 @@ IF(POLKITQT_FOUND) + SET(PYKDE_MODULES "${PYKDE_MODULES} polkitqt") + ENDIF(POLKITQT_FOUND) + +-PYTHON_INSTALL(__init__.py ${PYTHON_SITE_PACKAGES_DIR}/PyKDE4) ++PYTHON_INSTALL(__init__.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4) + + MESSAGE(STATUS "KDE_VERSION: ${KDE_VERSION}") + MESSAGE(STATUS "KDE4_INCLUDE_DIR: ${KDE4_INCLUDE_DIR}") + MESSAGE(STATUS "KDE4_LIB_DIR: ${KDE4_LIB_DIR}") +-MESSAGE(STATUS "PYTHON_SITE_PACKAGES_DIR: ${PYTHON_SITE_PACKAGES_DIR}") ++MESSAGE(STATUS "PYTHON_SITE_PACKAGES_INSTALL_DIR: ${PYTHON_SITE_PACKAGES_INSTALL_DIR}") + + # Setup and install pykdeconfig.py + +@@ -225,7 +225,7 @@ _pkg_config = { + 'konsolepart': 'False', + 'libdir': '${LIB_DIR}', + 'pykde_kde_sip_flags': '${_SIP_TAGS} ${_SIP_X} ${SIP_EXTRA_OPTIONS}', +- 'pykde_mod_dir': '${PYTHON_SITE_PACKAGES_DIR}/PyKDE4', ++ 'pykde_mod_dir': '${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4', + 'pykde_modules': '${PYKDE_MODULES}', + 'pykde_sip_dir': '${SIP_DEFAULT_SIP_DIR}/PyKDE4', + 'pykde_version': kde_version_hex, +@@ -235,7 +235,7 @@ _pkg_config = { + _default_macros = None") + + CONFIGURE_FILE(pykdeconfig.py.in ${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py) +-PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES_DIR}/PyKDE4) ++PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4) + + # Install the .sip files for anyone that wants to build bindings on top of PyKDE4. + # (Don't forget the / at the end of sip/.) +diff --git a/python/pykde4/tools/pykdeuic4/CMakeLists.txt b/python/pykde4/tools/pykdeuic4/CMakeLists.txt +index ea711ba..115c777 100644 +--- a/python/pykde4/tools/pykdeuic4/CMakeLists.txt ++++ b/python/pykde4/tools/pykdeuic4/CMakeLists.txt +@@ -1,5 +1,9 @@ + +-PYTHON_INSTALL(kde4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/widget-plugins/) +-PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/) ++PYTHON_INSTALL(kde4.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/widget-plugins/) ++PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/) + find_path(cmake_module_dir create_exe_symlink.cmake ${CMAKE_MODULE_PATH}) +-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" ) ++IF(IS_ABSOLUTE ${PYTHON_SITE_PACKAGES_INSTALL_DIR}) ++ INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" ) ++ELSE(IS_ABSOLUTE ${PYTHON_SITE_PACKAGES_INSTALL_DIR}) ++ INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" ) ++ENDIF(IS_ABSOLUTE ${PYTHON_SITE_PACKAGES_INSTALL_DIR}) diff --git a/pkgs/desktops/kde-4.6/bindings/sip-4.11.patch b/pkgs/desktops/kde-4.6/bindings/sip-4.11.patch new file mode 100644 index 00000000000..15059e2526d --- /dev/null +++ b/pkgs/desktops/kde-4.6/bindings/sip-4.11.patch @@ -0,0 +1,67 @@ +Make kdebindings compile against sip-4.11, from KDE svn +Index: kdebindings/python/pykde4/sip/kdecore/typedefs.sip +=================================================================== +--- kdebindings/python/pykde4/sip/kdecore/typedefs.sip (revision 1170601) ++++ kdebindings/python/pykde4/sip/kdecore/typedefs.sip (revision 1170602) +@@ -733,61 +733,6 @@ + }; + + +-%MappedType QList +-{ +-%TypeHeaderCode +-#include +-%End +- +-%ConvertFromTypeCode +- // Create the list. +- PyObject *l; +- +- if ((l = PyList_New(sipCpp->size())) == NULL) +- return NULL; +- +- // Set the list elements. +- for (int i = 0; i < sipCpp->size(); ++i) { +- PyObject *pobj; +- +-#if PY_MAJOR_VERSION >= 3 +- if ((pobj = PyLong_FromLong(sipCpp->value(i))) == NULL) { +-#else +- if ((pobj = PyInt_FromLong(sipCpp->value(i))) == NULL) { +-#endif +- Py_DECREF(l); +- +- return NULL; +- } +- +- PyList_SET_ITEM(l, i, pobj); +- } +- +- return l; +-%End +- +-%ConvertToTypeCode +- // Check the type if that is all that is required. +- if (sipIsErr == NULL) +- return PyList_Check(sipPy); +- +- QList *ql = new QList; +- +- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { +-#if PY_MAJOR_VERSION >= 3 +- ql->append(PyLong_AsLong(PyList_GET_ITEM(sipPy, i))); +-#else +- ql->append(PyInt_AsLong(PyList_GET_ITEM(sipPy, i))); +-#endif +- } +- +- *sipCppPtr = ql; +- +- return sipGetState(sipTransferObj); +-%End +-}; +- +- + template + %MappedType QStack + { diff --git a/pkgs/desktops/kde-4.6/default.nix b/pkgs/desktops/kde-4.6/default.nix new file mode 100644 index 00000000000..d43cfa19d78 --- /dev/null +++ b/pkgs/desktops/kde-4.6/default.nix @@ -0,0 +1,163 @@ +{ callPackage, recurseIntoAttrs, runCommand, stdenv, fetchurl, qt47 } : + +let + + 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 + # 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; }; }) + '' + mkdir -p $out/nix-support + echo ${toString pkgs'} > $out/nix-support/propagated-user-env-packages + ''; + +in + +recurseIntoAttrs rec { + inherit callPackage stdenv; + + qt4 = qt47; + + phonon = null; + + kde = callPackage ./kde-package { }; + +### SUPPORT + akonadi = callPackage ./support/akonadi { }; + + attica = callPackage ./support/attica { }; + + automoc4 = callPackage ./support/automoc4 { }; + + eigen = callPackage ./support/eigen { }; + + oxygen_icons = callPackage ./support/oxygen-icons { }; + + polkit_qt_1 = callPackage ./support/polkit-qt-1 { }; + + strigi = callPackage ./support/strigi { }; + + soprano = callPackage ./support/soprano { }; + + qca2 = callPackage ./support/qca2 { }; + + qca2_ossl = callPackage ./support/qca2/ossl.nix { }; + + qimageblitz = callPackage ./support/qimageblitz { }; + +### LIBS + kdelibs = callPackage ./libs { }; + + kdepimlibs = callPackage ./pimlibs { }; + +### BASE + kdebase = callPackage ./base { }; + + kdebase_workspace = callPackage ./base-workspace { }; + + kdebase_runtime = callPackage ./base-runtime { }; + +### OTHER MODULES + + kdeaccessibility = combinePkgs "kdeaccessibility" { + colorSchemes = callPackage ./accessibility/color-schemes.nix { }; + iconThemes = callPackage ./accessibility/icon-themes.nix { }; + jovie = callPackage ./accessibility/jovie.nix { }; + kmag = callPackage ./accessibility/kmag.nix { }; + kmousetool = callPackage ./accessibility/kmousetool.nix { }; + kmouth = callPackage ./accessibility/kmouth.nix { }; + }; + + kdeadmin = callPackage ./admin { }; + + kdeartwork = combinePkgs "kdeartwork" { + aurorae = callPackage ./artwork/aurorae.nix { }; + colorSchemes = callPackage ./artwork/color-schemes.nix { }; + desktop_themes = callPackage ./artwork/desktop-themes.nix { }; + emoticons = callPackage ./artwork/emoticons.nix { }; + high_resolution_wallpapers = callPackage ./artwork/high-resolution-wallpapers.nix { }; + wallpapers = callPackage ./artwork/wallpapers.nix { }; + nuvola_icon_theme = callPackage ./artwork/nuvola-icon-theme.nix { }; + sounds = callPackage ./artwork/sounds.nix { }; + weather_wallpapers = callPackage ./artwork/weather-wallpapers.nix { }; + phase_style = callPackage ./artwork/phase-style.nix { }; + kscreensaver = callPackage ./artwork/kscreensaver.nix { }; + }; + + kdeedu = callPackage ./edu { }; + kdegames = callPackage ./games { }; + kdegraphics = callPackage ./graphics { }; + kdemultimedia = callPackage ./multimedia { }; + kdenetwork = callPackage ./network { }; + kdeplasma_addons = callPackage ./plasma-addons { }; + + kdesdk = combinePkgs "kdesdk" { + cervisia = callPackage ./sdk/cervisia.nix { }; + kapptemplate = callPackage ./sdk/kapptemplate.nix { }; + kate = callPackage ./sdk/kate.nix { }; + kcachegrind = callPackage ./sdk/kcachegrind.nix { }; + kdeaccounts_plugin = callPackage ./sdk/kdeaccounts-plugin.nix { }; + dolphin_plugins = callPackage ./sdk/dolphin-plugins.nix { }; + kioslave_perldoc = callPackage ./sdk/kioslave-perldoc.nix { }; + kioslave_svn = callPackage ./sdk/kioslave-svn.nix { }; + strigi_analyzer = callPackage ./sdk/strigi-analyzer.nix { }; + kbugbuster = callPackage ./sdk/kbugbuster.nix { }; + kmtrace = callPackage ./sdk/kmtrace.nix { }; + kompare = callPackage ./sdk/kompare.nix { }; + kpartloader = callPackage ./sdk/kpartloader.nix { }; + kprofilemethod = callPackage ./sdk/kprofilemethod.nix { }; + kstartperf = callPackage ./sdk/kstartperf.nix { }; + kuiviewer = callPackage ./sdk/kuiviewer.nix { }; + lokalize = callPackage ./sdk/lokalize.nix { }; + poxml = callPackage ./sdk/poxml.nix { }; + scripts = callPackage ./sdk/scripts.nix { }; + umbrello = callPackage ./sdk/umbrello.nix { }; + }; + + kdetoys = combinePkgs "kdetoys" { + amor = callPackage ./toys/amor.nix { }; + kteatime = callPackage ./toys/kteatime.nix { }; + ktux = callPackage ./toys/ktux.nix { }; + }; + + kdeutils = combinePkgs "kdeutils" { + ark = callPackage ./utils/ark.nix { }; + kcalc = callPackage ./utils/kcalc.nix { }; + kcharselect = callPackage ./utils/kcharselect.nix { }; + kdf = callPackage ./utils/kdf.nix { }; + kfloppy = callPackage ./utils/kfloppy.nix { }; + kgpg = callPackage ./utils/kgpg.nix { }; + kremotecontrol = callPackage ./utils/kremotecontrol.nix { }; + ktimer = callPackage ./utils/ktimer.nix { }; + kwallet = callPackage ./utils/kwallet.nix { }; + okteta = callPackage ./utils/okteta.nix { }; + printer_applet = callPackage ./utils/printer-applet.nix { }; + superkaramba = callPackage ./utils/superkaramba.nix { }; + sweeper = callPackage ./utils/sweeper.nix { }; + }; + + kdewebdev = combinePkgs "kdewebdev" { + klinkstatus = callPackage ./webdev/klinkstatus.nix { }; + kommander = callPackage ./webdev/kommander.nix { }; + kfilereplace = callPackage ./webdev/kfilereplace.nix { }; + kimagemapeditor = callPackage ./webdev/kimagemapeditor.nix { }; + }; + + kdepim_runtime = callPackage ./pim-runtime { }; + kdepim = callPackage ./pim { }; + +### DEVELOPMENT + + kdebindings = callPackage ./bindings { }; + + l10n = callPackage ./l10n { }; + + # Make the split packages visible to `nix-env -q'. + misc = recurseIntoAttrs + (kdeaccessibility.pkgs // kdeartwork.pkgs // kdesdk.pkgs // kdetoys.pkgs // kdeutils.pkgs // kdewebdev.pkgs); + +} diff --git a/pkgs/desktops/kde-4.6/edu/default.nix b/pkgs/desktops/kde-4.6/edu/default.nix new file mode 100644 index 00000000000..852453df4c3 --- /dev/null +++ b/pkgs/desktops/kde-4.6/edu/default.nix @@ -0,0 +1,29 @@ +{ kde, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl +, xplanet, libspectre, pkgconfig, libqalculate +, kdelibs, automoc4, eigen, attica}: + +kde.package { + +#TODO: +#* Boost.Python (1.31 or higher) - fails to find +# * libcfitsio0 (3.09 or higher) +# * libindi (0.6.1 or higher) +# * R +# * OCaml +# * LibFacile +# * Avogadro (1.0 or higher) +# * libgps + + buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm + gsl xplanet kdelibs automoc4 eigen attica libspectre pkgconfig + libqalculate ]; + + meta = { + description = "KDE Educative software"; + license = "GPL"; + kde = { + name = "kdeedu"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/games/default.nix b/pkgs/desktops/kde-4.6/games/default.nix new file mode 100644 index 00000000000..02c7b9bf5b9 --- /dev/null +++ b/pkgs/desktops/kde-4.6/games/default.nix @@ -0,0 +1,22 @@ +{kde, cmake, qt4, perl, shared_mime_info, kdelibs, automoc4, qca2 +, kdebindings, twisted, python, pyqt4, sip, makeWrapper }: + +kde.package { + +# TODO: ggz + buildInputs = [ cmake qt4 perl shared_mime_info kdelibs automoc4 qca2 + kdebindings twisted python pyqt4 sip makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/kajongg --set PYTHONPATH $PYTHONPATH + wrapProgram $out/bin/kajonggserver --set PYTHONPATH $PYTHONPATH''; + + meta = { + description = "KDE Games"; + license = "GPL"; + kde = { + name = "kdegames"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/graphics/default.nix b/pkgs/desktops/kde-4.6/graphics/default.nix new file mode 100644 index 00000000000..45b588af25e --- /dev/null +++ b/pkgs/desktops/kde-4.6/graphics/default.nix @@ -0,0 +1,23 @@ +{ kde, cmake, lib, perl, qt4, exiv2, lcms, saneBackends, libgphoto2 +, libspectre, popplerQt4, djvulibre, chmlib, shared_mime_info, libXxf86vm +, kdelibs, automoc4, strigi, qimageblitz, soprano, qca2, ebook_tools }: + +kde.package { + + buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre + (popplerQt4.override { inherit qt4; }) chmlib shared_mime_info libXxf86vm + kdelibs automoc4 strigi qimageblitz soprano qca2 djvulibre ebook_tools ]; + + meta = { + description = "KDE graphics utilities"; + longDescription = '' + Contains various graphics utilities such as Gwenview image viewer and + Okular document reader. + ''; + license = "GPL"; + kde = { + name = "kdegraphics"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/kde-package/default.nix b/pkgs/desktops/kde-4.6/kde-package/default.nix new file mode 100644 index 00000000000..433e12f4539 --- /dev/null +++ b/pkgs/desktops/kde-4.6/kde-package/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl }: + +rec { + defaultArgs = {name, stable ? true, version, + module ? name, release ? version, ... }: + + assert (name == module) -> (release == version); + + ( + { + name = "${name}-${version}"; + + 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 ]; + 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 = '' + -DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE + -DBUILD_doc=TRUE -DBUILD_${name}=TRUE''; + }) + ); + + package = a@{meta, ...}: + assert a.meta ? kde; + let + default = defaultArgs a.meta.kde; + in +# hand-written merge + stdenv.mkDerivation ( + default + // removeAttrs a [ "meta" "cmakeFlags" ] + // { + meta = default.meta // a.meta; + } + // (if default ? cmakeFlags || a ? cmakeFlags then { + cmakeFlags = + (if default ? cmakeFlags then "${default.cmakeFlags}" else "") + + (if default ? cmakeFlags && a ? cmakeFlags then " " else "") + + (if a ? cmakeFlags then a.cmakeFlags else ""); + } else { } + )); +} diff --git a/pkgs/desktops/kde-4.6/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.6/kde-package/kde-manifest.sh new file mode 100755 index 00000000000..3811769c57a --- /dev/null +++ b/pkgs/desktops/kde-4.6/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.6/kde-package/manifest-4.5.4.nix b/pkgs/desktops/kde-4.6/kde-package/manifest-4.5.4.nix new file mode 100644 index 00000000000..b00a5025fa7 --- /dev/null +++ b/pkgs/desktops/kde-4.6/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.6/l10n/default.nix b/pkgs/desktops/kde-4.6/l10n/default.nix new file mode 100644 index 00000000000..03c10cb4b8e --- /dev/null +++ b/pkgs/desktops/kde-4.6/l10n/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchurl, cmake, kdelibs, gettext, perl, automoc4 }: + +let + overrides = { }; + + defaultRelease = "4.5.4"; + releases = [ "4.5.1" "4.5.2" "4.5.3" "4.5.4" ]; + + sanitizeString = replaceChars [ "@" "." ] [ "_" "_" ]; + getOverride = name: attrByPath [name] {} overrides; + + inherit (stdenv.lib) replaceChars attrByPath singleton; + + 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/stable/${release}/src/kde-l10n/${name}.tar.bz2"; + name = "${saneName}.tar.bz2"; + inherit sha256; + }; + + buildInputs = [ cmake perl gettext kdelibs automoc4 ]; + + meta = { + description = "KDE translation for ${lang}"; + license = "GPL"; + inherit (kdelibs.meta) maintainers platforms homepage; + }; + } + // (getOverride lang) // (getOverride name) + ); + + kdeL10nRelease = release: + let + releaseStr = sanitizeString release; + in + builtins.listToAttrs ( + map ({lang, sha256}: + { + name = "${sanitizeString lang}"; + value = kdeL10nDerivation { inherit lang release sha256;}; + } + ) (import (./manifest + "-${release}.nix")) + ); + +in +{ + inherit kdeL10nDerivation; + recurseForDerivations = true; +} +// builtins.listToAttrs (map (r : { name = sanitizeString r; value = +kdeL10nRelease r; }) releases) +// (kdeL10nRelease defaultRelease) diff --git a/pkgs/desktops/kde-4.6/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.6/l10n/l10n-manifest.sh new file mode 100755 index 00000000000..baa235e0f75 --- /dev/null +++ b/pkgs/desktops/kde-4.6/l10n/l10n-manifest.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +# Usage: download kde-l10n 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}"/kde-l10n-en_GB-*.tar.bz2 | \ + sed -e 's/.*en_GB-//' -e 's/\.tar\.bz2//') + +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} + lang=${lang#kde-l10n-} + echo -n "${lang}.. " >&2 + hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}") + echo "{" + echo " lang = \"${lang}\";" + echo " sha256 = \"${hash}\";" + echo "}" + echo $hash >&2 +done +echo "]" diff --git a/pkgs/desktops/kde-4.6/l10n/manifest-4.5.1.nix b/pkgs/desktops/kde-4.6/l10n/manifest-4.5.1.nix new file mode 100644 index 00000000000..3f7e0ffc8ab --- /dev/null +++ b/pkgs/desktops/kde-4.6/l10n/manifest-4.5.1.nix @@ -0,0 +1,218 @@ +[ +{ + lang = "ar"; + sha256 = "0xgmrwlza3p2fvj66y4vc4r81r5y2n2igjaj2xmgvb2pvh4zx0ws"; +} +{ + lang = "bg"; + sha256 = "1npa9y8i7j68c8sa9cd96gy4n65bkl474agibax8rdk2mniyqrn9"; +} +{ + lang = "ca"; + sha256 = "0097sk50cf1cq6wnah3kiab8vkh68snzahcng2blk63gw908yfvx"; +} +{ + lang = "cs"; + sha256 = "077424cbqn68rf9wb026ip1n0rq5lz1iwp4k7ih15j87ymbrd03f"; +} +{ + lang = "da"; + sha256 = "0p80a2pn9hgih2y5s27z8ir8jkyz68i87sdw439c8z3pjww5dy2h"; +} +{ + lang = "de"; + sha256 = "007r6wf0in22y2jc1nr1msazv6bd48136kc4q0633gn1igdhb03h"; +} +{ + lang = "el"; + sha256 = "1ffgqjxgdfsjx0nwhj5yl2pn2kmc92s01wfxzdvb6kss9r53v95k"; +} +{ + lang = "en_GB"; + sha256 = "1bmg1aygaarnpka9dfvxgnzwqphqaly8rfps63g03ncls7ml8ilb"; +} +{ + lang = "eo"; + sha256 = "0bqrarah2pc6kjcfla117rwc0k1m23ndp4nm4ac2sygmanz1j6bk"; +} +{ + lang = "es"; + sha256 = "0hr3halsjjdzlmx2rfxycacm26pxs1f3m8awahmr1dp5ngid42wn"; +} +{ + lang = "et"; + sha256 = "1pj1wjnjjj052csn0ajql2i3ynpd4fc9l53zj4j3vsd177gypdjw"; +} +{ + lang = "eu"; + sha256 = "0zhrqy8b7wn8vdq75dlafc91mhvqpn3cw7hn90jj99c1aazdhjpd"; +} +{ + lang = "fi"; + sha256 = "0x0dhy1c7wn5wxqx2v7jyv10rc6gi6klmw0q80vp3xpfma9l16yg"; +} +{ + lang = "fr"; + sha256 = "1yvzpvxdzznrj61hdbi9jgpxdb9l0i8g24q1xkswpnp87jrncpaq"; +} +{ + lang = "fy"; + sha256 = "14c740yfw5v043rmqmwnb3ic0s7l2kcjy57qdqhfpmr75m4rjrvl"; +} +{ + lang = "ga"; + sha256 = "0w5cj0bgyy2pna8hqcpx82n3pwzr9vzshzknz86azb8c0pwkcjdw"; +} +{ + lang = "gl"; + sha256 = "00kwqzypkw0bi8nhz75a367h2filwkmc1kiiv66l2s3d4vrkdgjz"; +} +{ + lang = "gu"; + sha256 = "0as072rz4k4h8b0ix8jipn6bfck8van024sz1gd6xj1bhs83wk0m"; +} +{ + lang = "he"; + sha256 = "1f5j1qgkmzjagmyjxa00xmfxk5zgfms77gidg88hycrvgrxm6g59"; +} +{ + lang = "hi"; + sha256 = "0sy6cis0hkddmq4jw43a7rpxjadmzrgbgyhnnhyp9m6n225rh54g"; +} +{ + lang = "hr"; + sha256 = "016h7iqfkarl6p20gqcajknw3bsbqvby824fsdyrrhan82vsqd0k"; +} +{ + lang = "hu"; + sha256 = "1ck6vrrvvwlcxlgmmjq4hk5dh38clqvf3fwc7ndgr4wrxlr4c94m"; +} +{ + lang = "ia"; + sha256 = "13mnd7ndkfdq591da3cwj64wchq86qk265i6r7xir87gxn5m86xr"; +} +{ + lang = "id"; + sha256 = "0a1rw0mx1fdmps5vfx7m8mrmsqvqkpdbpbwys9sxbxy1zcbinasr"; +} +{ + lang = "is"; + sha256 = "0hinhxsq4nm4g97gcdfyx8fzx6d0syg9llww9spwpqp26myad69r"; +} +{ + lang = "it"; + sha256 = "0z4kdlmyliqa6qgdxbimifp535p6nvvydpa504i9klxcywc382y5"; +} +{ + lang = "ja"; + sha256 = "1vsyjgwh69wwadn27ncxmr85d1qn91xvrbfxxl8x9gqa44dzrs7k"; +} +{ + lang = "kk"; + sha256 = "1nzx2djxav6hga6ha473xkqiqgv8ikh3iq3b7i20zqcsjp3lhynq"; +} +{ + lang = "km"; + sha256 = "0rd36apjlgq3qvhbdq0a289hbn1hff1qbnphaisy1p1dsh3bbnw9"; +} +{ + lang = "kn"; + sha256 = "0al7whnmcpiq50b56xhzxpd6zmwv79s5j62m6z537kl3ldq9is5l"; +} +{ + lang = "ko"; + sha256 = "0s5y6h8nx4xp5vd39qpby303zsvi67yrbdzsgvig98gbw61szkd7"; +} +{ + lang = "lt"; + sha256 = "0wmwfn7w6z1lvjgn283rcpxv8j6lh8yzkvgjmhdg2r4ys948gzz0"; +} +{ + lang = "lv"; + sha256 = "1w4k7rr06m0ynl52gdikqw45754pj7z9n65pxyv88gxj5sjkzlw8"; +} +{ + lang = "ml"; + sha256 = "1qgs6xwyx1sc496ybq1m1mm0wyl9fz6317p4m5jvwiicldrcx3hq"; +} +{ + lang = "nb"; + sha256 = "0frnnxang8k491cnmn9lc2kbqkqr5m40c53d75l07j97jndv98y1"; +} +{ + lang = "nds"; + sha256 = "1p3h86qzrrhxrvl4qryizm3j6lnq3lm1vpnnapkk04y7msz0fdpr"; +} +{ + lang = "nl"; + sha256 = "0lphl2j0faalaj3mkkqv5806bg2fd6s1478cprrrkw788hvvlmzl"; +} +{ + lang = "nn"; + sha256 = "06pj24zfsgbkk1jxjjs5by8czv0llfz90iq6rq4lxnc0s195isjg"; +} +{ + lang = "pa"; + sha256 = "1sqqanvxzw63bdlkgvi6jlngvrshqrfl8d0jac103wvy4y4f6l5r"; +} +{ + lang = "pl"; + sha256 = "13n278n3p32bphch54x7qgba268m95kmql3qgxsx8ziy8riir9mm"; +} +{ + lang = "pt"; + sha256 = "12mkprpk9imda0iyi65mg4rs3w2qnyq8iszg0k7yqf7537zpv4x1"; +} +{ + lang = "pt_BR"; + sha256 = "1ipn6kvc3nq84fvpb9xrpwkqjaj2sya3y1cr2ai51909yfjk5r35"; +} +{ + lang = "ro"; + sha256 = "1kfyjlpkjnmv7fryr1w2a9d1dijkmhs3mqpqg0hi7316qy2z10jy"; +} +{ + lang = "ru"; + sha256 = "0m62rszff2k4rffmy3h9hxhs8bf523cfinlyay663zq3bh35i6h9"; +} +{ + lang = "sk"; + sha256 = "07pzslmln8yh0s8ik0bj86rhyy4w21w13pvf9z6ifapqigklw33c"; +} +{ + lang = "sl"; + sha256 = "1vrdzbl5ii6paaick88dkr5fabjpi36gjwwz67kqy6d9nm44jjp1"; +} +{ + lang = "sr"; + sha256 = "186ncq0hr0lrn1l6xhqwjwqrmd9xw9qa0kf9cqvj0x3j6qk4mjqf"; +} +{ + lang = "sv"; + sha256 = "0r62fs75a1kfr2dsfg1zrzh0c2wgbv6jq4c1w05wcbmqvpq16ks6"; +} +{ + lang = "th"; + sha256 = "1apvlcmbwhnjc3dlfjzah1ckwwhjn2rcrvgmv1rwvn9py7yfzhf5"; +} +{ + lang = "tr"; + sha256 = "0zci2fqcnlj9y23sy7v8yb1nc37dfqbpj1xrfs7sfvhj12048sb0"; +} +{ + lang = "uk"; + sha256 = "0p9jdz8w8xiiqhbsj90gkshcpijh2l8hfbvvqy12d1nx5wb1glp3"; +} +{ + lang = "wa"; + sha256 = "06hybn2l2jlibxr6lg91p0p7nnc6lyisx0w64zar52h958mqa9p8"; +} +{ + lang = "zh_CN"; + sha256 = "1f786n41yqfi02gd0n9lf30xn9djgbm26c8kqx8p7fm2b5vw28jh"; +} +{ + lang = "zh_TW"; + sha256 = "065d2ggahphsffk7p8xb9p5xzm12azz84s9jll447sawwks0jgsg"; +} +] diff --git a/pkgs/desktops/kde-4.6/l10n/manifest-4.5.2.nix b/pkgs/desktops/kde-4.6/l10n/manifest-4.5.2.nix new file mode 100644 index 00000000000..cb9a4506555 --- /dev/null +++ b/pkgs/desktops/kde-4.6/l10n/manifest-4.5.2.nix @@ -0,0 +1,222 @@ +[ +{ + lang = "ar"; + sha256 = "1wlg38gfv77d4rfzr6ba8mcrbq1lsgvqpd1zgcfgv9m6c5i32rh0"; +} +{ + lang = "bg"; + sha256 = "0dy2zirfs2aan445862srfrxkvmv9l6dk1qzk2mis8lmq7qnvv4x"; +} +{ + lang = "ca"; + sha256 = "0ay15k75d44ggr6s5qxip7cwyddl91zlqgwnp71iw720iq49d4c1"; +} +{ + lang = "ca@valencia"; + sha256 = "0fmcmpm3wi1qfd0lvd10d0crn7jfzf9n184x45fvqw4dkn62phdc"; +} +{ + lang = "cs"; + sha256 = "0r06qh0i3il2n07bbp70gsr5p7y5gb9gd1gzy5m5g33mmnhgf2af"; +} +{ + lang = "da"; + sha256 = "1dz2ixm42ndyqwjs6h3900ycq9j50l0nzahxmjfm76b9r2cbph6g"; +} +{ + lang = "de"; + sha256 = "1729hhfwszairx08x0s5rbidrbxqqvlh1m6rww2j1bqv5krgadns"; +} +{ + lang = "el"; + sha256 = "1is7vy7m0y3x6n5llcg4fz8qd6ddjvfxriyggw9kx1g661z25gny"; +} +{ + lang = "en_GB"; + sha256 = "0nwgj99y13h3fc6ljmnmrxaj3aiwg031p4nrb49ngmh66r1c3n2r"; +} +{ + lang = "eo"; + sha256 = "0w78f6n2nhalgj7i997hrkka9i252mrny8mgnq8bfwsr03lfjs9h"; +} +{ + lang = "es"; + sha256 = "18cqvjw7f9kj0inhhw00b6jxgsikamr0iik7pbblra2shimpr9hh"; +} +{ + lang = "et"; + sha256 = "1zrdywhc34kj09141ybr5g98bf1zqrxzazsdi51ln07pcmbrn7fd"; +} +{ + lang = "eu"; + sha256 = "03ff2narllyjyl7ddqq80i88m10ma1g9l0k970vpakw2bk3qd90c"; +} +{ + lang = "fi"; + sha256 = "0kpzsngspxgfgy2fdghb7syksrs4h3392xngl7g1ndr6m9wfrl33"; +} +{ + lang = "fr"; + sha256 = "042jbsr7agkikyj4f3wz6vbwgalmkq75sxm9mr0hspaxqw0rdww5"; +} +{ + lang = "fy"; + sha256 = "0yvqi4z98aql596pa77blrj34mxhv3q04nbp4mdiss9i6wkqxa56"; +} +{ + lang = "ga"; + sha256 = "14s90f9nlk2knkf8lsxklkval39gb77ca70hcs4n571hl3hdvpd7"; +} +{ + lang = "gl"; + sha256 = "0xh409ydzqzsbwq7727i5yj6irb2y75maa7kkvm9bmhpb5whn0k6"; +} +{ + lang = "gu"; + sha256 = "1agly26l4z5lc0s1b4j5rdpdk9sf0ffw9zp8j4mvaz501aifq777"; +} +{ + lang = "he"; + sha256 = "0z2czis29bqga9jzgrdzqf85f6k14gr1rcyawhc6ddffmb5is8pj"; +} +{ + lang = "hi"; + sha256 = "0f1j6682pfajg7dlf2rqqif5s8w00wpjr688kchqdsld7byax4wf"; +} +{ + lang = "hr"; + sha256 = "126f04zgnha153yzmq5263chwiz2lv910sgrh23a07k6piip20wi"; +} +{ + lang = "hu"; + sha256 = "10cwzpsq42vkyb4x7sc406pjf3ryr5api0cr9vwhnnqprwr82yw3"; +} +{ + lang = "ia"; + sha256 = "0gd6li2iy1l0bg9kvs19hsxlrqzfa92if7j9g90l8qml1xg0d916"; +} +{ + lang = "id"; + sha256 = "1rz8h2yna7hyvv2bynf0q5zz42qs74y6z4y2ca92b0qfc4a1ai1d"; +} +{ + lang = "is"; + sha256 = "1lkr67dlpskj141y7wihxdgnmkag1dalb8s0r1xixf051ax2wd2y"; +} +{ + lang = "it"; + sha256 = "1pz0mlg1p9mrqb79m7dsm6lk8iicyc8jwbrvrhlsji6ahr81pybk"; +} +{ + lang = "ja"; + sha256 = "12333ilhd67y8gkddpx7jzdvs10h66qi8qi4nrqb6ici6spxmb3i"; +} +{ + lang = "kk"; + sha256 = "0q845ix7kadfsphvfdkz7fawh3zqmainsw321mn90n6izf8y893j"; +} +{ + lang = "km"; + sha256 = "0ahmw632kqclplq5d65inglhvn5jzxdjhhpkqx32rq7sxk3qhhrf"; +} +{ + lang = "kn"; + sha256 = "12lp3rbcxbqm27clm71vli2pdwyp8r2bk3a2mmvnv016pjn0vphn"; +} +{ + lang = "ko"; + sha256 = "12fb0wqms571xp9mnyiv61khby71cwsf9sg05w0gjci7avwxv6w0"; +} +{ + lang = "lt"; + sha256 = "1p2rg1w3b6qgzjhsmi8dsj3mh7n8wbkgp9hrwbsl8dj7l6yz9799"; +} +{ + lang = "lv"; + sha256 = "0zm48nl504dwwsrn8b44ldh0dzj7j42v6r54bsfsqajzq7f857yi"; +} +{ + lang = "ml"; + sha256 = "0wxsfykvsg1iz0az1jngdl26sgs73pv0si30n0835xzclcv4dflx"; +} +{ + lang = "nb"; + sha256 = "1040i62nh9ldv2v5ps483r6ccp2jy6w94kijv5h01k2p82iv8f85"; +} +{ + lang = "nds"; + sha256 = "1ljgdlrqwb966xpxg2fpjcqzmplhdbmd566q7k69x5fmmyxw7vn9"; +} +{ + lang = "nl"; + sha256 = "08vwq4xy392bqln31lvbdgzhx50sj44mrnw920j6k2a0f1qmkar7"; +} +{ + lang = "nn"; + sha256 = "1da0xrbx8p72lp6r4nrhh6q5sgfm08vak6dk9g3kssjgnjarg785"; +} +{ + lang = "pa"; + sha256 = "05jkc60csj16gxxh6z5n15g65yqf2nd77sa8f00vjhx58iisvvb2"; +} +{ + lang = "pl"; + sha256 = "0hi7dsrg7dln9nkfc1wichmn334303qxdkihv13fybw43xp3gznv"; +} +{ + lang = "pt"; + sha256 = "17j0angzvv2mxj12jb7vv3dlmljrfhyki5clmj040z64siam0w4k"; +} +{ + lang = "pt_BR"; + sha256 = "1c6i79bslyzz0skfh05152jxn5hqlbas2l9fgzh58amn5bgy6afg"; +} +{ + lang = "ro"; + sha256 = "1yljfz3b7lnnlnwvqf71b22ss99an759hg3xky1nzq11kpp9a5y0"; +} +{ + lang = "ru"; + sha256 = "0p1zp2bgz3afxq4r6cbr1sv56ymq0xvn249vi048knsa2sclq8bk"; +} +{ + lang = "sk"; + sha256 = "1v6lx4jb78k44xgfdxih1mf1817piw1igmvkc39l7r8ci0drvdjx"; +} +{ + lang = "sl"; + sha256 = "1xqyafbzas460p7vxvydw8k8gzsgaxsidy19hzanvdb5ns4j8fs2"; +} +{ + lang = "sr"; + sha256 = "1yznci299164l89dq9k5wfahk5aw3y61i4bf08qn6zi5hmzsfv66"; +} +{ + lang = "sv"; + sha256 = "1k5b9f9i5zn8j5nkafw4cl42rvigssz5fqmy0nv1awj87r9vd3x6"; +} +{ + lang = "th"; + sha256 = "0l25jags9kfhnr0v8k5id2pl85rlxly5a74i94wzvnf0abkmy6hi"; +} +{ + lang = "tr"; + sha256 = "166rw0znk906zikdxg573xykfxmwdnld2ps9c0y758n6mvl107xz"; +} +{ + lang = "uk"; + sha256 = "1hlx3dnf3avcnfs55v0vq9knmf001hs00fd4rqigx8y09i8947jc"; +} +{ + lang = "wa"; + sha256 = "17i73mmc1vwvjwrvz9sq45q0ax43xq3agi2d95s772kpbrf4l8qj"; +} +{ + lang = "zh_CN"; + sha256 = "1xqi0rn36dm7f4j5x9gdk6ml8y3vzzm009qp8algqrzy46j864cz"; +} +{ + lang = "zh_TW"; + sha256 = "1qh3vnpk6ickdqa8n9h1na16s6q7kr61f44b0qymxz2lw79ihhgz"; +} +] diff --git a/pkgs/desktops/kde-4.6/l10n/manifest-4.5.3.nix b/pkgs/desktops/kde-4.6/l10n/manifest-4.5.3.nix new file mode 100644 index 00000000000..b9b69d76a15 --- /dev/null +++ b/pkgs/desktops/kde-4.6/l10n/manifest-4.5.3.nix @@ -0,0 +1,222 @@ +[ +{ + lang = "ar"; + sha256 = "0i22kwm737ry3l3q9pwmbnv2ln317fz3r1z8x8i6l0czdkj5qxw6"; +} +{ + lang = "bg"; + sha256 = "0qa2x3zz5aaxlm88zvrkglsisc85la6asfh5yiijc9hga27ykp16"; +} +{ + lang = "ca"; + sha256 = "1ip55x72chxs9v1hr8rzi519xhfvkkbv7b4k4pc5nygpdqzj1whh"; +} +{ + lang = "ca@valencia"; + sha256 = "0g8x685a2ndvm9qh2wp6kxdlhbidgsjacw80p488hizgqczakbn7"; +} +{ + lang = "cs"; + sha256 = "19zx1zhd6wrkqmc6qnyj4rsll14difps0dzwnwa56l3h5ir1828v"; +} +{ + lang = "da"; + sha256 = "1q50w3dmxbpczgxgl6n49lc5qqym42r1kz4h7ijqfazb5mwk9zqc"; +} +{ + lang = "de"; + sha256 = "0ff4174szrxm4wn3jmkkzfr3jl0yqxkkqi3g3xj71mazsrsa1ghs"; +} +{ + lang = "el"; + sha256 = "1r5m3d7cc3mi748ckmkky53j3cmw20pibczvkwcs2c65q6l0vcjc"; +} +{ + lang = "en_GB"; + sha256 = "194jdjpqcpi861sxpvqagm8nammwksxyi55i75bw53p8x87i27pv"; +} +{ + lang = "eo"; + sha256 = "1gbmqm9mgmps37pwr7lb140pvrmm24m6aw989qaig27gjjqpmvnx"; +} +{ + lang = "es"; + sha256 = "1hnnk2zvlbppdqqbf1vi2d2c8mpw693bwb6dixba4p542ir7bi8i"; +} +{ + lang = "et"; + sha256 = "0qgv7v93n4mnpcdvjxkdbvyaji1nhgj0nxby5hxrznnvgwbvfzbf"; +} +{ + lang = "eu"; + sha256 = "1rmdak9pgkswrnwdpmgck2lq2cw5v3bjc8vv79mb3kyki901423g"; +} +{ + lang = "fi"; + sha256 = "17s9yqadgjq2dmp28syxzzprya80j0b2l60r293k0bdkdfrgz07p"; +} +{ + lang = "fr"; + sha256 = "15hh7k9dhi2mb27rihjc9dfii1ab8c1i2jbhihmjmb8hd5dm30bx"; +} +{ + lang = "fy"; + sha256 = "0q5vcnimnvl3gmrqj2fr6i7fvw2bd3lrg77s03hf25crkfsd7lr8"; +} +{ + lang = "ga"; + sha256 = "0cy8a0jvb0w35i3482a86rdnbbyswww9dlb57rjhw6mqwa3qp6j6"; +} +{ + lang = "gl"; + sha256 = "1xdzhf6kwkz2r77i86grcdbrwxm37shaif2vjhhwgimplsh7z5s3"; +} +{ + lang = "gu"; + sha256 = "1sky7kc5prg1bnkh2nhriqs33qa7rlfds9k31sf24x4jhfn75lji"; +} +{ + lang = "he"; + sha256 = "0bkfwilsvvaiklgnfnyf6p1dyamwj310b9xkrdga7szrsfgrviip"; +} +{ + lang = "hi"; + sha256 = "0fxz77pfv9ayx43pf037bpllhjwxdhsggl7yq5qg28d233602sxc"; +} +{ + lang = "hr"; + sha256 = "16nkrdh1y9mk5rkdyl70i9dh8xam2fr23lz7p0qmjf66npjnvcz1"; +} +{ + lang = "hu"; + sha256 = "141xhsxv2bk81sx3lzzd78a9qzp0qzrcp32i9d4bkmyppwiia9h2"; +} +{ + lang = "ia"; + sha256 = "1hgzk2yfwjqils8zd1rv1djdjsj932mqxcl4bnfv3az4vl0ly405"; +} +{ + lang = "id"; + sha256 = "12hqichrl7i3fjkqyhc2c3dp34bhjl0ps4g3vpc0m59w2vwyv4sw"; +} +{ + lang = "is"; + sha256 = "1ydx8sx7dwdzava4y3aj0vfd23nfqiwq5m9aw3ayaliipacrq1dg"; +} +{ + lang = "it"; + sha256 = "0z7zig48ixqs18dyi6q28k8dwn2a2giwsndignd5ck7xbi5h7rn8"; +} +{ + lang = "ja"; + sha256 = "0mpch19nk8pqizq2zcs8jpxrsj2nq9lx82m58dwgmxdn3qlpklm3"; +} +{ + lang = "kk"; + sha256 = "099hqac4a5z0aq3nw0znwjlxgxgpmmjb385nm2z74s3d8d4dw8bb"; +} +{ + lang = "km"; + sha256 = "09lmpxv3ljm7bhhnmj94dia7ldz4sdnf9v0cs7ia83iiaw008hc9"; +} +{ + lang = "kn"; + sha256 = "0bzwbncgzf3mhp7f24r9wrf8ip6d5slmvvycmyicvpwfj61dcwsx"; +} +{ + lang = "ko"; + sha256 = "0saxxrzvcsjjw4jascqk8vpr8lm7xq737vabhmsfqga0262h8wzl"; +} +{ + lang = "lt"; + sha256 = "1fn6dbncqdgnwgrd58jcdbc9c474kyb397djxk5lcf9gmdq7634q"; +} +{ + lang = "lv"; + sha256 = "0vml848hxynic4cg3w8zadmfxs7l0qqd7xb3c7kxznrqgkra7rqs"; +} +{ + lang = "ml"; + sha256 = "1d77wb1d7lsmpv2vh8jzfi4y30bd5nn8ljlfx42yfdyw9drkbm38"; +} +{ + lang = "nb"; + sha256 = "1mprsawqaqb6i2nhgbvq8hp1nmfwlxvd9chfx49xas7wk209jd25"; +} +{ + lang = "nds"; + sha256 = "005i6vvq6s8c9spjx0is29jj9d0x4lm766njvsgsa0mrzgfps6w7"; +} +{ + lang = "nl"; + sha256 = "0f0z2ql08pgdbqig67jjxk8p1bf6fk70br9nhmsk72k2lv7abb0y"; +} +{ + lang = "nn"; + sha256 = "08ajabbzrng3gn56bl0wk15rd43pwlrd0crj7c4n8aq61qgz1c1p"; +} +{ + lang = "pa"; + sha256 = "099d7fhk48c3vra7bcam89ffs86iw495vxycr3679ah1bfwf8k68"; +} +{ + lang = "pl"; + sha256 = "1qf6bycvzz6p0lvvkpq2lwvjiln42xrq0qhjzcb7m8zs1zan47hi"; +} +{ + lang = "pt"; + sha256 = "16726ggm87y3bvyhdpvvwcw6n5s8dw5bjw5kxpz7160iljabn71a"; +} +{ + lang = "pt_BR"; + sha256 = "12fp3gf0iicwv426ni7n45rbxywrv4ni73c1ljw1lahfdhmhkxsv"; +} +{ + lang = "ro"; + sha256 = "0bi25kmg7jcmz8c6xlqadzv5jr6kxx8z0pbbhgbh2nl6yfjw7fm9"; +} +{ + lang = "ru"; + sha256 = "0g7ibrv5x9dlhawjcmd302yg4vql31675w7cnzjcpkc9sga3i764"; +} +{ + lang = "sk"; + sha256 = "0jmndf6kxqhqgfiilzfzaf9hgq6c66ndcw1lc306kcw0qv90fm1s"; +} +{ + lang = "sl"; + sha256 = "1lic93q78kq831pzgzmydy6x9fgzkyrwpl5958sjpvbf2dra1xmp"; +} +{ + lang = "sr"; + sha256 = "0g9cdkq7lcm2gbgsk001ywpwjwbsi8xxv90cklifgxfvqnd351gw"; +} +{ + lang = "sv"; + sha256 = "0l7xqyya76np43acq3hjgvcipz0acc2iwqmwjs2hgnhbs12fny2c"; +} +{ + lang = "th"; + sha256 = "1pbjxng4p35zd2aw78x3z5ycil1diah39bknmdgpily5cd3g3bg8"; +} +{ + lang = "tr"; + sha256 = "1spsr67k9wmcaypk0yzqg60qq6ynw4xfi3xcsdm2vkhgcc9rk8cl"; +} +{ + lang = "uk"; + sha256 = "1jii27q1m0sj3vk7ly45m9zi49l4rkr2v05z8zzfbxi2gzg02kc1"; +} +{ + lang = "wa"; + sha256 = "0mqpqpwj1qnzrqyd4lc0fkhj1r42p228kg2yyy6xn2xa4na8sg2w"; +} +{ + lang = "zh_CN"; + sha256 = "0hx69djrd7nvm889b5ig2hjy73m0vhzxxj7njrh21y551pcj7s0q"; +} +{ + lang = "zh_TW"; + sha256 = "1axpangs004scmhq35m22axg3v6rdpidndvr1i49cxf3bhgpqpqs"; +} +] diff --git a/pkgs/desktops/kde-4.6/l10n/manifest-4.5.4.nix b/pkgs/desktops/kde-4.6/l10n/manifest-4.5.4.nix new file mode 100644 index 00000000000..99d4e4b0d86 --- /dev/null +++ b/pkgs/desktops/kde-4.6/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.6/libs/default.nix b/pkgs/desktops/kde-4.6/libs/default.nix new file mode 100644 index 00000000000..a0b4681769f --- /dev/null +++ b/pkgs/desktops/kde-4.6/libs/default.nix @@ -0,0 +1,42 @@ +{ kde, gcc, cmake, perl +, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper +, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver +, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt +, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, hspell +}: + +kde.package { + + buildInputs = [ + cmake perl xz flex bison bzip2 pcre fam libxml2 libxslt shared_mime_info + giflib jasper /*openexr*/ aspell avahi kerberos acl attr libXScrnSaver + enchant libdbusmenu_qt polkit_qt_1 automoc4 hspell + ]; + +# TODO: make sonnet plugins (dictionaries) really work. +# There are a few hardcoded paths. +# Let kdelibs find openexr +# Split plugins from libs? + + propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2 + shared_desktop_ontologies ]; + + patches = [ ./polkit-install.patch ]; + + # cmake fails to find acl.h because of C++-style comment + # TODO: OpenEXR, hspell + cmakeFlags = '' + -DHAVE_ACL_LIBACL_H=ON -DHAVE_SYS_ACL_H=ON + -DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook + -DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook + ''; + + meta = { + description = "KDE libraries"; + license = "LGPL"; + kde = { + name = "kdelibs"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/libs/polkit-install.patch b/pkgs/desktops/kde-4.6/libs/polkit-install.patch new file mode 100644 index 00000000000..6633ef1209b --- /dev/null +++ b/pkgs/desktops/kde-4.6/libs/polkit-install.patch @@ -0,0 +1,12 @@ +Author: Yury Kudryashov +Reason: other KDE modules try to install polkit action files into +$kdelibs/share/polkit-1/actions +Upstream: rejected, they propose to set install dir in each package +--- a/cmake/modules/FindPolkitQt-1.cmake.old 2010-08-12 16:13:45.000000000 +0400 ++++ b/cmake/modules/FindPolkitQt-1.cmake 2010-08-12 16:13:56.000000000 +0400 +@@ -101,4 +101,4 @@ + endif (NOT PC_POLKITQT-1_PREFIX STREQUAL CMAKE_INSTALL_PREFIX) + endif (POLKITQT-1_FOUND) + +-set(POLKITQT-1_POLICY_FILES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions) ++set(POLKITQT-1_POLICY_FILES_INSTALL_DIR share/polkit-1/actions) diff --git a/pkgs/desktops/kde-4.6/multimedia/default.nix b/pkgs/desktops/kde-4.6/multimedia/default.nix new file mode 100644 index 00000000000..eb0574a8fc5 --- /dev/null +++ b/pkgs/desktops/kde-4.6/multimedia/default.nix @@ -0,0 +1,20 @@ +{ kde, cmake, perl, qt4, alsaLib, libvorbis, xineLib, taglib, flac, +cdparanoia, lame , kdelibs, automoc4, ffmpeg, libmusicbrainz2, libtunepimp }: + +kde.package { + + buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib + cdparanoia lame kdelibs automoc4 ffmpeg libmusicbrainz2 libtunepimp ]; + + meta = { + description = "KDE Multimedia"; + longDescription = '' + Contains various Multimedia utilties for KDE such as a movie player and sound volume mixer. + ''; + license = "GPL"; + kde = { + name = "kdemultimedia"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/network/default.nix b/pkgs/desktops/kde-4.6/network/default.nix new file mode 100644 index 00000000000..244935ec397 --- /dev/null +++ b/pkgs/desktops/kde-4.6/network/default.nix @@ -0,0 +1,36 @@ +{ kde, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn +, libvncserver, libmsn, giflib, gpgme, boost, libv4l, libotr +, libXi, libXtst, libXdamage, libXxf86vm, libktorrent, kdebase +, kdebase_workspace +, kdelibs, kdepimlibs, automoc4, qca2, soprano, qimageblitz, strigi}: + +kde.package { + + buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn + libvncserver libmsn giflib gpgme boost libv4l libotr libXi libXtst + libXdamage libXxf86vm kdelibs kdepimlibs automoc4 qca2 soprano + qimageblitz strigi libktorrent kdebase kdebase_workspace ]; + + patches = [ ./log-feature.diff ]; +#TODO +# * telepathy-qt4 (0.18 or higher) +# * KWebKitPart +# * libortp (0.13 or higher) +# * XMMS +# * mediastreamer (2.3.0 or higher) +# * libmeanwhile +# * libgadu (1.8.0 or higher) + +# Let cmake find libktorrent. Waiting for upstream fix + KDEDIRS="${libktorrent}"; + + meta = { + 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.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/network/log-feature.diff b/pkgs/desktops/kde-4.6/network/log-feature.diff new file mode 100644 index 00000000000..6770dd399e3 --- /dev/null +++ b/pkgs/desktops/kde-4.6/network/log-feature.diff @@ -0,0 +1,60 @@ +--- a/kget/CMakeLists.txt 2010-08-16 19:08:36.000000000 +0400 ++++ b/kget/CMakeLists.txt 2010-08-16 22:04:24.000000000 +0400 +@@ -53,21 +53,20 @@ + add_subdirectory(desktop) + add_subdirectory(plasma) + +-# find kworkspace library to allow the shutdown after downloads completed option +-find_library(KDE4_KWORKSPACE_LIBRARY NAMES kworkspace PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) +-if(KDE4_KWORKSPACE_LIBRARY) +- set(KDE4_KWORKSPACE_LIBS ${kworkspace_LIB_DEPENDS} ${KDE4_KWORKSPACE_LIBRARY}) ++macro_optional_find_package(KDE4Workspace) ++macro_log_feature(KDE4WORKSPACE_FOUND "KDE4Workspace" "KDE4 workspace libraries, part of kdebase-workspace" "http://www.kde.org" FALSE "" "Allows 'shutdown after downloads completed' in kget") ++if(KDE4WORKSPACE_FOUND) + add_definitions(-DHAVE_KWORKSPACE) +- set(KWORKSPACE_FOUND true) +-endif(KDE4_KWORKSPACE_LIBRARY) ++ include_directories(${KDE4WORKSPACE_INCLUDE_DIR}) ++endif(KDE4WORKSPACE_FOUND) + + # find libkonq to allow actions and open with options in the context menu of a transfer +-find_library(KDE4_KONQUEROR_LIBRARY NAMES konq PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) +-if(KDE4_KONQUEROR_LIBRARY) +- set(KDE4_KONQUEROR_LIBS ${konq_LIB_DEPENDS} ${KDE4_KONQUEROR_LIBRARY}) ++macro_optional_find_package(LibKonq) ++macro_log_feature(LIBKONQ_FOUND "libkonq" "KDE4 Konqueror library" "http://www.kde.org" FALSE "" "Needed to build actions and open with options in the context menu of a transfer") ++if(LIBKONQ_FOUND) + add_definitions(-DHAVE_KONQUEROR) +- set(KONQUEROR_FOUND true) +-endif(KDE4_KONQUEROR_LIBRARY) ++ include_directories(${LIBKONQ_INCLUDE_DIR}) ++endif(LIBKONQ_FOUND) + + + include_directories( +@@ -142,9 +141,9 @@ + + target_link_libraries(kgetcore ${KDE4_KIO_LIBS}) + +-if (KWORKSPACE_FOUND) +- target_link_libraries(kgetcore ${KDE4_KWORKSPACE_LIBS}) +-endif (KWORKSPACE_FOUND) ++if (KDE4WORKSPACE_FOUND) ++ target_link_libraries(kgetcore ${KDE4WORKSPACE_KWORKSPACE_LIBS}) ++endif (KDE4WORKSPACE_FOUND) + + if (HAVE_NEPOMUK) + target_link_libraries(kgetcore ${SOPRANO_LIBRARIES} ${NEPOMUK_LIBRARIES}) +@@ -294,9 +293,9 @@ + target_link_libraries(kget ${SOPRANO_LIBRARIES} ${NEPOMUK_LIBRARIES}) + endif (HAVE_NEPOMUK) + +-if (KONQUEROR_FOUND) +- target_link_libraries(kget ${KDE4_KONQUEROR_LIBS}) +-endif (KONQUEROR_FOUND) ++if (LIBKONQ_FOUND) ++ target_link_libraries(kget ${LIBKONQ_LIBRARY}) ++endif (LIBKONQ_FOUND) + + if (QGPGME_FOUND) + target_link_libraries(kget ${QGPGME_LIBRARIES}) diff --git a/pkgs/desktops/kde-4.6/pim-runtime/default.nix b/pkgs/desktops/kde-4.6/pim-runtime/default.nix new file mode 100644 index 00000000000..d92f1eecc73 --- /dev/null +++ b/pkgs/desktops/kde-4.6/pim-runtime/default.nix @@ -0,0 +1,27 @@ +{ kde, fetchurl, cmake, qt4, perl, libxml2, libxslt, boost, shared_mime_info +, kdelibs, kdepimlibs +, automoc4, phonon, akonadi, soprano, strigi}: + +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 = { + name = "kdepim-runtime"; + version = "4.4.8"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/pim/default.nix b/pkgs/desktops/kde-4.6/pim/default.nix new file mode 100644 index 00000000000..cdcc3dc023d --- /dev/null +++ b/pkgs/desktops/kde-4.6/pim/default.nix @@ -0,0 +1,34 @@ +{ kde, fetchurl, cmake, perl, boost, gpgme, libassuan, libgpgerror, libxslt +, shared_mime_info, libXScrnSaver, kdelibs, kdepimlibs, kdepim_runtime +, automoc4, akonadi, qca2}: + +kde.package rec { + + buildInputs = [ cmake boost gpgme libassuan libgpgerror libxslt + shared_mime_info libXScrnSaver kdelibs kdepimlibs automoc4 akonadi ]; + prePatch = '' + find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@" + ''; + postInstall = '' + 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 = '' + Contains various personal information management tools for KDE, such as an organizer + ''; + license = "GPL"; + homepage = http://pim.kde.org; + kde = { + name = "kdepim"; + version = "4.4.8"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/pimlibs/default.nix b/pkgs/desktops/kde-4.6/pimlibs/default.nix new file mode 100644 index 00000000000..cbda200c607 --- /dev/null +++ b/pkgs/desktops/kde-4.6/pimlibs/default.nix @@ -0,0 +1,18 @@ +{ kde, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info +, kdelibs, automoc4, akonadi, soprano}: + +kde.package { + + buildInputs = [ cmake automoc4 perl shared_mime_info ]; + propagatedBuildInputs = [ qt4 boost cyrus_sasl gpgme libical openldap kdelibs + akonadi soprano ]; + + meta = { + description = "KDE PIM libraries"; + license = "LGPL"; + kde = { + name = "kdepimlibs"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/plasma-addons/default.nix b/pkgs/desktops/kde-4.6/plasma-addons/default.nix new file mode 100644 index 00000000000..e0a31d499b0 --- /dev/null +++ b/pkgs/desktops/kde-4.6/plasma-addons/default.nix @@ -0,0 +1,23 @@ +{ kde, cmake, qt4, perl, automoc4, kdelibs, soprano, kdeedu +, boost, eigen, kdebase_workspace, attica, python, qca2, qimageblitz +, shared_mime_info, kdepimlibs, kdegraphics, libqalculate, libXtst }: +# TODO: qwt, scim, MARBLE!! + +kde.package { + + preConfigure = + "cp -v ${kdeedu}/share/apps/cmake/modules/FindMarble.cmake cmake"; + + buildInputs = [ cmake qt4 perl automoc4 kdelibs boost eigen kdebase_workspace + attica python qca2 qimageblitz shared_mime_info kdepimlibs kdegraphics + libqalculate soprano libXtst kdeedu ]; + + meta = { + description = "KDE Plasma Addons"; + license = "GPL"; + kde = { + name = "kdeplasma-addons"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/sdk/cervisia.nix b/pkgs/desktops/kde-4.6/sdk/cervisia.nix new file mode 100644 index 00000000000..7a7ef2767d1 --- /dev/null +++ b/pkgs/desktops/kde-4.6/sdk/cervisia.nix @@ -0,0 +1,16 @@ +{ kde, cmake, kdelibs, automoc4 }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 ]; + + meta = { + description = "A KDE CVS frontend"; + kde = { + name = "cervisia"; + module = "kdesdk"; + version = "3.5.0"; + release = "4.5.4"; + versionFile = "cervisia/version.h"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/sdk/dolphin-plugins.nix b/pkgs/desktops/kde-4.6/sdk/dolphin-plugins.nix new file mode 100644 index 00000000000..d0753c8f295 --- /dev/null +++ b/pkgs/desktops/kde-4.6/sdk/dolphin-plugins.nix @@ -0,0 +1,16 @@ +{ kde, cmake, kdelibs, automoc4, kdebase }: + +kde.package { + # Needs kdebase for libkonq + buildInputs = [ cmake kdelibs automoc4 kdebase ]; + + + meta = { + description = "Git and Svn plugins for dolphin"; + kde = { + name = "dolphin-plugins"; + module = "kdesdk"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/sdk/find-svn.patch b/pkgs/desktops/kde-4.6/sdk/find-svn.patch new file mode 100644 index 00000000000..61cb49b308f --- /dev/null +++ b/pkgs/desktops/kde-4.6/sdk/find-svn.patch @@ -0,0 +1,59 @@ +diff --git a/cmake/modules/FindSVN.cmake b/cmake/modules/FindSVN.cmake +index 59bcb96..2eac05d 100644 +--- a/cmake/modules/FindSVN.cmake ++++ b/cmake/modules/FindSVN.cmake +@@ -17,6 +17,9 @@ FIND_PROGRAM(SVNCONFIG_EXECUTABLE NAMES svn-config PATHS + FIND_PROGRAM(APRCONFIG_EXECUTABLE NAMES apr-1-config apr-config PATHS + /usr/local/apr/bin + ) ++find_program(APUCONFIG_EXECUTABLE NAMES apu-1-config apu-config PATHS ++ /usr/local/apr/bin ++) + + if(SVNCONFIG_EXECUTABLE) + +@@ -56,15 +59,9 @@ else(SVNCONFIG_EXECUTABLE) + set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) + else(APRCONFIG_EXECUTABLE) + FIND_PATH(_INCLUDES apr_pools.h +- ${SVN_INCLUDES}/apr-0/ +- ${SVN_INCLUDES}/apr-1/ +- ${SVN_INCLUDES}/apr-1.0/ +- /usr/include/apr-0/ +- /usr/include/apr-1/ +- /usr/include/apr-1.0/ +- /usr/local/include/apr-0/ +- /usr/local/include/apr-1/ +- /usr/local/include/apr-1.0/ ++ HINTS ${SVN_INCLUDES} ++ PATHS /usr /usr/local ++ SUFFIXES apr-0 apr-1 apr-1.0 + ) + if(_INCLUDES) + set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) +@@ -72,6 +69,25 @@ else(SVNCONFIG_EXECUTABLE) + set(SVN_FOUND FALSE) # no apr == can't compile! + endif(_INCLUDES) + endif(APRCONFIG_EXECUTABLE) ++ ++ # Use apu-config if it exists ++ if(APUCONFIG_EXECUTABLE) ++ EXEC_PROGRAM(${APUCONFIG_EXECUTABLE} ARGS --includes RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _INCLUDES) ++ string(REPLACE "-I" "" _INCLUDES ${_INCLUDES}) ++ string(REPLACE " " ";" _INCLUDES ${_INCLUDES}) ++ set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) ++ else(APUCONFIG_EXECUTABLE) ++ FIND_PATH(_INCLUDES apu.h ++ HINTS ${SVN_INCLUDES} ++ PATHS /usr /usr/local ++ SUFFIXES apr-0 apr-1 apr-1.0 ++ ) ++ if(_INCLUDES) ++ set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) ++ else(_INCLUDES) ++ set(SVN_FOUND FALSE) # no apr == can't compile! ++ endif(_INCLUDES) ++ endif(APUCONFIG_EXECUTABLE) + FIND_LIBRARY(SVN_LIBRARIES NAMES svn_client-1) + if(SVN_LIBRARIES) + FIND_LIBRARY(_LIBRARIES NAMES svn_subr-1) diff --git a/pkgs/desktops/kde-4.6/sdk/kapptemplate.nix b/pkgs/desktops/kde-4.6/sdk/kapptemplate.nix new file mode 100644 index 00000000000..c4ea482d78d --- /dev/null +++ b/pkgs/desktops/kde-4.6/sdk/kapptemplate.nix @@ -0,0 +1,17 @@ +{ kde, cmake, kdelibs, automoc4 }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 ]; + + + meta = { + description = "A KDE 4 project template generator"; + kde = { + name = "kapptemplate"; + module = "kdesdk"; + version = "0.1"; + release = "4.5.4"; + versionFile = "kapptemplate/main.cpp"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/sdk/kate.nix b/pkgs/desktops/kde-4.6/sdk/kate.nix new file mode 100644 index 00000000000..336781a44ca --- /dev/null +++ b/pkgs/desktops/kde-4.6/sdk/kate.nix @@ -0,0 +1,16 @@ +{ kde, cmake, kdelibs, automoc4, shared_mime_info }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 shared_mime_info ]; + + + meta = { + description = "Kate - Advanced Text Editor"; + kde = { + name = "kate"; + module = "kdesdk"; + version = "3.5.2"; # (release.major-1).(release.minor).(release.patch) + release = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/sdk/kbugbuster.nix b/pkgs/desktops/kde-4.6/sdk/kbugbuster.nix new file mode 100644 index 00000000000..d02d2bf7ce7 --- /dev/null +++ b/pkgs/desktops/kde-4.6/sdk/kbugbuster.nix @@ -0,0 +1,17 @@ +{ kde, cmake, kdelibs, automoc4, kdepimlibs }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 kdepimlibs ]; + + + meta = { + description = "KDE bugzilla client"; + kde = { + name = "kbugbuster"; + module = "kdesdk"; + version = "3.80.3"; + release = "4.5.4"; + versionFile = "version.h"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/sdk/kcachegrind.nix b/pkgs/desktops/kde-4.6/sdk/kcachegrind.nix new file mode 100644 index 00000000000..e4f1381e8ca --- /dev/null +++ b/pkgs/desktops/kde-4.6/sdk/kcachegrind.nix @@ -0,0 +1,17 @@ +{ kde, cmake, kdelibs, automoc4 }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 ]; + + + meta = { + description = "KDE Frontend for Callgrind/Cachegrind"; + kde = { + name = "kcachegrind"; + module = "kdesdk"; + version = "0.6"; + release = "4.5.4"; + versionFile = "CMakeLists.txt"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/sdk/kdeaccounts-plugin.nix b/pkgs/desktops/kde-4.6/sdk/kdeaccounts-plugin.nix new file mode 100644 index 00000000000..dab7becac27 --- /dev/null +++ b/pkgs/desktops/kde-4.6/sdk/kdeaccounts-plugin.nix @@ -0,0 +1,15 @@ +{ kde, cmake, kdelibs, automoc4, kdepimlibs }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 kdepimlibs ]; + + + meta = { + description = "KDE accounts akonadi agent"; + kde = { + name = "kdeaccounts-plugin"; + module = "kdesdk"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/sdk/kioslave-perldoc.nix b/pkgs/desktops/kde-4.6/sdk/kioslave-perldoc.nix new file mode 100644 index 00000000000..0b6f262a2c7 --- /dev/null +++ b/pkgs/desktops/kde-4.6/sdk/kioslave-perldoc.nix @@ -0,0 +1,18 @@ +{ kde, cmake, kdelibs, automoc4, perl }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 perl ]; + + cmakeFlags = "-DBUILD_kioslave=ON -DBUILD_perldoc=ON"; + + meta = { + description = "perldoc: kioslave"; + kde = { + name = "kioslave-perldoc"; + module = "kdesdk"; + version = "0.9.1"; + release = "4.5.4"; + versionFile = "kioslave/perldoc/perldoc.cpp"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/sdk/kioslave-svn.nix b/pkgs/desktops/kde-4.6/sdk/kioslave-svn.nix new file mode 100644 index 00000000000..3a9bc48faf6 --- /dev/null +++ b/pkgs/desktops/kde-4.6/sdk/kioslave-svn.nix @@ -0,0 +1,17 @@ +{ kde, cmake, kdelibs, automoc4, subversion, apr, aprutil }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 subversion apr aprutil ]; + + patches = [ ./find-svn.patch ]; + cmakeFlags = "-DBUILD_kioslave=ON"; + + meta = { + description = "svn:/ kioslave"; + kde = { + name = "kioslave-svn"; + module = "kdesdk"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/sdk/kmtrace.nix b/pkgs/desktops/kde-4.6/sdk/kmtrace.nix new file mode 100644 index 00000000000..89927e67b80 --- /dev/null +++ b/pkgs/desktops/kde-4.6/sdk/kmtrace.nix @@ -0,0 +1,16 @@ +{ kde, cmake, kdelibs, automoc4, gcc }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 ]; + + preConfigure="export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}"; + + meta = { + description = "KDE mtrace-based malloc debuger"; + kde = { + name = "kmtrace"; + module = "kdesdk"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/sdk/kompare.nix b/pkgs/desktops/kde-4.6/sdk/kompare.nix new file mode 100644 index 00000000000..4d74d182b5c --- /dev/null +++ b/pkgs/desktops/kde-4.6/sdk/kompare.nix @@ -0,0 +1,17 @@ +{ kde, cmake, kdelibs, automoc4 }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 ]; + + + meta = { + description = "A program to view the differences between files and optionally generate a diff"; + kde = { + name = "kompare"; + module = "kdesdk"; + version = "4.0.0"; + release = "4.5.4"; + versionFile = "main.cpp"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/sdk/kpartloader.nix b/pkgs/desktops/kde-4.6/sdk/kpartloader.nix new file mode 100644 index 00000000000..e48166617e5 --- /dev/null +++ b/pkgs/desktops/kde-4.6/sdk/kpartloader.nix @@ -0,0 +1,17 @@ +{ kde, cmake, kdelibs, automoc4 }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 ]; + + + meta = { + description = "A test application for KParts"; + kde = { + name = "kpartloader"; + module = "kdesdk"; + version = "1.0"; + release = "4.5.4"; + versionFile = "kpartloader.cpp"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/sdk/kprofilemethod.nix b/pkgs/desktops/kde-4.6/sdk/kprofilemethod.nix new file mode 100644 index 00000000000..a85f30345ea --- /dev/null +++ b/pkgs/desktops/kde-4.6/sdk/kprofilemethod.nix @@ -0,0 +1,16 @@ +{ kde, cmake, kdelibs, automoc4 }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 ]; + + + meta = { + description = "A macros for profiling using QTime"; + longDescription = "Don't commit any code using kprofilemethod.h to KDE repositories."; + kde = { + name = "kprofilemethod"; + module = "kdesdk"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/sdk/kstartperf.nix b/pkgs/desktops/kde-4.6/sdk/kstartperf.nix new file mode 100644 index 00000000000..23fa4f80cfb --- /dev/null +++ b/pkgs/desktops/kde-4.6/sdk/kstartperf.nix @@ -0,0 +1,17 @@ +{ kde, cmake, kdelibs, automoc4, libtool }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 libtool ]; + + + meta = { + description = "Measures start up time of a KDE application"; + kde = { + name = "kstartperf"; + module = "kdesdk"; + version = "1.0"; + release = "4.5.4"; + versionFile = "kstartperf.cpp"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/sdk/kuiviewer.nix b/pkgs/desktops/kde-4.6/sdk/kuiviewer.nix new file mode 100644 index 00000000000..c75f1be1a74 --- /dev/null +++ b/pkgs/desktops/kde-4.6/sdk/kuiviewer.nix @@ -0,0 +1,17 @@ +{ kde, cmake, kdelibs, automoc4 }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 ]; + + + meta = { + description = "Displays Qt Designer's UI files"; + kde = { + name = "kuiviewer"; + module = "kdesdk"; + version = "0.1"; + release = "4.5.4"; + versionFile = "main.cpp"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/sdk/lokalize.nix b/pkgs/desktops/kde-4.6/sdk/lokalize.nix new file mode 100644 index 00000000000..671e5c10bf7 --- /dev/null +++ b/pkgs/desktops/kde-4.6/sdk/lokalize.nix @@ -0,0 +1,20 @@ +{ kde, cmake, kdelibs, automoc4, hunspell }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 hunspell ]; + + + meta = { + description = "KDE 4 Computer-aided translation system"; + longDescription = '' + Computer-aided translation system. + Do not translate what had already been translated.''; + kde = { + name = "lokalize"; + module = "kdesdk"; + version = "1.1"; + release = "4.5.4"; + versionFile = "src/version.h"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/sdk/optional-docs.diff b/pkgs/desktops/kde-4.6/sdk/optional-docs.diff new file mode 100644 index 00000000000..f67e1f4cdd8 --- /dev/null +++ b/pkgs/desktops/kde-4.6/sdk/optional-docs.diff @@ -0,0 +1,39 @@ +diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt +index 63cdef8..0c5b50a 100644 +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -3,22 +3,30 @@ if( UNIX ) + add_subdirectory(cervisia) + endif() + endif( UNIX ) +-add_subdirectory(kapptemplate) ++if(BUILD_kapptemplate) ++ add_subdirectory(kapptemplate) ++endif() + if(BUILD_kbugbuster) + add_subdirectory(kbugbuster) + endif() + if(BUILD_kcachegrind) + add_subdirectory(kcachegrind) + endif() +-add_subdirectory(kmtrace) ++if(BUILD_kmtrace) ++ add_subdirectory(kmtrace) ++endif() + if(BUILD_kompare) + add_subdirectory(kompare) + endif() + if(BUILD_lokalize) + add_subdirectory(lokalize) + endif() +-add_subdirectory(poxml) +-add_subdirectory(scripts) ++if(BUILD_poxml) ++ add_subdirectory(poxml) ++endif() ++if(BUILD_scripts) ++ add_subdirectory(scripts) ++endif() + + if(LIBXSLT_FOUND AND LIBXML2_FOUND) + if(BUILD_umbrello) diff --git a/pkgs/desktops/kde-4.6/sdk/poxml.nix b/pkgs/desktops/kde-4.6/sdk/poxml.nix new file mode 100644 index 00000000000..72e929c2bbf --- /dev/null +++ b/pkgs/desktops/kde-4.6/sdk/poxml.nix @@ -0,0 +1,15 @@ +{ kde, cmake, kdelibs, automoc4, antlr }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 antlr ]; + + + meta = { + description = "Po<->xml tools"; + kde = { + name = "poxml"; + module = "kdesdk"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/sdk/scripts.nix b/pkgs/desktops/kde-4.6/sdk/scripts.nix new file mode 100644 index 00000000000..36bdb778b58 --- /dev/null +++ b/pkgs/desktops/kde-4.6/sdk/scripts.nix @@ -0,0 +1,15 @@ +{ kde, cmake, kdelibs, automoc4 }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 ]; + + + meta = { + description = "Various scripts to ease KDE development"; + kde = { + name = "scripts"; + module = "kdesdk"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/sdk/strigi-analyzer.nix b/pkgs/desktops/kde-4.6/sdk/strigi-analyzer.nix new file mode 100644 index 00000000000..20d484f561e --- /dev/null +++ b/pkgs/desktops/kde-4.6/sdk/strigi-analyzer.nix @@ -0,0 +1,15 @@ +{ kde, cmake, kdelibs, automoc4 }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 ]; + + + meta = { + description = "Strigi analyzers for diff, po and ts"; + kde = { + name = "strigi-analyzer"; + module = "kdesdk"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/sdk/umbrello.nix b/pkgs/desktops/kde-4.6/sdk/umbrello.nix new file mode 100644 index 00000000000..48a9d0fdfbd --- /dev/null +++ b/pkgs/desktops/kde-4.6/sdk/umbrello.nix @@ -0,0 +1,16 @@ +{ kde, cmake, kdelibs, automoc4, libxml2, libxslt, boost }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt boost ]; + + + meta = { + description = "Umbrello UML modeller"; + kde = { + name = "umbrello"; + module = "kdesdk"; + version = "2.5.2"; # release - 200 + release = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/support/akonadi/default.nix b/pkgs/desktops/kde-4.6/support/akonadi/default.nix new file mode 100644 index 00000000000..9e516947e83 --- /dev/null +++ b/pkgs/desktops/kde-4.6/support/akonadi/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4, soprano}: + +stdenv.mkDerivation rec { + name = "akonadi-1.4.0"; + src = fetchurl { + url = "http://download.akonadi-project.org/${name}.tar.bz2"; + sha256 = "199fh5yqygr0xdwcnjqqms8vskigbzvwb3071r979606rrsnpnl5"; + }; + buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ]; + patches = [ ./fix-broken-datadir-parameter.patch ]; + postPatch = "sed -e '/Q_ASSERT.*SQLITE/d' -i qsqlite/src/qsql_sqlite.cpp"; + meta = with stdenv.lib; { + description = "KDE PIM Storage Service"; + license = "LGPL"; + homepage = http://pim.kde.org/akonadi; + maintainers = [ maintainers.sander maintainers.urkud ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/kde-4.6/support/akonadi/fix-broken-datadir-parameter.patch b/pkgs/desktops/kde-4.6/support/akonadi/fix-broken-datadir-parameter.patch new file mode 100644 index 00000000000..fa33329d4b0 --- /dev/null +++ b/pkgs/desktops/kde-4.6/support/akonadi/fix-broken-datadir-parameter.patch @@ -0,0 +1,17 @@ +Fix broken datadir parameter. + +--- akonadi-1.3.85/server/src/storage/dbconfigmysql.cpp 2010-06-09 03:41:30.000000000 -0430 ++++ akonadi-local-1.3.85/server/src/storage/dbconfigmysql.cpp 2010-08-11 00:21:20.547181479 -0430 +@@ -250,11 +250,10 @@ + // synthesize the mysqld command + QStringList arguments; + arguments << QString::fromLatin1( "--defaults-file=%1/mysql.conf" ).arg( akDir ); ++ arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ); + #ifndef Q_WS_WIN +- arguments << QString::fromLatin1( "--datadir" ) << QString::fromLatin1( "%1/" ).arg( dataDir ); + arguments << QString::fromLatin1( "--socket=%1/mysql.socket" ).arg( miscDir ); + #else +- arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ); + arguments << QString::fromLatin1( "--shared-memory" ); + #endif + diff --git a/pkgs/desktops/kde-4.6/support/attica/default.nix b/pkgs/desktops/kde-4.6/support/attica/default.nix new file mode 100644 index 00000000000..5c62f34efb2 --- /dev/null +++ b/pkgs/desktops/kde-4.6/support/attica/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl, cmake, qt4}: + +stdenv.mkDerivation rec { + name = "attica-0.1.4"; + src = fetchurl { + url = "mirror://kde/stable/attica/${name}.tar.bz2"; + sha256 = "0frarnrnbli3f5ji90swgw05g88w1f5777ais345wc8lkvqg9ix1"; + }; + buildInputs = [ cmake qt4 ]; + meta = with stdenv.lib; { + description = "A library to access Open Collaboration Service providers"; + license = "LGPL"; + maintainers = [ maintainers.sander maintainers.urkud ]; + platforms = qt4.meta.platforms; + }; +} diff --git a/pkgs/desktops/kde-4.6/support/automoc4/default.nix b/pkgs/desktops/kde-4.6/support/automoc4/default.nix new file mode 100644 index 00000000000..be50867cbe7 --- /dev/null +++ b/pkgs/desktops/kde-4.6/support/automoc4/default.nix @@ -0,0 +1,15 @@ +{stdenv, fetchurl, cmake, qt4}: + +stdenv.mkDerivation rec { + name = "automoc4-0.9.88"; + src = fetchurl { + url = "mirror://kde/stable/automoc4/0.9.88/${name}.tar.bz2"; + sha256 = "0jackvg0bdjg797qlbbyf9syylm0qjs55mllhn11vqjsq3s1ch93"; + }; + buildInputs = [ cmake qt4 ]; + meta = { + description = "KDE Meta Object Compiler"; + license = "BSD"; + maintainers = [ stdenv.lib.maintainers.sander ]; + }; +} diff --git a/pkgs/desktops/kde-4.6/support/eigen/default.nix b/pkgs/desktops/kde-4.6/support/eigen/default.nix new file mode 100644 index 00000000000..e72de6c1b25 --- /dev/null +++ b/pkgs/desktops/kde-4.6/support/eigen/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, cmake}: + +let + v = "2.0.15"; +in +stdenv.mkDerivation { + name = "eigen-${v}"; + src = fetchurl { + url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2"; + name = "eigen-${v}.tar.bz2"; + sha256 = "1a00hqyig4rc7nkz97xv23q7k0vdkzvgd0jkayk61fn9aqcrky79"; + }; + buildInputs = [ cmake ]; + meta = { + description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; + license = "LGPL"; + homepage = http://eigen.tuxfamily.org ; + maintainers = with stdenv.lib.maintainers; [ sander urkud ]; + }; +} diff --git a/pkgs/desktops/kde-4.6/support/oxygen-icons/default.nix b/pkgs/desktops/kde-4.6/support/oxygen-icons/default.nix new file mode 100644 index 00000000000..47f532ed203 --- /dev/null +++ b/pkgs/desktops/kde-4.6/support/oxygen-icons/default.nix @@ -0,0 +1,18 @@ +{kde, cmake}: + +kde.package { + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1hn65n4nznbp2ikbvyrp9ncasc6y3nxhi33x927vg01pp8frn4q1"; + + 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.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix b/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix new file mode 100644 index 00000000000..9ff43ef5f9b --- /dev/null +++ b/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix @@ -0,0 +1,17 @@ +{ kde, fetchurl, cmake, qt4, pkgconfig, polkit, automoc4, glib }: + +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"; + }; +} diff --git a/pkgs/desktops/kde-4.6/support/qca2/default.nix b/pkgs/desktops/kde-4.6/support/qca2/default.nix new file mode 100644 index 00000000000..a55f7c8cb43 --- /dev/null +++ b/pkgs/desktops/kde-4.6/support/qca2/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, which, qt4}: + +stdenv.mkDerivation { + name = "qca-2.0.2"; + src = fetchurl { + url = http://delta.affinix.com/download/qca/2.0/qca-2.0.2.tar.bz2; + sha256 = "49b5474450104a2298747c243de1451ab7a6aeed4bf7df43ffa4b7128a2837b8"; + }; + buildInputs = [ which qt4 ]; + preBuild = '' + sed -i include/QtCrypto/qca_publickey.h -e '/EMSA3_Raw/a,\ + EMSA3_SHA224, ///< SHA224, with EMSA3 (ie PKCS#1 Version 1.5) encoding\ + EMSA3_SHA256, ///< SHA256, with EMSA3 (ie PKCS#1 Version 1.5) encoding\ + EMSA3_SHA384, ///< SHA384, with EMSA3 (ie PKCS#1 Version 1.5) encoding\ + EMSA3_SHA512 ///< SHA512, with EMSA3 (ie PKCS#1 Version 1.5) encoding' + ''; + meta = with stdenv.lib; { + description = "Qt Cryptographic Architecture"; + license = "LGPL"; + homepage = http://delta.affinix.com/qca; + maintainers = [ maintainers.sander maintainers.urkud ]; + }; +} diff --git a/pkgs/desktops/kde-4.6/support/qca2/ossl.nix b/pkgs/desktops/kde-4.6/support/qca2/ossl.nix new file mode 100644 index 00000000000..bfaa320618c --- /dev/null +++ b/pkgs/desktops/kde-4.6/support/qca2/ossl.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, fetchsvn, qt4, qca2, openssl}: + +stdenv.mkDerivation rec { + version = "2.0.0-beta3"; + name = "qca-ossl-${version}"; + src = fetchurl { + url = "http://delta.affinix.com/download/qca/2.0/plugins/${name}.tar.bz2"; + sha256 = "0yy68racvx3clybry2i1bw5bz9yhxr40p3xqagxxb15ihvsrzq08"; + }; + # SVN version has stabilized and has a lot of fixes for fresh OpenSSL + # Take the main source from there + svn_src = fetchsvn { + url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qca/plugins/qca-ossl ; + rev = 1115936; + sha256 = "ef2c0307e8834e1e7cb23b6fea1cc22486328a37186301a6c11161b1c93d834b"; + }; + buildInputs = [ qt4 qca2 openssl ]; + dontAddPrefix = true; + configureFlags="--no-separate-debug-info --with-qca=${qca2} + --with-openssl-inc=${openssl}/include --with-openssl-lib=${openssl}/lib"; + preConfigure='' + cp ${svn_src}/qca-ossl.cpp . + + configureFlags="$configureFlags --plugins-path=$out/lib/qt4/plugins" + ''; + meta = with stdenv.lib; { + description = "Qt Cryptographic Architecture OpenSSL plugin"; + license = "LGPL"; + homepage = http://delta.affinix.com/qca; + maintainers = [ maintainers.urkud ]; + }; +} diff --git a/pkgs/desktops/kde-4.6/support/qimageblitz/default.nix b/pkgs/desktops/kde-4.6/support/qimageblitz/default.nix new file mode 100644 index 00000000000..bb3d0220b43 --- /dev/null +++ b/pkgs/desktops/kde-4.6/support/qimageblitz/default.nix @@ -0,0 +1,21 @@ +{stdenv, fetchurl, lib, cmake, qt4}: + +let + pn = "qimageblitz"; + v = "0.0.4"; +in + +stdenv.mkDerivation { + name = "${pn}-${v}"; + src = fetchurl { + url = "mirror://sf/${pn}/${pn}-${v}.tar.bz2"; + sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9"; + }; + buildInputs = [ cmake qt4 ]; + + meta = { + description = "Graphical effect and filter library for KDE4"; + license = "BSD"; + homepage = "http://${pn}.sourceforge.net"; + }; +} diff --git a/pkgs/desktops/kde-4.6/support/soprano/default.nix b/pkgs/desktops/kde-4.6/support/soprano/default.nix new file mode 100644 index 00000000000..62832861a36 --- /dev/null +++ b/pkgs/desktops/kde-4.6/support/soprano/default.nix @@ -0,0 +1,21 @@ +{stdenv, fetchurl, cmake, qt4, cluceneCore, redland, libiodbc}: + +stdenv.mkDerivation rec { + name = "soprano-2.5.2"; + + src = fetchurl { + url = "mirror://sourceforge/soprano/${name}.tar.bz2"; + sha256 = "17k17hrcwij2plms4hb0j6994ar9kcxykf699iyiggfpj1zg7nym"; + }; + + # We disable the Java backend, since we do not need them and they make the closure size much bigger + buildInputs = [ cmake qt4 cluceneCore redland libiodbc ]; + + meta = { + homepage = http://soprano.sourceforge.net/; + description = "An object-oriented C++/Qt4 framework for RDF data"; + license = "LGPL"; + maintainers = with stdenv.lib.maintainers; [ sander urkud ]; + inherit (qt4.meta) platforms; + }; +} diff --git a/pkgs/desktops/kde-4.6/support/strigi/default.nix b/pkgs/desktops/kde-4.6/support/strigi/default.nix new file mode 100644 index 00000000000..7a4cb3b664c --- /dev/null +++ b/pkgs/desktops/kde-4.6/support/strigi/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, expat, exiv2 +, cluceneCore +}: + +stdenv.mkDerivation rec { + name = "strigi-${version}"; + version = "0.7.2"; + + src = fetchurl { + url = "http://www.vandenoever.info/software/strigi/${name}.tar.bz2"; + sha256 = "1f1ac27cjm5m4iwsgvd7nylr0md0a95przkbpsdq7l90wjxj390w"; + }; + includeAllQtDirs=true; + + CLUCENE_HOME = cluceneCore; + + # Dependencies such as SQLite and FAM are unreliable in this release + buildInputs = [ + cmake perl qt4 bzip2 stdenv.gcc.libc libxml2 expat exiv2 cluceneCore + ]; + + meta = { + homepage = http://strigi.sourceforge.net; + description = "A very fast and efficient crawler to index data on your harddrive"; + license = "LGPL"; + maintainers = with stdenv.lib.maintainers; [ sander urkud ]; + inherit (qt4.meta) platforms; + }; +} diff --git a/pkgs/desktops/kde-4.6/toys/amor.nix b/pkgs/desktops/kde-4.6/toys/amor.nix new file mode 100644 index 00000000000..e994dea0884 --- /dev/null +++ b/pkgs/desktops/kde-4.6/toys/amor.nix @@ -0,0 +1,16 @@ +{ kde, cmake, kdelibs, automoc4 }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 ]; + + meta = { + description = "KDE creature for your desktop"; + kde = { + name = "amor"; + module = "kdetoys"; + version = "2.4.0"; + release = "4.5.4"; + versionFile = "src/version.h"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/toys/kteatime.nix b/pkgs/desktops/kde-4.6/toys/kteatime.nix new file mode 100644 index 00000000000..601de020a6c --- /dev/null +++ b/pkgs/desktops/kde-4.6/toys/kteatime.nix @@ -0,0 +1,16 @@ +{ kde, cmake, kdelibs, automoc4 }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 ]; + + meta = { + description = "KDE utility for making a fine cup of tea"; + kde = { + name = "kteatime"; + module = "kdetoys"; + version = "1.2.1"; + release = "4.5.4"; + versionFile = "src/main.cpp"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/toys/ktux.nix b/pkgs/desktops/kde-4.6/toys/ktux.nix new file mode 100644 index 00000000000..0a2deec43e5 --- /dev/null +++ b/pkgs/desktops/kde-4.6/toys/ktux.nix @@ -0,0 +1,16 @@ +{ kde, cmake, kdelibs, automoc4, kdebase_workspace }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 kdebase_workspace ]; + + meta = { + description = "Tux Screen Saver"; + kde = { + name = "ktux"; + module = "kdetoys"; + version = "1.0.1"; + release = "4.5.4"; + versionFile = "src/sprite.cpp"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/utils/ark.nix b/pkgs/desktops/kde-4.6/utils/ark.nix new file mode 100644 index 00000000000..0437406f72f --- /dev/null +++ b/pkgs/desktops/kde-4.6/utils/ark.nix @@ -0,0 +1,21 @@ +{ kde, cmake, kdelibs, qt4, perl, libarchive, xz, automoc4, qjson, + kdebase }: + +kde.package { + patchPhase = "cp -vn ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules"; + + buildInputs = [ cmake qt4 perl libarchive xz kdelibs automoc4 qjson + kdebase # for libkonq + ]; + + meta = { + description = "KDE Archiving Tool"; + kde = { + name = "ark"; + module = "kdeutils"; + version = "2.15"; + release = "4.5.4"; + versionFile = "app/main.cpp"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/utils/kcalc.nix b/pkgs/desktops/kde-4.6/utils/kcalc.nix new file mode 100644 index 00000000000..05aa5f752e4 --- /dev/null +++ b/pkgs/desktops/kde-4.6/utils/kcalc.nix @@ -0,0 +1,16 @@ +{ kde, cmake, perl, kdelibs, qt4, automoc4, gmp }: + +kde.package { + buildInputs = [ cmake qt4 perl kdelibs automoc4 gmp ]; + + meta = { + description = "KDE Calculator"; + kde = { + name = "kcalc"; + module = "kdeutils"; + version = "2.7"; + release = "4.5.4"; + versionFile = "version.h"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/utils/kcharselect.nix b/pkgs/desktops/kde-4.6/utils/kcharselect.nix new file mode 100644 index 00000000000..069ab67669c --- /dev/null +++ b/pkgs/desktops/kde-4.6/utils/kcharselect.nix @@ -0,0 +1,16 @@ +{ kde, cmake, kdelibs, qt4, perl, automoc4 }: + +kde.package { + buildInputs = [ cmake qt4 perl kdelibs automoc4 ]; + + meta = { + description = "KDE character selection utility"; + kde = { + name = "kcharselect"; + module = "kdeutils"; + version = "1.7"; + release = "4.5.4"; + versionFile = "main.cc"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/utils/kdf.nix b/pkgs/desktops/kde-4.6/utils/kdf.nix new file mode 100644 index 00000000000..23a9bfa6895 --- /dev/null +++ b/pkgs/desktops/kde-4.6/utils/kdf.nix @@ -0,0 +1,16 @@ +{ kde, cmake, kdelibs, qt4, perl, automoc4 }: + +kde.package { + buildInputs = [ cmake qt4 perl kdelibs automoc4 ]; + + meta = { + description = "KDE free disk space utility"; + kde = { + name = "kdf"; + module = "kdeutils"; + version = "0.11"; + release = "4.5.4"; + versionFile = "kdf.cpp"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/utils/kfloppy.nix b/pkgs/desktops/kde-4.6/utils/kfloppy.nix new file mode 100644 index 00000000000..f7ff38b8510 --- /dev/null +++ b/pkgs/desktops/kde-4.6/utils/kfloppy.nix @@ -0,0 +1,14 @@ +{ kde, cmake, kdelibs, qt4, perl, automoc4 }: + +kde.package { + buildInputs = [ cmake qt4 perl kdelibs automoc4 ]; + + meta = { + description = "Helps you format floppies with the filesystem of your choice"; + kde = { + name = "kfloppy"; + module = "kdeutils"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/utils/kgpg.nix b/pkgs/desktops/kde-4.6/utils/kgpg.nix new file mode 100644 index 00000000000..62cf26df915 --- /dev/null +++ b/pkgs/desktops/kde-4.6/utils/kgpg.nix @@ -0,0 +1,16 @@ +{ kde, cmake, kdelibs, qt4, perl, automoc4, kdepimlibs }: + +kde.package { + buildInputs = [ cmake qt4 perl kdelibs automoc4 kdepimlibs ]; + + meta = { + description = "Simple KDE GUI for gpg"; + kde = { + name = "kgpg"; + module = "kdeutils"; + version = "2.4.1"; + release = "4.5.4"; + versionFile = "main.cpp"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/utils/kremotecontrol.nix b/pkgs/desktops/kde-4.6/utils/kremotecontrol.nix new file mode 100644 index 00000000000..b353bdba53c --- /dev/null +++ b/pkgs/desktops/kde-4.6/utils/kremotecontrol.nix @@ -0,0 +1,14 @@ +{ kde, cmake, kdelibs, qt4, perl, automoc4, kdebase_workspace }: + +kde.package { + buildInputs = [ cmake qt4 perl kdelibs automoc4 kdebase_workspace ]; + + meta = { + description = "KDE remote control"; + kde = { + name = "kremotecontrol"; + module = "kdeutils"; + version = "4.5.4"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/utils/ktimer.nix b/pkgs/desktops/kde-4.6/utils/ktimer.nix new file mode 100644 index 00000000000..a2193d283b1 --- /dev/null +++ b/pkgs/desktops/kde-4.6/utils/ktimer.nix @@ -0,0 +1,16 @@ +{ kde, cmake, kdelibs, qt4, perl, automoc4 }: + +kde.package { + buildInputs = [ cmake qt4 perl kdelibs automoc4 ]; + + meta = { + description = "KDE Timer"; + kde = { + name = "ktimer"; + module = "kdeutils"; + version = "0.6"; + release = "4.5.4"; + versionFile = "main.cpp"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/utils/kwallet.nix b/pkgs/desktops/kde-4.6/utils/kwallet.nix new file mode 100644 index 00000000000..d8ee32ff794 --- /dev/null +++ b/pkgs/desktops/kde-4.6/utils/kwallet.nix @@ -0,0 +1,16 @@ +{ kde, cmake, kdelibs, qt4, perl, automoc4 }: + +kde.package { + buildInputs = [ cmake qt4 perl kdelibs automoc4 ]; + + meta = { + description = "KDE Wallet (password storage) management tool"; + kde = { + name = "kwallet"; + module = "kdeutils"; + version = "1.6"; + release = "4.5.4"; + versionFile = "main.cpp"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/utils/okteta.nix b/pkgs/desktops/kde-4.6/utils/okteta.nix new file mode 100644 index 00000000000..1390960aefe --- /dev/null +++ b/pkgs/desktops/kde-4.6/utils/okteta.nix @@ -0,0 +1,16 @@ +{ kde, cmake, kdelibs, qt4, perl, automoc4, shared_mime_info, qca2 }: + +kde.package { + buildInputs = [ cmake qt4 perl kdelibs automoc4 shared_mime_info qca2 ]; + + meta = { + description = "KDE byte editor"; + kde = { + name = "okteta"; + module = "kdeutils"; + version = "0.5.2"; + release = "4.5.4"; + versionFile = "program/about.cpp"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/utils/printer-applet.nix b/pkgs/desktops/kde-4.6/utils/printer-applet.nix new file mode 100644 index 00000000000..6b2a297a265 --- /dev/null +++ b/pkgs/desktops/kde-4.6/utils/printer-applet.nix @@ -0,0 +1,22 @@ +{ kde, cmake, kdelibs, qt4, perl, automoc4 +, python, sip, pyqt4, pycups, rhpl, system_config_printer, kdebindings, + pythonDBus, makeWrapper }: + +kde.package { + buildInputs = [ cmake qt4 perl kdelibs automoc4 python sip pyqt4 pycups rhpl + system_config_printer kdebindings makeWrapper pythonDBus ]; + + postInstall="wrapProgram $out/bin/printer-applet --set PYTHONPATH $PYTHONPATH"; + + meta = { + description = "KDE printer applet"; + longDescription = "Applet to view current print jobs and configure new printers"; + kde = { + name = "printer-applet"; + module = "kdeutils"; + version = "1.5"; + release = "4.5.4"; + versionFile = "printer-applet.py"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/utils/superkaramba.nix b/pkgs/desktops/kde-4.6/utils/superkaramba.nix new file mode 100644 index 00000000000..407f924e241 --- /dev/null +++ b/pkgs/desktops/kde-4.6/utils/superkaramba.nix @@ -0,0 +1,18 @@ +{ kde, cmake, perl, kdelibs, qt4, automoc4, qimageblitz, python }: + +kde.package { + buildInputs = [ cmake qt4 perl kdelibs automoc4 qimageblitz python ]; + + cmakeFlags = "-DBUILD_icons=TRUE -DBULD_plasma=TRUE"; + + meta = { + description = "A KDE Eye-candy Application"; + kde = { + name = "superkaramba"; + module = "kdeutils"; + version = "0.55"; + release = "4.5.4"; + versionFile = "src/main.cpp"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/utils/sweeper.nix b/pkgs/desktops/kde-4.6/utils/sweeper.nix new file mode 100644 index 00000000000..feef23c7552 --- /dev/null +++ b/pkgs/desktops/kde-4.6/utils/sweeper.nix @@ -0,0 +1,16 @@ +{ kde, cmake, perl, kdelibs, qt4, automoc4 }: + +kde.package { + buildInputs = [ cmake qt4 perl kdelibs automoc4 ]; + + meta = { + description = "Helps clean unwanted traces the user leaves on the system"; + kde = { + name = "sweeper"; + module = "kdeutils"; + version = "1.5"; + release = "4.5.4"; + versionFile = "main.cpp"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/webdev/kfilereplace.nix b/pkgs/desktops/kde-4.6/webdev/kfilereplace.nix new file mode 100644 index 00000000000..c90c151b3bf --- /dev/null +++ b/pkgs/desktops/kde-4.6/webdev/kfilereplace.nix @@ -0,0 +1,17 @@ +{ kde, cmake, kdelibs, automoc4, libxml2, libxslt }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt ]; + + meta = { + description = "Batch search and replace tool"; + homepage = http://www.kdewebdev.org; + kde = { + name = "kfilereplace"; + module = "kdewebdev"; + version = "0.1"; + release = "4.5.4"; + versionFile = "main.cpp"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/webdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.6/webdev/kimagemapeditor.nix new file mode 100644 index 00000000000..93a06b21ae5 --- /dev/null +++ b/pkgs/desktops/kde-4.6/webdev/kimagemapeditor.nix @@ -0,0 +1,17 @@ +{ kde, cmake, kdelibs, automoc4, libxml2, libxslt }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt ]; + + meta = { + description = "An HTML imagemap editor"; + homepage = http://www.nongnu.org/kimagemap/; + kde = { + name = "kimagemapeditor"; + module = "kdewebdev"; + version = "3.9.0"; + release = "4.5.4"; + versionFile = "version.h"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/webdev/klinkstatus.nix b/pkgs/desktops/kde-4.6/webdev/klinkstatus.nix new file mode 100644 index 00000000000..8c27fbf4186 --- /dev/null +++ b/pkgs/desktops/kde-4.6/webdev/klinkstatus.nix @@ -0,0 +1,19 @@ +{ kde, cmake, kdelibs, automoc4, libxml2, libxslt, kdepimlibs, boost, htmlTidy, + ruby }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt kdepimlibs boost + htmlTidy ruby ]; + + meta = { + description = "A KDE link checker"; + homepage = http://klinkstatus.kdewebdev.org; + kde = { + name = "klinkstatus"; + module = "kdewebdev"; + version = "0.7.0"; + release = "4.5.4"; + versionFile = "src/main.cpp"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.6/webdev/kommander.nix b/pkgs/desktops/kde-4.6/webdev/kommander.nix new file mode 100644 index 00000000000..0dc23b2152d --- /dev/null +++ b/pkgs/desktops/kde-4.6/webdev/kommander.nix @@ -0,0 +1,16 @@ +{ kde, cmake, kdelibs, automoc4, libxml2, libxslt }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt ]; + + meta = { + description = "A graphical editor of scripted dialogs"; + kde = { + name = "kommander"; + module = "kdewebdev"; + version = "1.91"; + release = "4.5.4"; + versionFile = "lib/kommanderversion.h"; + }; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f677783700f..a182cd3ccb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6946,6 +6946,16 @@ let stdenv = pkgs.stdenv2; }; + kde46 = callPackage ../desktops/kde-4.6 { + callPackage = + let + # !!! Ugly, inefficient. + pkgs_for_46 = (applyGlobalOverrides (p: { kde4 = p.kde46; })); + in + pkgs_for_46.newScope pkgs_for_46.kde46; + stdenv = pkgs.stdenv2; + }; + xfce = xfce4; xfce4 = recurseIntoAttrs From a7ddd93631b8e1d2bb1d304c2b8c612bfde2ba8d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 26 Dec 2010 15:26:42 +0000 Subject: [PATCH 10/23] sed 4.5.4->4.5.90, nothing tested svn path=/nixpkgs/trunk/; revision=25280 --- .../kde-4.6/accessibility/color-schemes.nix | 2 +- .../kde-4.6/accessibility/icon-themes.nix | 2 +- pkgs/desktops/kde-4.6/accessibility/jovie.nix | 2 +- pkgs/desktops/kde-4.6/accessibility/kmag.nix | 2 +- .../kde-4.6/accessibility/kmousetool.nix | 2 +- .../desktops/kde-4.6/accessibility/kmouth.nix | 2 +- pkgs/desktops/kde-4.6/admin/default.nix | 2 +- pkgs/desktops/kde-4.6/artwork/aurorae.nix | 2 +- .../kde-4.6/artwork/color-schemes.nix | 2 +- .../kde-4.6/artwork/desktop-themes.nix | 2 +- pkgs/desktops/kde-4.6/artwork/emoticons.nix | 2 +- .../artwork/high-resolution-wallpapers.nix | 2 +- .../desktops/kde-4.6/artwork/kscreensaver.nix | 2 +- .../kde-4.6/artwork/nuvola-icon-theme.nix | 2 +- pkgs/desktops/kde-4.6/artwork/phase-style.nix | 2 +- pkgs/desktops/kde-4.6/artwork/sounds.nix | 2 +- pkgs/desktops/kde-4.6/artwork/wallpapers.nix | 2 +- .../kde-4.6/artwork/weather-wallpapers.nix | 2 +- .../desktops/kde-4.6/base-runtime/default.nix | 2 +- .../kde-4.6/base-workspace/default.nix | 2 +- pkgs/desktops/kde-4.6/base/default.nix | 2 +- pkgs/desktops/kde-4.6/bindings/default.nix | 2 +- pkgs/desktops/kde-4.6/default.nix | 2 +- pkgs/desktops/kde-4.6/edu/default.nix | 2 +- pkgs/desktops/kde-4.6/games/default.nix | 2 +- pkgs/desktops/kde-4.6/graphics/default.nix | 2 +- pkgs/desktops/kde-4.6/kde-package/default.nix | 22 +++-- .../kde-4.6/kde-package/kde-manifest.sh | 21 +++-- .../kde-4.6/kde-package/manifest-4.5.4.nix | 82 ------------------ .../kde-4.6/kde-package/manifest-4.5.90.nix | 85 +++++++++++++++++++ pkgs/desktops/kde-4.6/multimedia/default.nix | 2 +- pkgs/desktops/kde-4.6/network/default.nix | 2 +- pkgs/desktops/kde-4.6/pimlibs/default.nix | 2 +- .../kde-4.6/plasma-addons/default.nix | 2 +- pkgs/desktops/kde-4.6/sdk/cervisia.nix | 2 +- pkgs/desktops/kde-4.6/sdk/dolphin-plugins.nix | 2 +- pkgs/desktops/kde-4.6/sdk/kapptemplate.nix | 2 +- pkgs/desktops/kde-4.6/sdk/kate.nix | 2 +- pkgs/desktops/kde-4.6/sdk/kbugbuster.nix | 2 +- pkgs/desktops/kde-4.6/sdk/kcachegrind.nix | 2 +- .../kde-4.6/sdk/kdeaccounts-plugin.nix | 2 +- .../desktops/kde-4.6/sdk/kioslave-perldoc.nix | 2 +- pkgs/desktops/kde-4.6/sdk/kioslave-svn.nix | 2 +- pkgs/desktops/kde-4.6/sdk/kmtrace.nix | 2 +- pkgs/desktops/kde-4.6/sdk/kompare.nix | 2 +- pkgs/desktops/kde-4.6/sdk/kpartloader.nix | 2 +- pkgs/desktops/kde-4.6/sdk/kprofilemethod.nix | 2 +- pkgs/desktops/kde-4.6/sdk/kstartperf.nix | 2 +- pkgs/desktops/kde-4.6/sdk/kuiviewer.nix | 2 +- pkgs/desktops/kde-4.6/sdk/lokalize.nix | 2 +- pkgs/desktops/kde-4.6/sdk/poxml.nix | 2 +- pkgs/desktops/kde-4.6/sdk/scripts.nix | 2 +- pkgs/desktops/kde-4.6/sdk/strigi-analyzer.nix | 2 +- pkgs/desktops/kde-4.6/sdk/umbrello.nix | 2 +- pkgs/desktops/kde-4.6/toys/amor.nix | 2 +- pkgs/desktops/kde-4.6/toys/kteatime.nix | 2 +- pkgs/desktops/kde-4.6/toys/ktux.nix | 2 +- pkgs/desktops/kde-4.6/utils/ark.nix | 2 +- pkgs/desktops/kde-4.6/utils/kcalc.nix | 2 +- pkgs/desktops/kde-4.6/utils/kcharselect.nix | 2 +- pkgs/desktops/kde-4.6/utils/kdf.nix | 2 +- pkgs/desktops/kde-4.6/utils/kfloppy.nix | 2 +- pkgs/desktops/kde-4.6/utils/kgpg.nix | 2 +- .../desktops/kde-4.6/utils/kremotecontrol.nix | 2 +- pkgs/desktops/kde-4.6/utils/ktimer.nix | 2 +- pkgs/desktops/kde-4.6/utils/kwallet.nix | 2 +- pkgs/desktops/kde-4.6/utils/okteta.nix | 2 +- .../desktops/kde-4.6/utils/printer-applet.nix | 2 +- pkgs/desktops/kde-4.6/utils/superkaramba.nix | 2 +- pkgs/desktops/kde-4.6/utils/sweeper.nix | 2 +- pkgs/desktops/kde-4.6/webdev/kfilereplace.nix | 2 +- .../kde-4.6/webdev/kimagemapeditor.nix | 2 +- pkgs/desktops/kde-4.6/webdev/klinkstatus.nix | 2 +- pkgs/desktops/kde-4.6/webdev/kommander.nix | 2 +- 74 files changed, 183 insertions(+), 167 deletions(-) delete mode 100644 pkgs/desktops/kde-4.6/kde-package/manifest-4.5.4.nix create mode 100644 pkgs/desktops/kde-4.6/kde-package/manifest-4.5.90.nix diff --git a/pkgs/desktops/kde-4.6/accessibility/color-schemes.nix b/pkgs/desktops/kde-4.6/accessibility/color-schemes.nix index 1fdc02daaf8..997ad8ff4f4 100644 --- a/pkgs/desktops/kde-4.6/accessibility/color-schemes.nix +++ b/pkgs/desktops/kde-4.6/accessibility/color-schemes.nix @@ -8,7 +8,7 @@ kde.package { kde = { name = "ColorSchemes"; module = "kdeaccessibility"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/accessibility/icon-themes.nix b/pkgs/desktops/kde-4.6/accessibility/icon-themes.nix index 7fc795b595b..2f18298f227 100644 --- a/pkgs/desktops/kde-4.6/accessibility/icon-themes.nix +++ b/pkgs/desktops/kde-4.6/accessibility/icon-themes.nix @@ -8,7 +8,7 @@ kde.package { kde = { name = "IconThemes"; module = "kdeaccessibility"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/accessibility/jovie.nix b/pkgs/desktops/kde-4.6/accessibility/jovie.nix index 139895ff3cd..9270d5fb177 100644 --- a/pkgs/desktops/kde-4.6/accessibility/jovie.nix +++ b/pkgs/desktops/kde-4.6/accessibility/jovie.nix @@ -10,7 +10,7 @@ kde.package { name = "jovie"; module = "kdeaccessibility"; version = "0.6.0"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "jovie/jovie/main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.6/accessibility/kmag.nix b/pkgs/desktops/kde-4.6/accessibility/kmag.nix index 96095883716..207f1d0b3cb 100644 --- a/pkgs/desktops/kde-4.6/accessibility/kmag.nix +++ b/pkgs/desktops/kde-4.6/accessibility/kmag.nix @@ -9,7 +9,7 @@ kde.package { name = "kmag"; module = "kdeaccessibility"; version = "1.0"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "kmag/version.h"; }; }; diff --git a/pkgs/desktops/kde-4.6/accessibility/kmousetool.nix b/pkgs/desktops/kde-4.6/accessibility/kmousetool.nix index 7c6fb234a17..bb10de6e3ce 100644 --- a/pkgs/desktops/kde-4.6/accessibility/kmousetool.nix +++ b/pkgs/desktops/kde-4.6/accessibility/kmousetool.nix @@ -9,7 +9,7 @@ kde.package { name = "kmousetool"; module = "kdeaccessibility"; version = "1.12"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "kmousetool/kmousetool/version.h"; }; }; diff --git a/pkgs/desktops/kde-4.6/accessibility/kmouth.nix b/pkgs/desktops/kde-4.6/accessibility/kmouth.nix index 3626c63e143..6bbee6106fd 100644 --- a/pkgs/desktops/kde-4.6/accessibility/kmouth.nix +++ b/pkgs/desktops/kde-4.6/accessibility/kmouth.nix @@ -9,7 +9,7 @@ kde.package { name = "kmouth"; module = "kdeaccessibility"; version = "1.1.1"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "kmouth/version.h"; }; }; diff --git a/pkgs/desktops/kde-4.6/admin/default.nix b/pkgs/desktops/kde-4.6/admin/default.nix index 6e0793f4df4..c4b30643ea0 100644 --- a/pkgs/desktops/kde-4.6/admin/default.nix +++ b/pkgs/desktops/kde-4.6/admin/default.nix @@ -20,7 +20,7 @@ kde.package { license = "GPL"; kde = { name = "kdeadmin"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/artwork/aurorae.nix b/pkgs/desktops/kde-4.6/artwork/aurorae.nix index fc79a54c352..307cdf92ba0 100644 --- a/pkgs/desktops/kde-4.6/artwork/aurorae.nix +++ b/pkgs/desktops/kde-4.6/artwork/aurorae.nix @@ -8,7 +8,7 @@ kde.package rec { kde = { name = "aurorae"; module = "kdeartwork"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/artwork/color-schemes.nix b/pkgs/desktops/kde-4.6/artwork/color-schemes.nix index 8643c22a33a..ddf1cb77657 100644 --- a/pkgs/desktops/kde-4.6/artwork/color-schemes.nix +++ b/pkgs/desktops/kde-4.6/artwork/color-schemes.nix @@ -9,7 +9,7 @@ kde.package rec { kde = { name = "ColorSchemes"; module = "kdeartwork"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/artwork/desktop-themes.nix b/pkgs/desktops/kde-4.6/artwork/desktop-themes.nix index 417f96ecc1c..4bca474f254 100644 --- a/pkgs/desktops/kde-4.6/artwork/desktop-themes.nix +++ b/pkgs/desktops/kde-4.6/artwork/desktop-themes.nix @@ -9,7 +9,7 @@ kde.package rec { kde = { name = "desktopthemes"; module = "kdeartwork"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/artwork/emoticons.nix b/pkgs/desktops/kde-4.6/artwork/emoticons.nix index 64dc90a95c6..5ec584d4d0c 100644 --- a/pkgs/desktops/kde-4.6/artwork/emoticons.nix +++ b/pkgs/desktops/kde-4.6/artwork/emoticons.nix @@ -9,7 +9,7 @@ kde.package rec { kde = { name = "emoticons"; module = "kdeartwork"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/artwork/high-resolution-wallpapers.nix b/pkgs/desktops/kde-4.6/artwork/high-resolution-wallpapers.nix index 0f1b782c939..56202288659 100644 --- a/pkgs/desktops/kde-4.6/artwork/high-resolution-wallpapers.nix +++ b/pkgs/desktops/kde-4.6/artwork/high-resolution-wallpapers.nix @@ -9,7 +9,7 @@ kde.package rec { kde = { name = "HighResolutionWallpapers"; module = "kdeartwork"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/artwork/kscreensaver.nix b/pkgs/desktops/kde-4.6/artwork/kscreensaver.nix index 0390231a816..b7020c0e4f8 100644 --- a/pkgs/desktops/kde-4.6/artwork/kscreensaver.nix +++ b/pkgs/desktops/kde-4.6/artwork/kscreensaver.nix @@ -9,7 +9,7 @@ kde.package rec { name = "kscreensaver"; module = "kdeartwork"; version = "1.0"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "kscreensaver/kpartsaver/kpartsaver.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.6/artwork/nuvola-icon-theme.nix b/pkgs/desktops/kde-4.6/artwork/nuvola-icon-theme.nix index a105148845d..9719fefc33f 100644 --- a/pkgs/desktops/kde-4.6/artwork/nuvola-icon-theme.nix +++ b/pkgs/desktops/kde-4.6/artwork/nuvola-icon-theme.nix @@ -10,7 +10,7 @@ kde.package rec { kde = { name = "IconThemes"; module = "kdeartwork"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/artwork/phase-style.nix b/pkgs/desktops/kde-4.6/artwork/phase-style.nix index 0c05c263c30..068bc458a1a 100644 --- a/pkgs/desktops/kde-4.6/artwork/phase-style.nix +++ b/pkgs/desktops/kde-4.6/artwork/phase-style.nix @@ -9,7 +9,7 @@ kde.package rec { kde = { name = "styles"; module = "kdeartwork"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/artwork/sounds.nix b/pkgs/desktops/kde-4.6/artwork/sounds.nix index ca708d98f81..612bf1613f9 100644 --- a/pkgs/desktops/kde-4.6/artwork/sounds.nix +++ b/pkgs/desktops/kde-4.6/artwork/sounds.nix @@ -9,7 +9,7 @@ kde.package rec { kde = { name = "sounds"; module = "kdeartwork"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/artwork/wallpapers.nix b/pkgs/desktops/kde-4.6/artwork/wallpapers.nix index 705ff5762b5..b46d65aa550 100644 --- a/pkgs/desktops/kde-4.6/artwork/wallpapers.nix +++ b/pkgs/desktops/kde-4.6/artwork/wallpapers.nix @@ -9,7 +9,7 @@ kde.package rec { kde = { name = "wallpapers"; module = "kdeartwork"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/artwork/weather-wallpapers.nix b/pkgs/desktops/kde-4.6/artwork/weather-wallpapers.nix index bc495d2a8ff..d4f7d1d2a2f 100644 --- a/pkgs/desktops/kde-4.6/artwork/weather-wallpapers.nix +++ b/pkgs/desktops/kde-4.6/artwork/weather-wallpapers.nix @@ -9,7 +9,7 @@ kde.package rec { kde = { name = "WeatherWallpapers"; module = "kdeartwork"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/base-runtime/default.nix b/pkgs/desktops/kde-4.6/base-runtime/default.nix index 8cc432be695..15f065f09d3 100644 --- a/pkgs/desktops/kde-4.6/base-runtime/default.nix +++ b/pkgs/desktops/kde-4.6/base-runtime/default.nix @@ -21,7 +21,7 @@ kde.package { license = "LGPL"; kde = { name = "kdebase-runtime"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/base-workspace/default.nix b/pkgs/desktops/kde-4.6/base-workspace/default.nix index 9c4c5ead360..b7f3dd47488 100644 --- a/pkgs/desktops/kde-4.6/base-workspace/default.nix +++ b/pkgs/desktops/kde-4.6/base-workspace/default.nix @@ -21,7 +21,7 @@ kde.package { license = "GPL"; kde = { name = "kdebase-workspace"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/base/default.nix b/pkgs/desktops/kde-4.6/base/default.nix index 545621b5ed9..973d2cf562d 100644 --- a/pkgs/desktops/kde-4.6/base/default.nix +++ b/pkgs/desktops/kde-4.6/base/default.nix @@ -13,7 +13,7 @@ kde.package { license = "GPL"; kde = { name = "kdebase"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/bindings/default.nix b/pkgs/desktops/kde-4.6/bindings/default.nix index 4928e883e6c..74b59926cf7 100644 --- a/pkgs/desktops/kde-4.6/bindings/default.nix +++ b/pkgs/desktops/kde-4.6/bindings/default.nix @@ -30,7 +30,7 @@ kde.package rec { license = "LGPL"; kde = { name = "kdebindings"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/default.nix b/pkgs/desktops/kde-4.6/default.nix index d43cfa19d78..c9ae2cb04c1 100644 --- a/pkgs/desktops/kde-4.6/default.nix +++ b/pkgs/desktops/kde-4.6/default.nix @@ -2,7 +2,7 @@ let - version = "4.5.4"; + version = "4.5.90"; # 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.6/edu/default.nix b/pkgs/desktops/kde-4.6/edu/default.nix index 852453df4c3..e011d2cd522 100644 --- a/pkgs/desktops/kde-4.6/edu/default.nix +++ b/pkgs/desktops/kde-4.6/edu/default.nix @@ -23,7 +23,7 @@ kde.package { license = "GPL"; kde = { name = "kdeedu"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/games/default.nix b/pkgs/desktops/kde-4.6/games/default.nix index 02c7b9bf5b9..d3836ccf507 100644 --- a/pkgs/desktops/kde-4.6/games/default.nix +++ b/pkgs/desktops/kde-4.6/games/default.nix @@ -16,7 +16,7 @@ kde.package { license = "GPL"; kde = { name = "kdegames"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/graphics/default.nix b/pkgs/desktops/kde-4.6/graphics/default.nix index 45b588af25e..78442145c9f 100644 --- a/pkgs/desktops/kde-4.6/graphics/default.nix +++ b/pkgs/desktops/kde-4.6/graphics/default.nix @@ -17,7 +17,7 @@ kde.package { license = "GPL"; kde = { name = "kdegraphics"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/kde-package/default.nix b/pkgs/desktops/kde-4.6/kde-package/default.nix index 433e12f4539..81fd75e8f44 100644 --- a/pkgs/desktops/kde-4.6/kde-package/default.nix +++ b/pkgs/desktops/kde-4.6/kde-package/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: rec { - defaultArgs = {name, stable ? true, version, + defaultArgs = {name, stable ? null, version, module ? name, release ? version, ... }: assert (name == module) -> (release == version); @@ -10,15 +10,19 @@ rec { { name = "${name}-${version}"; - 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) + 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}!") - (import (./manifest + "-${release}.nix")) - ).sha256; - }; + manifest.packages; + }; meta = { maintainers = with stdenv.lib.maintainers; [ sander urkud ]; diff --git a/pkgs/desktops/kde-4.6/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.6/kde-package/kde-manifest.sh index 3811769c57a..fbaf490e8be 100755 --- a/pkgs/desktops/kde-4.6/kde-package/kde-manifest.sh +++ b/pkgs/desktops/kde-4.6/kde-package/kde-manifest.sh @@ -13,18 +13,27 @@ fi release=$(ls "${dir}"/kdelibs-*.tar.bz2 | \ sed -e 's/.*kdelibs-//' -e 's/\.tar\.bz2//') +if [[ ${release##*.} -gt 50 ]]; then + stable="false" +else + stable="true" +fi + echo "Detected release ${release}" >&2 exec > "manifest-${release}.nix" -echo "[" +echo "{" +echo " stable = ${stable};" +echo " packages = builtins.listToAttrs [" 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 " {" + echo " name = \"${module}\";" + echo " value = \"${hash}\";" + echo " }" echo $hash >&2 done -echo "]" +echo " ];" +echo "}" diff --git a/pkgs/desktops/kde-4.6/kde-package/manifest-4.5.4.nix b/pkgs/desktops/kde-4.6/kde-package/manifest-4.5.4.nix deleted file mode 100644 index b00a5025fa7..00000000000 --- a/pkgs/desktops/kde-4.6/kde-package/manifest-4.5.4.nix +++ /dev/null @@ -1,82 +0,0 @@ -[ -{ - 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.6/kde-package/manifest-4.5.90.nix b/pkgs/desktops/kde-4.6/kde-package/manifest-4.5.90.nix new file mode 100644 index 00000000000..34ef033e4cb --- /dev/null +++ b/pkgs/desktops/kde-4.6/kde-package/manifest-4.5.90.nix @@ -0,0 +1,85 @@ +{ + stable = false; + packages = builtins.listToAttrs [ + { + name = "kdeaccessibility"; + value = "0jqfyzy3jvzyv1b6n1r589vk7qs8phng6az5jgsknhjjrhsn40hy"; + } + { + name = "kdeadmin"; + value = "1kk0xzf6mrhm946rsrpizzpkx59rf8xzxfj5h5lkcrajmq4xr0q8"; + } + { + name = "kdeartwork"; + value = "0f531rzz5ryq9irkijlb2anxm9zl933yq7q9h9im30s2w4fx31j6"; + } + { + name = "kdebase"; + value = "0aj5w84clbwhckpfryhcfwjnqamdmjm6mf0nf9g1qdaa2k2sfiqm"; + } + { + name = "kdebase-runtime"; + value = "0fhzxhj6p8nam4zi9wz998q06j70wvk1zgrb95lblfcjvs5f8ggb"; + } + { + name = "kdebase-workspace"; + value = "02s2bfid02js0r9400jfk6g74b0m8y7qi95ag7pj3ynn59fz9fv7"; + } + { + name = "kdebindings"; + value = "0ggq2djhcf74zb3wr2g1i2a72ncxs9h787sf4136ys0frxc4h898"; + } + { + name = "kdeedu"; + value = "172ix71977i2rm8r2fqdwrs954d0q82xf97hzpvqmjia3hp823iv"; + } + { + name = "kdegames"; + value = "1srk4vh9n1wh71hamzzvsgwml2j6yi959w61wbqrx9hd0vh3nfcz"; + } + { + name = "kdegraphics"; + value = "0d93kg8bhg2qwbpjnkgygbc8i6qc3wmdy419h15zafy6v66hfnqi"; + } + { + name = "kdelibs"; + value = "04n0whn0srfnqb3gr4w4g92s2vwhxhsmik5bkja4zzkkyylpg76b"; + } + { + name = "kdemultimedia"; + value = "1wclpg44fips943l0yiydr8bg0r0gw1j1ji8jvivcwl8mhq2qxf1"; + } + { + name = "kdenetwork"; + value = "13r9fpbcsl5a12rlg1cifvply4shmvsmm8c1h6bkgyw55k6m652v"; + } + { + name = "kdepimlibs"; + value = "1zc07iw6f78zbbnywplavjb4vdvhr14262wfx35zw3w34x3s0czb"; + } + { + name = "kdeplasma-addons"; + value = "0x46l5840iy6nlfzbgi711rdrrjwaxzglsd9hjs90sswqyiid1zg"; + } + { + name = "kdesdk"; + value = "0dgvg0pzdwk4cg0v4rmjid0lb25r0gbhciywb2whr0l4g8rnsriz"; + } + { + name = "kdetoys"; + value = "1kzzwz8gbd0j9758vxb0cpklgcb9szl49lpyv98bb94378syvn87"; + } + { + name = "kdeutils"; + value = "1c2k8vh7vyjlvq32grs32iwfgg9q9jblm2lwhlkmrl391b38fc0d"; + } + { + name = "kdewebdev"; + value = "15zj9jwrqfkz94hhjcic8k58d6fwrxa6xacmxpmps80j7qgik0d9"; + } + { + name = "oxygen-icons"; + value = "15m08kkxyqw00zhi07mqwwkghw2knf9djw2sw32rpiicg7ppfjgx"; + } + ]; +} diff --git a/pkgs/desktops/kde-4.6/multimedia/default.nix b/pkgs/desktops/kde-4.6/multimedia/default.nix index eb0574a8fc5..d3bb8a99a66 100644 --- a/pkgs/desktops/kde-4.6/multimedia/default.nix +++ b/pkgs/desktops/kde-4.6/multimedia/default.nix @@ -14,7 +14,7 @@ kde.package { license = "GPL"; kde = { name = "kdemultimedia"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/network/default.nix b/pkgs/desktops/kde-4.6/network/default.nix index 244935ec397..48ce55eed6f 100644 --- a/pkgs/desktops/kde-4.6/network/default.nix +++ b/pkgs/desktops/kde-4.6/network/default.nix @@ -30,7 +30,7 @@ kde.package { license = "GPL"; kde = { name = "kdenetwork"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/pimlibs/default.nix b/pkgs/desktops/kde-4.6/pimlibs/default.nix index cbda200c607..7de75e9425b 100644 --- a/pkgs/desktops/kde-4.6/pimlibs/default.nix +++ b/pkgs/desktops/kde-4.6/pimlibs/default.nix @@ -12,7 +12,7 @@ kde.package { license = "LGPL"; kde = { name = "kdepimlibs"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/plasma-addons/default.nix b/pkgs/desktops/kde-4.6/plasma-addons/default.nix index e0a31d499b0..4b478e8f2e1 100644 --- a/pkgs/desktops/kde-4.6/plasma-addons/default.nix +++ b/pkgs/desktops/kde-4.6/plasma-addons/default.nix @@ -17,7 +17,7 @@ kde.package { license = "GPL"; kde = { name = "kdeplasma-addons"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/sdk/cervisia.nix b/pkgs/desktops/kde-4.6/sdk/cervisia.nix index 7a7ef2767d1..e0ff5c30597 100644 --- a/pkgs/desktops/kde-4.6/sdk/cervisia.nix +++ b/pkgs/desktops/kde-4.6/sdk/cervisia.nix @@ -9,7 +9,7 @@ kde.package { name = "cervisia"; module = "kdesdk"; version = "3.5.0"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "cervisia/version.h"; }; }; diff --git a/pkgs/desktops/kde-4.6/sdk/dolphin-plugins.nix b/pkgs/desktops/kde-4.6/sdk/dolphin-plugins.nix index d0753c8f295..023d36e47e3 100644 --- a/pkgs/desktops/kde-4.6/sdk/dolphin-plugins.nix +++ b/pkgs/desktops/kde-4.6/sdk/dolphin-plugins.nix @@ -10,7 +10,7 @@ kde.package { kde = { name = "dolphin-plugins"; module = "kdesdk"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/sdk/kapptemplate.nix b/pkgs/desktops/kde-4.6/sdk/kapptemplate.nix index c4ea482d78d..daf75993bdb 100644 --- a/pkgs/desktops/kde-4.6/sdk/kapptemplate.nix +++ b/pkgs/desktops/kde-4.6/sdk/kapptemplate.nix @@ -10,7 +10,7 @@ kde.package { name = "kapptemplate"; module = "kdesdk"; version = "0.1"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "kapptemplate/main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.6/sdk/kate.nix b/pkgs/desktops/kde-4.6/sdk/kate.nix index 336781a44ca..b588a0ea1bc 100644 --- a/pkgs/desktops/kde-4.6/sdk/kate.nix +++ b/pkgs/desktops/kde-4.6/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.4"; + release = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/sdk/kbugbuster.nix b/pkgs/desktops/kde-4.6/sdk/kbugbuster.nix index d02d2bf7ce7..5001ee944bb 100644 --- a/pkgs/desktops/kde-4.6/sdk/kbugbuster.nix +++ b/pkgs/desktops/kde-4.6/sdk/kbugbuster.nix @@ -10,7 +10,7 @@ kde.package { name = "kbugbuster"; module = "kdesdk"; version = "3.80.3"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "version.h"; }; }; diff --git a/pkgs/desktops/kde-4.6/sdk/kcachegrind.nix b/pkgs/desktops/kde-4.6/sdk/kcachegrind.nix index e4f1381e8ca..103e2dc071c 100644 --- a/pkgs/desktops/kde-4.6/sdk/kcachegrind.nix +++ b/pkgs/desktops/kde-4.6/sdk/kcachegrind.nix @@ -10,7 +10,7 @@ kde.package { name = "kcachegrind"; module = "kdesdk"; version = "0.6"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "CMakeLists.txt"; }; }; diff --git a/pkgs/desktops/kde-4.6/sdk/kdeaccounts-plugin.nix b/pkgs/desktops/kde-4.6/sdk/kdeaccounts-plugin.nix index dab7becac27..4cfa3eb2a0c 100644 --- a/pkgs/desktops/kde-4.6/sdk/kdeaccounts-plugin.nix +++ b/pkgs/desktops/kde-4.6/sdk/kdeaccounts-plugin.nix @@ -9,7 +9,7 @@ kde.package { kde = { name = "kdeaccounts-plugin"; module = "kdesdk"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/sdk/kioslave-perldoc.nix b/pkgs/desktops/kde-4.6/sdk/kioslave-perldoc.nix index 0b6f262a2c7..c5a5f2b5b61 100644 --- a/pkgs/desktops/kde-4.6/sdk/kioslave-perldoc.nix +++ b/pkgs/desktops/kde-4.6/sdk/kioslave-perldoc.nix @@ -11,7 +11,7 @@ kde.package { name = "kioslave-perldoc"; module = "kdesdk"; version = "0.9.1"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "kioslave/perldoc/perldoc.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.6/sdk/kioslave-svn.nix b/pkgs/desktops/kde-4.6/sdk/kioslave-svn.nix index 3a9bc48faf6..1ca05eb5f42 100644 --- a/pkgs/desktops/kde-4.6/sdk/kioslave-svn.nix +++ b/pkgs/desktops/kde-4.6/sdk/kioslave-svn.nix @@ -11,7 +11,7 @@ kde.package { kde = { name = "kioslave-svn"; module = "kdesdk"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/sdk/kmtrace.nix b/pkgs/desktops/kde-4.6/sdk/kmtrace.nix index 89927e67b80..2429a07f400 100644 --- a/pkgs/desktops/kde-4.6/sdk/kmtrace.nix +++ b/pkgs/desktops/kde-4.6/sdk/kmtrace.nix @@ -10,7 +10,7 @@ kde.package { kde = { name = "kmtrace"; module = "kdesdk"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/sdk/kompare.nix b/pkgs/desktops/kde-4.6/sdk/kompare.nix index 4d74d182b5c..5366edfa855 100644 --- a/pkgs/desktops/kde-4.6/sdk/kompare.nix +++ b/pkgs/desktops/kde-4.6/sdk/kompare.nix @@ -10,7 +10,7 @@ kde.package { name = "kompare"; module = "kdesdk"; version = "4.0.0"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.6/sdk/kpartloader.nix b/pkgs/desktops/kde-4.6/sdk/kpartloader.nix index e48166617e5..8702a7f7328 100644 --- a/pkgs/desktops/kde-4.6/sdk/kpartloader.nix +++ b/pkgs/desktops/kde-4.6/sdk/kpartloader.nix @@ -10,7 +10,7 @@ kde.package { name = "kpartloader"; module = "kdesdk"; version = "1.0"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "kpartloader.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.6/sdk/kprofilemethod.nix b/pkgs/desktops/kde-4.6/sdk/kprofilemethod.nix index a85f30345ea..360a71948ac 100644 --- a/pkgs/desktops/kde-4.6/sdk/kprofilemethod.nix +++ b/pkgs/desktops/kde-4.6/sdk/kprofilemethod.nix @@ -10,7 +10,7 @@ kde.package { kde = { name = "kprofilemethod"; module = "kdesdk"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/sdk/kstartperf.nix b/pkgs/desktops/kde-4.6/sdk/kstartperf.nix index 23fa4f80cfb..cd43be1cece 100644 --- a/pkgs/desktops/kde-4.6/sdk/kstartperf.nix +++ b/pkgs/desktops/kde-4.6/sdk/kstartperf.nix @@ -10,7 +10,7 @@ kde.package { name = "kstartperf"; module = "kdesdk"; version = "1.0"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "kstartperf.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.6/sdk/kuiviewer.nix b/pkgs/desktops/kde-4.6/sdk/kuiviewer.nix index c75f1be1a74..e8ea5b5b36c 100644 --- a/pkgs/desktops/kde-4.6/sdk/kuiviewer.nix +++ b/pkgs/desktops/kde-4.6/sdk/kuiviewer.nix @@ -10,7 +10,7 @@ kde.package { name = "kuiviewer"; module = "kdesdk"; version = "0.1"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.6/sdk/lokalize.nix b/pkgs/desktops/kde-4.6/sdk/lokalize.nix index 671e5c10bf7..4911cb22ae4 100644 --- a/pkgs/desktops/kde-4.6/sdk/lokalize.nix +++ b/pkgs/desktops/kde-4.6/sdk/lokalize.nix @@ -13,7 +13,7 @@ kde.package { name = "lokalize"; module = "kdesdk"; version = "1.1"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "src/version.h"; }; }; diff --git a/pkgs/desktops/kde-4.6/sdk/poxml.nix b/pkgs/desktops/kde-4.6/sdk/poxml.nix index 72e929c2bbf..652110b38ff 100644 --- a/pkgs/desktops/kde-4.6/sdk/poxml.nix +++ b/pkgs/desktops/kde-4.6/sdk/poxml.nix @@ -9,7 +9,7 @@ kde.package { kde = { name = "poxml"; module = "kdesdk"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/sdk/scripts.nix b/pkgs/desktops/kde-4.6/sdk/scripts.nix index 36bdb778b58..204c24cfba5 100644 --- a/pkgs/desktops/kde-4.6/sdk/scripts.nix +++ b/pkgs/desktops/kde-4.6/sdk/scripts.nix @@ -9,7 +9,7 @@ kde.package { kde = { name = "scripts"; module = "kdesdk"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/sdk/strigi-analyzer.nix b/pkgs/desktops/kde-4.6/sdk/strigi-analyzer.nix index 20d484f561e..88c935ade4a 100644 --- a/pkgs/desktops/kde-4.6/sdk/strigi-analyzer.nix +++ b/pkgs/desktops/kde-4.6/sdk/strigi-analyzer.nix @@ -9,7 +9,7 @@ kde.package { kde = { name = "strigi-analyzer"; module = "kdesdk"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/sdk/umbrello.nix b/pkgs/desktops/kde-4.6/sdk/umbrello.nix index 48a9d0fdfbd..d465e97012b 100644 --- a/pkgs/desktops/kde-4.6/sdk/umbrello.nix +++ b/pkgs/desktops/kde-4.6/sdk/umbrello.nix @@ -10,7 +10,7 @@ kde.package { name = "umbrello"; module = "kdesdk"; version = "2.5.2"; # release - 200 - release = "4.5.4"; + release = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/toys/amor.nix b/pkgs/desktops/kde-4.6/toys/amor.nix index e994dea0884..2c68ffe6fa8 100644 --- a/pkgs/desktops/kde-4.6/toys/amor.nix +++ b/pkgs/desktops/kde-4.6/toys/amor.nix @@ -9,7 +9,7 @@ kde.package { name = "amor"; module = "kdetoys"; version = "2.4.0"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "src/version.h"; }; }; diff --git a/pkgs/desktops/kde-4.6/toys/kteatime.nix b/pkgs/desktops/kde-4.6/toys/kteatime.nix index 601de020a6c..14cfcd07f58 100644 --- a/pkgs/desktops/kde-4.6/toys/kteatime.nix +++ b/pkgs/desktops/kde-4.6/toys/kteatime.nix @@ -9,7 +9,7 @@ kde.package { name = "kteatime"; module = "kdetoys"; version = "1.2.1"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "src/main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.6/toys/ktux.nix b/pkgs/desktops/kde-4.6/toys/ktux.nix index 0a2deec43e5..af280761865 100644 --- a/pkgs/desktops/kde-4.6/toys/ktux.nix +++ b/pkgs/desktops/kde-4.6/toys/ktux.nix @@ -9,7 +9,7 @@ kde.package { name = "ktux"; module = "kdetoys"; version = "1.0.1"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "src/sprite.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.6/utils/ark.nix b/pkgs/desktops/kde-4.6/utils/ark.nix index 0437406f72f..eb78b2fe010 100644 --- a/pkgs/desktops/kde-4.6/utils/ark.nix +++ b/pkgs/desktops/kde-4.6/utils/ark.nix @@ -14,7 +14,7 @@ kde.package { name = "ark"; module = "kdeutils"; version = "2.15"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "app/main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.6/utils/kcalc.nix b/pkgs/desktops/kde-4.6/utils/kcalc.nix index 05aa5f752e4..dd8e6f47cdc 100644 --- a/pkgs/desktops/kde-4.6/utils/kcalc.nix +++ b/pkgs/desktops/kde-4.6/utils/kcalc.nix @@ -9,7 +9,7 @@ kde.package { name = "kcalc"; module = "kdeutils"; version = "2.7"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "version.h"; }; }; diff --git a/pkgs/desktops/kde-4.6/utils/kcharselect.nix b/pkgs/desktops/kde-4.6/utils/kcharselect.nix index 069ab67669c..9952a5fa018 100644 --- a/pkgs/desktops/kde-4.6/utils/kcharselect.nix +++ b/pkgs/desktops/kde-4.6/utils/kcharselect.nix @@ -9,7 +9,7 @@ kde.package { name = "kcharselect"; module = "kdeutils"; version = "1.7"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "main.cc"; }; }; diff --git a/pkgs/desktops/kde-4.6/utils/kdf.nix b/pkgs/desktops/kde-4.6/utils/kdf.nix index 23a9bfa6895..9e07ac65a76 100644 --- a/pkgs/desktops/kde-4.6/utils/kdf.nix +++ b/pkgs/desktops/kde-4.6/utils/kdf.nix @@ -9,7 +9,7 @@ kde.package { name = "kdf"; module = "kdeutils"; version = "0.11"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "kdf.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.6/utils/kfloppy.nix b/pkgs/desktops/kde-4.6/utils/kfloppy.nix index f7ff38b8510..e4d32387a99 100644 --- a/pkgs/desktops/kde-4.6/utils/kfloppy.nix +++ b/pkgs/desktops/kde-4.6/utils/kfloppy.nix @@ -8,7 +8,7 @@ kde.package { kde = { name = "kfloppy"; module = "kdeutils"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/utils/kgpg.nix b/pkgs/desktops/kde-4.6/utils/kgpg.nix index 62cf26df915..317bc384723 100644 --- a/pkgs/desktops/kde-4.6/utils/kgpg.nix +++ b/pkgs/desktops/kde-4.6/utils/kgpg.nix @@ -9,7 +9,7 @@ kde.package { name = "kgpg"; module = "kdeutils"; version = "2.4.1"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.6/utils/kremotecontrol.nix b/pkgs/desktops/kde-4.6/utils/kremotecontrol.nix index b353bdba53c..9d6cd6ed61e 100644 --- a/pkgs/desktops/kde-4.6/utils/kremotecontrol.nix +++ b/pkgs/desktops/kde-4.6/utils/kremotecontrol.nix @@ -8,7 +8,7 @@ kde.package { kde = { name = "kremotecontrol"; module = "kdeutils"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/utils/ktimer.nix b/pkgs/desktops/kde-4.6/utils/ktimer.nix index a2193d283b1..069985d7025 100644 --- a/pkgs/desktops/kde-4.6/utils/ktimer.nix +++ b/pkgs/desktops/kde-4.6/utils/ktimer.nix @@ -9,7 +9,7 @@ kde.package { name = "ktimer"; module = "kdeutils"; version = "0.6"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.6/utils/kwallet.nix b/pkgs/desktops/kde-4.6/utils/kwallet.nix index d8ee32ff794..395fe1da448 100644 --- a/pkgs/desktops/kde-4.6/utils/kwallet.nix +++ b/pkgs/desktops/kde-4.6/utils/kwallet.nix @@ -9,7 +9,7 @@ kde.package { name = "kwallet"; module = "kdeutils"; version = "1.6"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.6/utils/okteta.nix b/pkgs/desktops/kde-4.6/utils/okteta.nix index 1390960aefe..06343e7c0af 100644 --- a/pkgs/desktops/kde-4.6/utils/okteta.nix +++ b/pkgs/desktops/kde-4.6/utils/okteta.nix @@ -9,7 +9,7 @@ kde.package { name = "okteta"; module = "kdeutils"; version = "0.5.2"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "program/about.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.6/utils/printer-applet.nix b/pkgs/desktops/kde-4.6/utils/printer-applet.nix index 6b2a297a265..92f6308b623 100644 --- a/pkgs/desktops/kde-4.6/utils/printer-applet.nix +++ b/pkgs/desktops/kde-4.6/utils/printer-applet.nix @@ -15,7 +15,7 @@ kde.package { name = "printer-applet"; module = "kdeutils"; version = "1.5"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "printer-applet.py"; }; }; diff --git a/pkgs/desktops/kde-4.6/utils/superkaramba.nix b/pkgs/desktops/kde-4.6/utils/superkaramba.nix index 407f924e241..75ed3bc0eed 100644 --- a/pkgs/desktops/kde-4.6/utils/superkaramba.nix +++ b/pkgs/desktops/kde-4.6/utils/superkaramba.nix @@ -11,7 +11,7 @@ kde.package { name = "superkaramba"; module = "kdeutils"; version = "0.55"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "src/main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.6/utils/sweeper.nix b/pkgs/desktops/kde-4.6/utils/sweeper.nix index feef23c7552..9e702ff708c 100644 --- a/pkgs/desktops/kde-4.6/utils/sweeper.nix +++ b/pkgs/desktops/kde-4.6/utils/sweeper.nix @@ -9,7 +9,7 @@ kde.package { name = "sweeper"; module = "kdeutils"; version = "1.5"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.6/webdev/kfilereplace.nix b/pkgs/desktops/kde-4.6/webdev/kfilereplace.nix index c90c151b3bf..e428f359783 100644 --- a/pkgs/desktops/kde-4.6/webdev/kfilereplace.nix +++ b/pkgs/desktops/kde-4.6/webdev/kfilereplace.nix @@ -10,7 +10,7 @@ kde.package { name = "kfilereplace"; module = "kdewebdev"; version = "0.1"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.6/webdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.6/webdev/kimagemapeditor.nix index 93a06b21ae5..a3ae85a8f16 100644 --- a/pkgs/desktops/kde-4.6/webdev/kimagemapeditor.nix +++ b/pkgs/desktops/kde-4.6/webdev/kimagemapeditor.nix @@ -10,7 +10,7 @@ kde.package { name = "kimagemapeditor"; module = "kdewebdev"; version = "3.9.0"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "version.h"; }; }; diff --git a/pkgs/desktops/kde-4.6/webdev/klinkstatus.nix b/pkgs/desktops/kde-4.6/webdev/klinkstatus.nix index 8c27fbf4186..7c419a572d3 100644 --- a/pkgs/desktops/kde-4.6/webdev/klinkstatus.nix +++ b/pkgs/desktops/kde-4.6/webdev/klinkstatus.nix @@ -12,7 +12,7 @@ kde.package { name = "klinkstatus"; module = "kdewebdev"; version = "0.7.0"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "src/main.cpp"; }; }; diff --git a/pkgs/desktops/kde-4.6/webdev/kommander.nix b/pkgs/desktops/kde-4.6/webdev/kommander.nix index 0dc23b2152d..c450e1d7810 100644 --- a/pkgs/desktops/kde-4.6/webdev/kommander.nix +++ b/pkgs/desktops/kde-4.6/webdev/kommander.nix @@ -9,7 +9,7 @@ kde.package { name = "kommander"; module = "kdewebdev"; version = "1.91"; - release = "4.5.4"; + release = "4.5.90"; versionFile = "lib/kommanderversion.h"; }; }; From ea3d59b43765fcd65aa5bcd946287ac9b8de0b4a Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 26 Dec 2010 15:26:52 +0000 Subject: [PATCH 11/23] soprano-2.5.63 svn path=/nixpkgs/trunk/; revision=25281 --- pkgs/desktops/kde-4.6/support/soprano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.6/support/soprano/default.nix b/pkgs/desktops/kde-4.6/support/soprano/default.nix index 62832861a36..dc23762f2b5 100644 --- a/pkgs/desktops/kde-4.6/support/soprano/default.nix +++ b/pkgs/desktops/kde-4.6/support/soprano/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cmake, qt4, cluceneCore, redland, libiodbc}: stdenv.mkDerivation rec { - name = "soprano-2.5.2"; + name = "soprano-2.5.63"; src = fetchurl { url = "mirror://sourceforge/soprano/${name}.tar.bz2"; - sha256 = "17k17hrcwij2plms4hb0j6994ar9kcxykf699iyiggfpj1zg7nym"; + sha256 = "1i69pbfykgn2bp36hn1qk9sbw1yx4fnaa31bfxfdssfxli7ik6c4"; }; # We disable the Java backend, since we do not need them and they make the closure size much bigger From e27e6a97e5d8edbd918996e8ba418c7e9ce1b828 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 26 Dec 2010 15:27:01 +0000 Subject: [PATCH 12/23] oxygen-icons-4.5.90 svn path=/nixpkgs/trunk/; revision=25282 --- pkgs/desktops/kde-4.6/support/oxygen-icons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.6/support/oxygen-icons/default.nix b/pkgs/desktops/kde-4.6/support/oxygen-icons/default.nix index 47f532ed203..fdd3786077e 100644 --- a/pkgs/desktops/kde-4.6/support/oxygen-icons/default.nix +++ b/pkgs/desktops/kde-4.6/support/oxygen-icons/default.nix @@ -3,7 +3,7 @@ kde.package { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1hn65n4nznbp2ikbvyrp9ncasc6y3nxhi33x927vg01pp8frn4q1"; + outputHash = "0yl5clp4dyxk6pg8lp3w3z44ayjhn7i47ww8n952mam5il6mlfl1"; buildInputs = [ cmake ]; meta = { @@ -12,7 +12,7 @@ kde.package { license = "GPL"; kde = { name = "oxygen-icons"; - version = "4.5.4"; + version = "4.5.90"; }; }; } From 3d7315790105b56ce8809bd75c302f7723454054 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 26 Dec 2010 15:27:09 +0000 Subject: [PATCH 13/23] polkit-qt-1-0.99.0 svn path=/nixpkgs/trunk/; revision=25283 --- .../kde-4.6/support/polkit-qt-1/default.nix | 6 +++-- .../support/polkit-qt-1/policy-files.patch | 25 +++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 pkgs/desktops/kde-4.6/support/polkit-qt-1/policy-files.patch diff --git a/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix b/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix index 9ff43ef5f9b..2d528c84542 100644 --- a/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix +++ b/pkgs/desktops/kde-4.6/support/polkit-qt-1/default.nix @@ -7,11 +7,13 @@ kde.package rec { src = fetchurl { url = with meta.kde; "mirror://kde/stable/apps/KDE4.x/admin/${name}-${version}.tar.bz2"; - sha256 = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr"; + sha256 = "02m710q34aapbmnz1p6qwgkk5xjmm239zdl3lvjg77dh3j0w5i3r"; }; + patches = [ ./policy-files.patch ]; + meta.kde = { name = "polkit-qt-1"; - version = "0.96.1"; + version = "0.99.0"; }; } diff --git a/pkgs/desktops/kde-4.6/support/polkit-qt-1/policy-files.patch b/pkgs/desktops/kde-4.6/support/polkit-qt-1/policy-files.patch new file mode 100644 index 00000000000..f179c962a58 --- /dev/null +++ b/pkgs/desktops/kde-4.6/support/polkit-qt-1/policy-files.patch @@ -0,0 +1,25 @@ +From 2791059a4c930c7eb5e4a3233ef997e69187c4d1 Mon Sep 17 00:00:00 2001 +From: Yury G. Kudryashov +Date: Fri, 24 Dec 2010 16:00:04 +0300 +Subject: [PATCH] Don't let packages install policy files outside of their installation prefix + +--- + PolkitQt-1Config.cmake.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/PolkitQt-1Config.cmake.in b/PolkitQt-1Config.cmake.in +index 1356de7..4c55719 100644 +--- a/PolkitQt-1Config.cmake.in ++++ b/PolkitQt-1Config.cmake.in +@@ -15,7 +15,7 @@ endif(NOT POLKITQT-1_INSTALL_DIR) + + set(POLKITQT-1_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@/polkit-qt-1") + set(POLKITQT-1_LIB_DIR "@LIB_INSTALL_DIR@") +-set(POLKITQT-1_POLICY_FILES_INSTALL_DIR "${POLKITQT-1_INSTALL_DIR}/share/polkit-1/actions") ++set(POLKITQT-1_POLICY_FILES_INSTALL_DIR "share/polkit-1/actions") + + # Compatibility + if(WIN32) +-- +1.7.3.2 + From b0cbe093ba9e3af8a1cc0cd350f072c5e5eba9bf Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 26 Dec 2010 15:27:15 +0000 Subject: [PATCH 14/23] attica-0.2.0 svn path=/nixpkgs/trunk/; revision=25284 --- pkgs/desktops/kde-4.6/support/attica/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.6/support/attica/default.nix b/pkgs/desktops/kde-4.6/support/attica/default.nix index 5c62f34efb2..0eff2cbb4eb 100644 --- a/pkgs/desktops/kde-4.6/support/attica/default.nix +++ b/pkgs/desktops/kde-4.6/support/attica/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, cmake, qt4}: stdenv.mkDerivation rec { - name = "attica-0.1.4"; + name = "attica-0.2.0"; src = fetchurl { url = "mirror://kde/stable/attica/${name}.tar.bz2"; - sha256 = "0frarnrnbli3f5ji90swgw05g88w1f5777ais345wc8lkvqg9ix1"; + sha256 = "0g2la91fgdr185ah15vc91plvdwvbm6kpsyz0vk0da7ggiyg3y9a"; }; buildInputs = [ cmake qt4 ]; meta = with stdenv.lib; { From 4f140371a508b492b0dec53b658ed943ae4d36a9 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 26 Dec 2010 15:27:20 +0000 Subject: [PATCH 15/23] akonadi-1.4.90 svn path=/nixpkgs/trunk/; revision=25285 --- .../kde-4.6/support/akonadi/default.nix | 6 ++---- .../akonadi/fix-broken-datadir-parameter.patch | 17 ----------------- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 pkgs/desktops/kde-4.6/support/akonadi/fix-broken-datadir-parameter.patch diff --git a/pkgs/desktops/kde-4.6/support/akonadi/default.nix b/pkgs/desktops/kde-4.6/support/akonadi/default.nix index 9e516947e83..ff4f1c15d59 100644 --- a/pkgs/desktops/kde-4.6/support/akonadi/default.nix +++ b/pkgs/desktops/kde-4.6/support/akonadi/default.nix @@ -1,14 +1,12 @@ {stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4, soprano}: stdenv.mkDerivation rec { - name = "akonadi-1.4.0"; + name = "akonadi-1.4.90"; src = fetchurl { url = "http://download.akonadi-project.org/${name}.tar.bz2"; - sha256 = "199fh5yqygr0xdwcnjqqms8vskigbzvwb3071r979606rrsnpnl5"; + sha256 = "0am4m81zhq343a42s1ig5jxx47i6g1d97r546qqzdm5w542r6c00"; }; buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ]; - patches = [ ./fix-broken-datadir-parameter.patch ]; - postPatch = "sed -e '/Q_ASSERT.*SQLITE/d' -i qsqlite/src/qsql_sqlite.cpp"; meta = with stdenv.lib; { description = "KDE PIM Storage Service"; license = "LGPL"; diff --git a/pkgs/desktops/kde-4.6/support/akonadi/fix-broken-datadir-parameter.patch b/pkgs/desktops/kde-4.6/support/akonadi/fix-broken-datadir-parameter.patch deleted file mode 100644 index fa33329d4b0..00000000000 --- a/pkgs/desktops/kde-4.6/support/akonadi/fix-broken-datadir-parameter.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix broken datadir parameter. - ---- akonadi-1.3.85/server/src/storage/dbconfigmysql.cpp 2010-06-09 03:41:30.000000000 -0430 -+++ akonadi-local-1.3.85/server/src/storage/dbconfigmysql.cpp 2010-08-11 00:21:20.547181479 -0430 -@@ -250,11 +250,10 @@ - // synthesize the mysqld command - QStringList arguments; - arguments << QString::fromLatin1( "--defaults-file=%1/mysql.conf" ).arg( akDir ); -+ arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ); - #ifndef Q_WS_WIN -- arguments << QString::fromLatin1( "--datadir" ) << QString::fromLatin1( "%1/" ).arg( dataDir ); - arguments << QString::fromLatin1( "--socket=%1/mysql.socket" ).arg( miscDir ); - #else -- arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ); - arguments << QString::fromLatin1( "--shared-memory" ); - #endif - From 20bffe35912e52483f1d3c0d1f2ea884f3830804 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 26 Dec 2010 15:27:26 +0000 Subject: [PATCH 16/23] Add hupnp library svn path=/nixpkgs/trunk/; revision=25286 --- pkgs/development/libraries/hupnp/default.nix | 23 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/hupnp/default.nix diff --git a/pkgs/development/libraries/hupnp/default.nix b/pkgs/development/libraries/hupnp/default.nix new file mode 100644 index 00000000000..2a81cf65bf4 --- /dev/null +++ b/pkgs/development/libraries/hupnp/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchsvn, qt4 }: + +stdenv.mkDerivation { + name = "hupnp-0.8.0-r91"; + + + buildInputs = [ qt4 ]; + + configurePhase = "cd herqq; qmake PREFIX=$out herqq.pro"; + + src = fetchsvn { + url = http://hupnp.svn.sourceforge.net/svnroot/hupnp/trunk; + rev = 91; + sha256 = "1lhg22wy95pkxsvs6yxz4k84sslngphwf2aj5yw1bzrzzc486hqd"; + }; + + meta = { + homepage = http://herqq.org; + description = "A software library for building UPnP devices and control points"; + inherit (qt4.meta) platforms; + maintainers = [ stdenv.lib.maintainers.urkud ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a182cd3ccb2..2fcefcc8c08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3194,6 +3194,8 @@ let hunspell = callPackage ../development/libraries/hunspell { }; + hupnp = callPackage ../development/libraries/hupnp { }; + hwloc = callPackage ../development/libraries/hwloc { }; hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; From 14e49759aa67185b36152f56509625ee74d49188 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 26 Dec 2010 15:27:33 +0000 Subject: [PATCH 17/23] kdelibs-4.5.90 svn path=/nixpkgs/trunk/; revision=25287 --- pkgs/desktops/kde-4.6/libs/default.nix | 8 +++----- pkgs/desktops/kde-4.6/libs/polkit-install.patch | 12 ------------ 2 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 pkgs/desktops/kde-4.6/libs/polkit-install.patch diff --git a/pkgs/desktops/kde-4.6/libs/default.nix b/pkgs/desktops/kde-4.6/libs/default.nix index a0b4681769f..2f89c6bf2f9 100644 --- a/pkgs/desktops/kde-4.6/libs/default.nix +++ b/pkgs/desktops/kde-4.6/libs/default.nix @@ -2,7 +2,7 @@ , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper , xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt -, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, hspell +, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, hspell, udev, grantlee, hupnp }: kde.package { @@ -10,7 +10,7 @@ kde.package { buildInputs = [ cmake perl xz flex bison bzip2 pcre fam libxml2 libxslt shared_mime_info giflib jasper /*openexr*/ aspell avahi kerberos acl attr libXScrnSaver - enchant libdbusmenu_qt polkit_qt_1 automoc4 hspell + enchant libdbusmenu_qt polkit_qt_1 automoc4 hspell udev grantlee hupnp ]; # TODO: make sonnet plugins (dictionaries) really work. @@ -21,8 +21,6 @@ kde.package { propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2 shared_desktop_ontologies ]; - patches = [ ./polkit-install.patch ]; - # cmake fails to find acl.h because of C++-style comment # TODO: OpenEXR, hspell cmakeFlags = '' @@ -36,7 +34,7 @@ kde.package { license = "LGPL"; kde = { name = "kdelibs"; - version = "4.5.4"; + version = "4.5.90"; }; }; } diff --git a/pkgs/desktops/kde-4.6/libs/polkit-install.patch b/pkgs/desktops/kde-4.6/libs/polkit-install.patch deleted file mode 100644 index 6633ef1209b..00000000000 --- a/pkgs/desktops/kde-4.6/libs/polkit-install.patch +++ /dev/null @@ -1,12 +0,0 @@ -Author: Yury Kudryashov -Reason: other KDE modules try to install polkit action files into -$kdelibs/share/polkit-1/actions -Upstream: rejected, they propose to set install dir in each package ---- a/cmake/modules/FindPolkitQt-1.cmake.old 2010-08-12 16:13:45.000000000 +0400 -+++ b/cmake/modules/FindPolkitQt-1.cmake 2010-08-12 16:13:56.000000000 +0400 -@@ -101,4 +101,4 @@ - endif (NOT PC_POLKITQT-1_PREFIX STREQUAL CMAKE_INSTALL_PREFIX) - endif (POLKITQT-1_FOUND) - --set(POLKITQT-1_POLICY_FILES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions) -+set(POLKITQT-1_POLICY_FILES_INSTALL_DIR share/polkit-1/actions) From ac2b5582e205dc0cb8f97faf6dd8323e50430340 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 26 Dec 2010 15:27:39 +0000 Subject: [PATCH 18/23] kde-l10n-4.5.90 svn path=/nixpkgs/trunk/; revision=25288 --- pkgs/desktops/kde-4.6/l10n/default.nix | 6 +- pkgs/desktops/kde-4.6/l10n/manifest-4.5.1.nix | 218 ----------------- pkgs/desktops/kde-4.6/l10n/manifest-4.5.2.nix | 222 ------------------ pkgs/desktops/kde-4.6/l10n/manifest-4.5.3.nix | 222 ------------------ pkgs/desktops/kde-4.6/l10n/manifest-4.5.4.nix | 222 ------------------ .../desktops/kde-4.6/l10n/manifest-4.5.90.nix | 222 ++++++++++++++++++ 6 files changed, 225 insertions(+), 887 deletions(-) delete mode 100644 pkgs/desktops/kde-4.6/l10n/manifest-4.5.1.nix delete mode 100644 pkgs/desktops/kde-4.6/l10n/manifest-4.5.2.nix delete mode 100644 pkgs/desktops/kde-4.6/l10n/manifest-4.5.3.nix delete mode 100644 pkgs/desktops/kde-4.6/l10n/manifest-4.5.4.nix create mode 100644 pkgs/desktops/kde-4.6/l10n/manifest-4.5.90.nix diff --git a/pkgs/desktops/kde-4.6/l10n/default.nix b/pkgs/desktops/kde-4.6/l10n/default.nix index 03c10cb4b8e..f3b384ad91d 100644 --- a/pkgs/desktops/kde-4.6/l10n/default.nix +++ b/pkgs/desktops/kde-4.6/l10n/default.nix @@ -3,8 +3,8 @@ let overrides = { }; - defaultRelease = "4.5.4"; - releases = [ "4.5.1" "4.5.2" "4.5.3" "4.5.4" ]; + defaultRelease = "4.5.90"; + releases = [ "4.5.90" ]; sanitizeString = replaceChars [ "@" "." ] [ "_" "_" ]; getOverride = name: attrByPath [name] {} overrides; @@ -19,7 +19,7 @@ let stdenv.mkDerivation ({ name = saneName; src = fetchurl { - url = "mirror://kde/stable/${release}/src/kde-l10n/${name}.tar.bz2"; + url = "mirror://kde/unstable/${release}/src/kde-l10n/${name}.tar.bz2"; name = "${saneName}.tar.bz2"; inherit sha256; }; diff --git a/pkgs/desktops/kde-4.6/l10n/manifest-4.5.1.nix b/pkgs/desktops/kde-4.6/l10n/manifest-4.5.1.nix deleted file mode 100644 index 3f7e0ffc8ab..00000000000 --- a/pkgs/desktops/kde-4.6/l10n/manifest-4.5.1.nix +++ /dev/null @@ -1,218 +0,0 @@ -[ -{ - lang = "ar"; - sha256 = "0xgmrwlza3p2fvj66y4vc4r81r5y2n2igjaj2xmgvb2pvh4zx0ws"; -} -{ - lang = "bg"; - sha256 = "1npa9y8i7j68c8sa9cd96gy4n65bkl474agibax8rdk2mniyqrn9"; -} -{ - lang = "ca"; - sha256 = "0097sk50cf1cq6wnah3kiab8vkh68snzahcng2blk63gw908yfvx"; -} -{ - lang = "cs"; - sha256 = "077424cbqn68rf9wb026ip1n0rq5lz1iwp4k7ih15j87ymbrd03f"; -} -{ - lang = "da"; - sha256 = "0p80a2pn9hgih2y5s27z8ir8jkyz68i87sdw439c8z3pjww5dy2h"; -} -{ - lang = "de"; - sha256 = "007r6wf0in22y2jc1nr1msazv6bd48136kc4q0633gn1igdhb03h"; -} -{ - lang = "el"; - sha256 = "1ffgqjxgdfsjx0nwhj5yl2pn2kmc92s01wfxzdvb6kss9r53v95k"; -} -{ - lang = "en_GB"; - sha256 = "1bmg1aygaarnpka9dfvxgnzwqphqaly8rfps63g03ncls7ml8ilb"; -} -{ - lang = "eo"; - sha256 = "0bqrarah2pc6kjcfla117rwc0k1m23ndp4nm4ac2sygmanz1j6bk"; -} -{ - lang = "es"; - sha256 = "0hr3halsjjdzlmx2rfxycacm26pxs1f3m8awahmr1dp5ngid42wn"; -} -{ - lang = "et"; - sha256 = "1pj1wjnjjj052csn0ajql2i3ynpd4fc9l53zj4j3vsd177gypdjw"; -} -{ - lang = "eu"; - sha256 = "0zhrqy8b7wn8vdq75dlafc91mhvqpn3cw7hn90jj99c1aazdhjpd"; -} -{ - lang = "fi"; - sha256 = "0x0dhy1c7wn5wxqx2v7jyv10rc6gi6klmw0q80vp3xpfma9l16yg"; -} -{ - lang = "fr"; - sha256 = "1yvzpvxdzznrj61hdbi9jgpxdb9l0i8g24q1xkswpnp87jrncpaq"; -} -{ - lang = "fy"; - sha256 = "14c740yfw5v043rmqmwnb3ic0s7l2kcjy57qdqhfpmr75m4rjrvl"; -} -{ - lang = "ga"; - sha256 = "0w5cj0bgyy2pna8hqcpx82n3pwzr9vzshzknz86azb8c0pwkcjdw"; -} -{ - lang = "gl"; - sha256 = "00kwqzypkw0bi8nhz75a367h2filwkmc1kiiv66l2s3d4vrkdgjz"; -} -{ - lang = "gu"; - sha256 = "0as072rz4k4h8b0ix8jipn6bfck8van024sz1gd6xj1bhs83wk0m"; -} -{ - lang = "he"; - sha256 = "1f5j1qgkmzjagmyjxa00xmfxk5zgfms77gidg88hycrvgrxm6g59"; -} -{ - lang = "hi"; - sha256 = "0sy6cis0hkddmq4jw43a7rpxjadmzrgbgyhnnhyp9m6n225rh54g"; -} -{ - lang = "hr"; - sha256 = "016h7iqfkarl6p20gqcajknw3bsbqvby824fsdyrrhan82vsqd0k"; -} -{ - lang = "hu"; - sha256 = "1ck6vrrvvwlcxlgmmjq4hk5dh38clqvf3fwc7ndgr4wrxlr4c94m"; -} -{ - lang = "ia"; - sha256 = "13mnd7ndkfdq591da3cwj64wchq86qk265i6r7xir87gxn5m86xr"; -} -{ - lang = "id"; - sha256 = "0a1rw0mx1fdmps5vfx7m8mrmsqvqkpdbpbwys9sxbxy1zcbinasr"; -} -{ - lang = "is"; - sha256 = "0hinhxsq4nm4g97gcdfyx8fzx6d0syg9llww9spwpqp26myad69r"; -} -{ - lang = "it"; - sha256 = "0z4kdlmyliqa6qgdxbimifp535p6nvvydpa504i9klxcywc382y5"; -} -{ - lang = "ja"; - sha256 = "1vsyjgwh69wwadn27ncxmr85d1qn91xvrbfxxl8x9gqa44dzrs7k"; -} -{ - lang = "kk"; - sha256 = "1nzx2djxav6hga6ha473xkqiqgv8ikh3iq3b7i20zqcsjp3lhynq"; -} -{ - lang = "km"; - sha256 = "0rd36apjlgq3qvhbdq0a289hbn1hff1qbnphaisy1p1dsh3bbnw9"; -} -{ - lang = "kn"; - sha256 = "0al7whnmcpiq50b56xhzxpd6zmwv79s5j62m6z537kl3ldq9is5l"; -} -{ - lang = "ko"; - sha256 = "0s5y6h8nx4xp5vd39qpby303zsvi67yrbdzsgvig98gbw61szkd7"; -} -{ - lang = "lt"; - sha256 = "0wmwfn7w6z1lvjgn283rcpxv8j6lh8yzkvgjmhdg2r4ys948gzz0"; -} -{ - lang = "lv"; - sha256 = "1w4k7rr06m0ynl52gdikqw45754pj7z9n65pxyv88gxj5sjkzlw8"; -} -{ - lang = "ml"; - sha256 = "1qgs6xwyx1sc496ybq1m1mm0wyl9fz6317p4m5jvwiicldrcx3hq"; -} -{ - lang = "nb"; - sha256 = "0frnnxang8k491cnmn9lc2kbqkqr5m40c53d75l07j97jndv98y1"; -} -{ - lang = "nds"; - sha256 = "1p3h86qzrrhxrvl4qryizm3j6lnq3lm1vpnnapkk04y7msz0fdpr"; -} -{ - lang = "nl"; - sha256 = "0lphl2j0faalaj3mkkqv5806bg2fd6s1478cprrrkw788hvvlmzl"; -} -{ - lang = "nn"; - sha256 = "06pj24zfsgbkk1jxjjs5by8czv0llfz90iq6rq4lxnc0s195isjg"; -} -{ - lang = "pa"; - sha256 = "1sqqanvxzw63bdlkgvi6jlngvrshqrfl8d0jac103wvy4y4f6l5r"; -} -{ - lang = "pl"; - sha256 = "13n278n3p32bphch54x7qgba268m95kmql3qgxsx8ziy8riir9mm"; -} -{ - lang = "pt"; - sha256 = "12mkprpk9imda0iyi65mg4rs3w2qnyq8iszg0k7yqf7537zpv4x1"; -} -{ - lang = "pt_BR"; - sha256 = "1ipn6kvc3nq84fvpb9xrpwkqjaj2sya3y1cr2ai51909yfjk5r35"; -} -{ - lang = "ro"; - sha256 = "1kfyjlpkjnmv7fryr1w2a9d1dijkmhs3mqpqg0hi7316qy2z10jy"; -} -{ - lang = "ru"; - sha256 = "0m62rszff2k4rffmy3h9hxhs8bf523cfinlyay663zq3bh35i6h9"; -} -{ - lang = "sk"; - sha256 = "07pzslmln8yh0s8ik0bj86rhyy4w21w13pvf9z6ifapqigklw33c"; -} -{ - lang = "sl"; - sha256 = "1vrdzbl5ii6paaick88dkr5fabjpi36gjwwz67kqy6d9nm44jjp1"; -} -{ - lang = "sr"; - sha256 = "186ncq0hr0lrn1l6xhqwjwqrmd9xw9qa0kf9cqvj0x3j6qk4mjqf"; -} -{ - lang = "sv"; - sha256 = "0r62fs75a1kfr2dsfg1zrzh0c2wgbv6jq4c1w05wcbmqvpq16ks6"; -} -{ - lang = "th"; - sha256 = "1apvlcmbwhnjc3dlfjzah1ckwwhjn2rcrvgmv1rwvn9py7yfzhf5"; -} -{ - lang = "tr"; - sha256 = "0zci2fqcnlj9y23sy7v8yb1nc37dfqbpj1xrfs7sfvhj12048sb0"; -} -{ - lang = "uk"; - sha256 = "0p9jdz8w8xiiqhbsj90gkshcpijh2l8hfbvvqy12d1nx5wb1glp3"; -} -{ - lang = "wa"; - sha256 = "06hybn2l2jlibxr6lg91p0p7nnc6lyisx0w64zar52h958mqa9p8"; -} -{ - lang = "zh_CN"; - sha256 = "1f786n41yqfi02gd0n9lf30xn9djgbm26c8kqx8p7fm2b5vw28jh"; -} -{ - lang = "zh_TW"; - sha256 = "065d2ggahphsffk7p8xb9p5xzm12azz84s9jll447sawwks0jgsg"; -} -] diff --git a/pkgs/desktops/kde-4.6/l10n/manifest-4.5.2.nix b/pkgs/desktops/kde-4.6/l10n/manifest-4.5.2.nix deleted file mode 100644 index cb9a4506555..00000000000 --- a/pkgs/desktops/kde-4.6/l10n/manifest-4.5.2.nix +++ /dev/null @@ -1,222 +0,0 @@ -[ -{ - lang = "ar"; - sha256 = "1wlg38gfv77d4rfzr6ba8mcrbq1lsgvqpd1zgcfgv9m6c5i32rh0"; -} -{ - lang = "bg"; - sha256 = "0dy2zirfs2aan445862srfrxkvmv9l6dk1qzk2mis8lmq7qnvv4x"; -} -{ - lang = "ca"; - sha256 = "0ay15k75d44ggr6s5qxip7cwyddl91zlqgwnp71iw720iq49d4c1"; -} -{ - lang = "ca@valencia"; - sha256 = "0fmcmpm3wi1qfd0lvd10d0crn7jfzf9n184x45fvqw4dkn62phdc"; -} -{ - lang = "cs"; - sha256 = "0r06qh0i3il2n07bbp70gsr5p7y5gb9gd1gzy5m5g33mmnhgf2af"; -} -{ - lang = "da"; - sha256 = "1dz2ixm42ndyqwjs6h3900ycq9j50l0nzahxmjfm76b9r2cbph6g"; -} -{ - lang = "de"; - sha256 = "1729hhfwszairx08x0s5rbidrbxqqvlh1m6rww2j1bqv5krgadns"; -} -{ - lang = "el"; - sha256 = "1is7vy7m0y3x6n5llcg4fz8qd6ddjvfxriyggw9kx1g661z25gny"; -} -{ - lang = "en_GB"; - sha256 = "0nwgj99y13h3fc6ljmnmrxaj3aiwg031p4nrb49ngmh66r1c3n2r"; -} -{ - lang = "eo"; - sha256 = "0w78f6n2nhalgj7i997hrkka9i252mrny8mgnq8bfwsr03lfjs9h"; -} -{ - lang = "es"; - sha256 = "18cqvjw7f9kj0inhhw00b6jxgsikamr0iik7pbblra2shimpr9hh"; -} -{ - lang = "et"; - sha256 = "1zrdywhc34kj09141ybr5g98bf1zqrxzazsdi51ln07pcmbrn7fd"; -} -{ - lang = "eu"; - sha256 = "03ff2narllyjyl7ddqq80i88m10ma1g9l0k970vpakw2bk3qd90c"; -} -{ - lang = "fi"; - sha256 = "0kpzsngspxgfgy2fdghb7syksrs4h3392xngl7g1ndr6m9wfrl33"; -} -{ - lang = "fr"; - sha256 = "042jbsr7agkikyj4f3wz6vbwgalmkq75sxm9mr0hspaxqw0rdww5"; -} -{ - lang = "fy"; - sha256 = "0yvqi4z98aql596pa77blrj34mxhv3q04nbp4mdiss9i6wkqxa56"; -} -{ - lang = "ga"; - sha256 = "14s90f9nlk2knkf8lsxklkval39gb77ca70hcs4n571hl3hdvpd7"; -} -{ - lang = "gl"; - sha256 = "0xh409ydzqzsbwq7727i5yj6irb2y75maa7kkvm9bmhpb5whn0k6"; -} -{ - lang = "gu"; - sha256 = "1agly26l4z5lc0s1b4j5rdpdk9sf0ffw9zp8j4mvaz501aifq777"; -} -{ - lang = "he"; - sha256 = "0z2czis29bqga9jzgrdzqf85f6k14gr1rcyawhc6ddffmb5is8pj"; -} -{ - lang = "hi"; - sha256 = "0f1j6682pfajg7dlf2rqqif5s8w00wpjr688kchqdsld7byax4wf"; -} -{ - lang = "hr"; - sha256 = "126f04zgnha153yzmq5263chwiz2lv910sgrh23a07k6piip20wi"; -} -{ - lang = "hu"; - sha256 = "10cwzpsq42vkyb4x7sc406pjf3ryr5api0cr9vwhnnqprwr82yw3"; -} -{ - lang = "ia"; - sha256 = "0gd6li2iy1l0bg9kvs19hsxlrqzfa92if7j9g90l8qml1xg0d916"; -} -{ - lang = "id"; - sha256 = "1rz8h2yna7hyvv2bynf0q5zz42qs74y6z4y2ca92b0qfc4a1ai1d"; -} -{ - lang = "is"; - sha256 = "1lkr67dlpskj141y7wihxdgnmkag1dalb8s0r1xixf051ax2wd2y"; -} -{ - lang = "it"; - sha256 = "1pz0mlg1p9mrqb79m7dsm6lk8iicyc8jwbrvrhlsji6ahr81pybk"; -} -{ - lang = "ja"; - sha256 = "12333ilhd67y8gkddpx7jzdvs10h66qi8qi4nrqb6ici6spxmb3i"; -} -{ - lang = "kk"; - sha256 = "0q845ix7kadfsphvfdkz7fawh3zqmainsw321mn90n6izf8y893j"; -} -{ - lang = "km"; - sha256 = "0ahmw632kqclplq5d65inglhvn5jzxdjhhpkqx32rq7sxk3qhhrf"; -} -{ - lang = "kn"; - sha256 = "12lp3rbcxbqm27clm71vli2pdwyp8r2bk3a2mmvnv016pjn0vphn"; -} -{ - lang = "ko"; - sha256 = "12fb0wqms571xp9mnyiv61khby71cwsf9sg05w0gjci7avwxv6w0"; -} -{ - lang = "lt"; - sha256 = "1p2rg1w3b6qgzjhsmi8dsj3mh7n8wbkgp9hrwbsl8dj7l6yz9799"; -} -{ - lang = "lv"; - sha256 = "0zm48nl504dwwsrn8b44ldh0dzj7j42v6r54bsfsqajzq7f857yi"; -} -{ - lang = "ml"; - sha256 = "0wxsfykvsg1iz0az1jngdl26sgs73pv0si30n0835xzclcv4dflx"; -} -{ - lang = "nb"; - sha256 = "1040i62nh9ldv2v5ps483r6ccp2jy6w94kijv5h01k2p82iv8f85"; -} -{ - lang = "nds"; - sha256 = "1ljgdlrqwb966xpxg2fpjcqzmplhdbmd566q7k69x5fmmyxw7vn9"; -} -{ - lang = "nl"; - sha256 = "08vwq4xy392bqln31lvbdgzhx50sj44mrnw920j6k2a0f1qmkar7"; -} -{ - lang = "nn"; - sha256 = "1da0xrbx8p72lp6r4nrhh6q5sgfm08vak6dk9g3kssjgnjarg785"; -} -{ - lang = "pa"; - sha256 = "05jkc60csj16gxxh6z5n15g65yqf2nd77sa8f00vjhx58iisvvb2"; -} -{ - lang = "pl"; - sha256 = "0hi7dsrg7dln9nkfc1wichmn334303qxdkihv13fybw43xp3gznv"; -} -{ - lang = "pt"; - sha256 = "17j0angzvv2mxj12jb7vv3dlmljrfhyki5clmj040z64siam0w4k"; -} -{ - lang = "pt_BR"; - sha256 = "1c6i79bslyzz0skfh05152jxn5hqlbas2l9fgzh58amn5bgy6afg"; -} -{ - lang = "ro"; - sha256 = "1yljfz3b7lnnlnwvqf71b22ss99an759hg3xky1nzq11kpp9a5y0"; -} -{ - lang = "ru"; - sha256 = "0p1zp2bgz3afxq4r6cbr1sv56ymq0xvn249vi048knsa2sclq8bk"; -} -{ - lang = "sk"; - sha256 = "1v6lx4jb78k44xgfdxih1mf1817piw1igmvkc39l7r8ci0drvdjx"; -} -{ - lang = "sl"; - sha256 = "1xqyafbzas460p7vxvydw8k8gzsgaxsidy19hzanvdb5ns4j8fs2"; -} -{ - lang = "sr"; - sha256 = "1yznci299164l89dq9k5wfahk5aw3y61i4bf08qn6zi5hmzsfv66"; -} -{ - lang = "sv"; - sha256 = "1k5b9f9i5zn8j5nkafw4cl42rvigssz5fqmy0nv1awj87r9vd3x6"; -} -{ - lang = "th"; - sha256 = "0l25jags9kfhnr0v8k5id2pl85rlxly5a74i94wzvnf0abkmy6hi"; -} -{ - lang = "tr"; - sha256 = "166rw0znk906zikdxg573xykfxmwdnld2ps9c0y758n6mvl107xz"; -} -{ - lang = "uk"; - sha256 = "1hlx3dnf3avcnfs55v0vq9knmf001hs00fd4rqigx8y09i8947jc"; -} -{ - lang = "wa"; - sha256 = "17i73mmc1vwvjwrvz9sq45q0ax43xq3agi2d95s772kpbrf4l8qj"; -} -{ - lang = "zh_CN"; - sha256 = "1xqi0rn36dm7f4j5x9gdk6ml8y3vzzm009qp8algqrzy46j864cz"; -} -{ - lang = "zh_TW"; - sha256 = "1qh3vnpk6ickdqa8n9h1na16s6q7kr61f44b0qymxz2lw79ihhgz"; -} -] diff --git a/pkgs/desktops/kde-4.6/l10n/manifest-4.5.3.nix b/pkgs/desktops/kde-4.6/l10n/manifest-4.5.3.nix deleted file mode 100644 index b9b69d76a15..00000000000 --- a/pkgs/desktops/kde-4.6/l10n/manifest-4.5.3.nix +++ /dev/null @@ -1,222 +0,0 @@ -[ -{ - lang = "ar"; - sha256 = "0i22kwm737ry3l3q9pwmbnv2ln317fz3r1z8x8i6l0czdkj5qxw6"; -} -{ - lang = "bg"; - sha256 = "0qa2x3zz5aaxlm88zvrkglsisc85la6asfh5yiijc9hga27ykp16"; -} -{ - lang = "ca"; - sha256 = "1ip55x72chxs9v1hr8rzi519xhfvkkbv7b4k4pc5nygpdqzj1whh"; -} -{ - lang = "ca@valencia"; - sha256 = "0g8x685a2ndvm9qh2wp6kxdlhbidgsjacw80p488hizgqczakbn7"; -} -{ - lang = "cs"; - sha256 = "19zx1zhd6wrkqmc6qnyj4rsll14difps0dzwnwa56l3h5ir1828v"; -} -{ - lang = "da"; - sha256 = "1q50w3dmxbpczgxgl6n49lc5qqym42r1kz4h7ijqfazb5mwk9zqc"; -} -{ - lang = "de"; - sha256 = "0ff4174szrxm4wn3jmkkzfr3jl0yqxkkqi3g3xj71mazsrsa1ghs"; -} -{ - lang = "el"; - sha256 = "1r5m3d7cc3mi748ckmkky53j3cmw20pibczvkwcs2c65q6l0vcjc"; -} -{ - lang = "en_GB"; - sha256 = "194jdjpqcpi861sxpvqagm8nammwksxyi55i75bw53p8x87i27pv"; -} -{ - lang = "eo"; - sha256 = "1gbmqm9mgmps37pwr7lb140pvrmm24m6aw989qaig27gjjqpmvnx"; -} -{ - lang = "es"; - sha256 = "1hnnk2zvlbppdqqbf1vi2d2c8mpw693bwb6dixba4p542ir7bi8i"; -} -{ - lang = "et"; - sha256 = "0qgv7v93n4mnpcdvjxkdbvyaji1nhgj0nxby5hxrznnvgwbvfzbf"; -} -{ - lang = "eu"; - sha256 = "1rmdak9pgkswrnwdpmgck2lq2cw5v3bjc8vv79mb3kyki901423g"; -} -{ - lang = "fi"; - sha256 = "17s9yqadgjq2dmp28syxzzprya80j0b2l60r293k0bdkdfrgz07p"; -} -{ - lang = "fr"; - sha256 = "15hh7k9dhi2mb27rihjc9dfii1ab8c1i2jbhihmjmb8hd5dm30bx"; -} -{ - lang = "fy"; - sha256 = "0q5vcnimnvl3gmrqj2fr6i7fvw2bd3lrg77s03hf25crkfsd7lr8"; -} -{ - lang = "ga"; - sha256 = "0cy8a0jvb0w35i3482a86rdnbbyswww9dlb57rjhw6mqwa3qp6j6"; -} -{ - lang = "gl"; - sha256 = "1xdzhf6kwkz2r77i86grcdbrwxm37shaif2vjhhwgimplsh7z5s3"; -} -{ - lang = "gu"; - sha256 = "1sky7kc5prg1bnkh2nhriqs33qa7rlfds9k31sf24x4jhfn75lji"; -} -{ - lang = "he"; - sha256 = "0bkfwilsvvaiklgnfnyf6p1dyamwj310b9xkrdga7szrsfgrviip"; -} -{ - lang = "hi"; - sha256 = "0fxz77pfv9ayx43pf037bpllhjwxdhsggl7yq5qg28d233602sxc"; -} -{ - lang = "hr"; - sha256 = "16nkrdh1y9mk5rkdyl70i9dh8xam2fr23lz7p0qmjf66npjnvcz1"; -} -{ - lang = "hu"; - sha256 = "141xhsxv2bk81sx3lzzd78a9qzp0qzrcp32i9d4bkmyppwiia9h2"; -} -{ - lang = "ia"; - sha256 = "1hgzk2yfwjqils8zd1rv1djdjsj932mqxcl4bnfv3az4vl0ly405"; -} -{ - lang = "id"; - sha256 = "12hqichrl7i3fjkqyhc2c3dp34bhjl0ps4g3vpc0m59w2vwyv4sw"; -} -{ - lang = "is"; - sha256 = "1ydx8sx7dwdzava4y3aj0vfd23nfqiwq5m9aw3ayaliipacrq1dg"; -} -{ - lang = "it"; - sha256 = "0z7zig48ixqs18dyi6q28k8dwn2a2giwsndignd5ck7xbi5h7rn8"; -} -{ - lang = "ja"; - sha256 = "0mpch19nk8pqizq2zcs8jpxrsj2nq9lx82m58dwgmxdn3qlpklm3"; -} -{ - lang = "kk"; - sha256 = "099hqac4a5z0aq3nw0znwjlxgxgpmmjb385nm2z74s3d8d4dw8bb"; -} -{ - lang = "km"; - sha256 = "09lmpxv3ljm7bhhnmj94dia7ldz4sdnf9v0cs7ia83iiaw008hc9"; -} -{ - lang = "kn"; - sha256 = "0bzwbncgzf3mhp7f24r9wrf8ip6d5slmvvycmyicvpwfj61dcwsx"; -} -{ - lang = "ko"; - sha256 = "0saxxrzvcsjjw4jascqk8vpr8lm7xq737vabhmsfqga0262h8wzl"; -} -{ - lang = "lt"; - sha256 = "1fn6dbncqdgnwgrd58jcdbc9c474kyb397djxk5lcf9gmdq7634q"; -} -{ - lang = "lv"; - sha256 = "0vml848hxynic4cg3w8zadmfxs7l0qqd7xb3c7kxznrqgkra7rqs"; -} -{ - lang = "ml"; - sha256 = "1d77wb1d7lsmpv2vh8jzfi4y30bd5nn8ljlfx42yfdyw9drkbm38"; -} -{ - lang = "nb"; - sha256 = "1mprsawqaqb6i2nhgbvq8hp1nmfwlxvd9chfx49xas7wk209jd25"; -} -{ - lang = "nds"; - sha256 = "005i6vvq6s8c9spjx0is29jj9d0x4lm766njvsgsa0mrzgfps6w7"; -} -{ - lang = "nl"; - sha256 = "0f0z2ql08pgdbqig67jjxk8p1bf6fk70br9nhmsk72k2lv7abb0y"; -} -{ - lang = "nn"; - sha256 = "08ajabbzrng3gn56bl0wk15rd43pwlrd0crj7c4n8aq61qgz1c1p"; -} -{ - lang = "pa"; - sha256 = "099d7fhk48c3vra7bcam89ffs86iw495vxycr3679ah1bfwf8k68"; -} -{ - lang = "pl"; - sha256 = "1qf6bycvzz6p0lvvkpq2lwvjiln42xrq0qhjzcb7m8zs1zan47hi"; -} -{ - lang = "pt"; - sha256 = "16726ggm87y3bvyhdpvvwcw6n5s8dw5bjw5kxpz7160iljabn71a"; -} -{ - lang = "pt_BR"; - sha256 = "12fp3gf0iicwv426ni7n45rbxywrv4ni73c1ljw1lahfdhmhkxsv"; -} -{ - lang = "ro"; - sha256 = "0bi25kmg7jcmz8c6xlqadzv5jr6kxx8z0pbbhgbh2nl6yfjw7fm9"; -} -{ - lang = "ru"; - sha256 = "0g7ibrv5x9dlhawjcmd302yg4vql31675w7cnzjcpkc9sga3i764"; -} -{ - lang = "sk"; - sha256 = "0jmndf6kxqhqgfiilzfzaf9hgq6c66ndcw1lc306kcw0qv90fm1s"; -} -{ - lang = "sl"; - sha256 = "1lic93q78kq831pzgzmydy6x9fgzkyrwpl5958sjpvbf2dra1xmp"; -} -{ - lang = "sr"; - sha256 = "0g9cdkq7lcm2gbgsk001ywpwjwbsi8xxv90cklifgxfvqnd351gw"; -} -{ - lang = "sv"; - sha256 = "0l7xqyya76np43acq3hjgvcipz0acc2iwqmwjs2hgnhbs12fny2c"; -} -{ - lang = "th"; - sha256 = "1pbjxng4p35zd2aw78x3z5ycil1diah39bknmdgpily5cd3g3bg8"; -} -{ - lang = "tr"; - sha256 = "1spsr67k9wmcaypk0yzqg60qq6ynw4xfi3xcsdm2vkhgcc9rk8cl"; -} -{ - lang = "uk"; - sha256 = "1jii27q1m0sj3vk7ly45m9zi49l4rkr2v05z8zzfbxi2gzg02kc1"; -} -{ - lang = "wa"; - sha256 = "0mqpqpwj1qnzrqyd4lc0fkhj1r42p228kg2yyy6xn2xa4na8sg2w"; -} -{ - lang = "zh_CN"; - sha256 = "0hx69djrd7nvm889b5ig2hjy73m0vhzxxj7njrh21y551pcj7s0q"; -} -{ - lang = "zh_TW"; - sha256 = "1axpangs004scmhq35m22axg3v6rdpidndvr1i49cxf3bhgpqpqs"; -} -] diff --git a/pkgs/desktops/kde-4.6/l10n/manifest-4.5.4.nix b/pkgs/desktops/kde-4.6/l10n/manifest-4.5.4.nix deleted file mode 100644 index 99d4e4b0d86..00000000000 --- a/pkgs/desktops/kde-4.6/l10n/manifest-4.5.4.nix +++ /dev/null @@ -1,222 +0,0 @@ -[ -{ - 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.6/l10n/manifest-4.5.90.nix b/pkgs/desktops/kde-4.6/l10n/manifest-4.5.90.nix new file mode 100644 index 00000000000..33f7abff71c --- /dev/null +++ b/pkgs/desktops/kde-4.6/l10n/manifest-4.5.90.nix @@ -0,0 +1,222 @@ +[ +{ + lang = "ar"; + sha256 = "19mfcq1ms0k6msir8q1g70myvqiapcf6a2r8wq47achxnpkicia9"; +} +{ + lang = "bg"; + sha256 = "1njbxf5y3pl9nmyj913qinaa3qr4q4v8gvwmg7mfidddrr60yniz"; +} +{ + lang = "ca"; + sha256 = "1yv5220q1d3w4nmix9jzz98fhyk0516v3mr5j4pczf407mrggh3l"; +} +{ + lang = "ca@valencia"; + sha256 = "047rq1g0a7dy0kdna9gd4x906dk6inb61vw0xl6kkb3kzxxp3das"; +} +{ + lang = "cs"; + sha256 = "1cazhfrh9nagxi2grlwldwl4j92xhgj8lmyaxkhb893nj845z108"; +} +{ + lang = "da"; + sha256 = "1cm19gp0qiq6yqdzwpv14swj8g7rkvspqgnn5b2i5f3qqr25d29g"; +} +{ + lang = "de"; + sha256 = "0sr51gpyfdgai8frrr0dw7qyssc39kl3fqkjg8w8zjlsp5x6ddx5"; +} +{ + lang = "el"; + sha256 = "0s6mg2diy84my66zgcs5z8xk13j2a8q71xkrvw4d1z8pbnbw4i66"; +} +{ + lang = "en_GB"; + sha256 = "1n461w69gs9q86kp6xy0980ziry61idr0bk614mv58ip1myzwhgm"; +} +{ + lang = "eo"; + sha256 = "1s7p0d45f30871rikx74rc238z9w239pdb4ay9nfx2618wnsrhkr"; +} +{ + lang = "es"; + sha256 = "1583gkwac4ys2sz8a93km0fabqpasslas5jzkavbz1bn8ps1q0w3"; +} +{ + lang = "et"; + sha256 = "00sbnyqhvsdy9y1f59ir0mpxbj6h5x7gc8hiigfzsymlm14fhf26"; +} +{ + lang = "eu"; + sha256 = "1pk6dmakxzj3qqq506flyipcc1sc954lsf4zsy82ii8ki06zvrvw"; +} +{ + lang = "fi"; + sha256 = "1xcdmmvf8x723ngw5xw714x86xpn66qb3pw6h0x01mlh28lprq7j"; +} +{ + lang = "fr"; + sha256 = "18wbz82cnxk51vj4qpw54xcrplga7vpm7p0cw19cjwph2xs62bjl"; +} +{ + lang = "fy"; + sha256 = "1n3ix81jz9716ai9xm99r2v3n64w0kqvr8iz58zlrns5k9cig1nw"; +} +{ + lang = "ga"; + sha256 = "0gm5ylr0dw6slilf1xdsksx17f7kqxmagdywl3dp2fry2h6z3xrn"; +} +{ + lang = "gl"; + sha256 = "132bchxzm4qkbjcf5ljwniyjiahfwkd3i01sqm57l9ssgkq88f1r"; +} +{ + lang = "gu"; + sha256 = "1sg4c0ijap8aird7fwflzw2w7yhx08b8baw4453nkk28s3l0wbl8"; +} +{ + lang = "he"; + sha256 = "1gjngdh6qwmwfhyxcad1xsyq0l25v88bdg4yl1m5iw5a44rvn9br"; +} +{ + lang = "hi"; + sha256 = "1q5rhiwn5fp8sgdrlqh2gh1f4q60x0s5x79q31fnw4kdk5akkrbs"; +} +{ + lang = "hr"; + sha256 = "0hsdh8pnir8ykdsakbii7jj2nd9g1h03s29bmbg6w4r7q39xif7i"; +} +{ + lang = "hu"; + sha256 = "0zpmndlb0vp3sp7z8g233335kak3ms8gzzgn1dhqch0rs03dx9cb"; +} +{ + lang = "ia"; + sha256 = "01jrkfs4jp8z4554sia73vk4js1sd32a3swhal664vdwnf62cw70"; +} +{ + lang = "id"; + sha256 = "0nylab5ncqdx5s3nnq7lx3fd70crjwihkgp9hv689vz4l8g1si4z"; +} +{ + lang = "is"; + sha256 = "1rj8m2qsfhrv4k99mf5sydz5mhq0anhcfi4na04l1hi7icypbz9d"; +} +{ + lang = "it"; + sha256 = "1f1kd82f3pc4szbfwsyxpn115rp2fbkx98gzxpnaggb3j88vq2k9"; +} +{ + lang = "ja"; + sha256 = "0axl759bpv18dl0pw52hlksgdza1y8f7jfw5zgv6rc9qks1f1f9q"; +} +{ + lang = "kk"; + sha256 = "14xvnj21kqp41ayi6n1a8qbph5llf9izs5qql82lcvph3a7zdjxv"; +} +{ + lang = "km"; + sha256 = "0fywr8c6cz0wp4kx56xfd93mjbgwmnmh6zv0kdq8lr9xzjfjbbvq"; +} +{ + lang = "kn"; + sha256 = "13isz33r2wkir2n53fxvmadk5fp4178rxm3nlr8c0l4fqic5pj1a"; +} +{ + lang = "ko"; + sha256 = "1l18crb73cg5an8isgv0iih1mc3j4ghqnfrx39bbrl5ljym78xfx"; +} +{ + lang = "lt"; + sha256 = "01b50dzhxlczmjqc07ph40bz86020ll1ddzcr0285dqqxcl466hg"; +} +{ + lang = "lv"; + sha256 = "0vcbl1laf0vnpks3mfghxffvnyyl4av4lgkgx9annw625aybwc5w"; +} +{ + lang = "ml"; + sha256 = "06z3ihbd3mjzmr68h5bxnp2zhkfnjx7a4ldkv9hj1m4miwpa9af6"; +} +{ + lang = "nb"; + sha256 = "1zp7803s50y750i59cpfq5n4m4yq7xjyqzrrajk4k2cp3kv7prv0"; +} +{ + lang = "nds"; + sha256 = "1f71gl6v9nasrci17glbllyc1h8iaw69j1vf36pyzzp3jwi6y6pg"; +} +{ + lang = "nl"; + sha256 = "18x4dfffyc11acl90bj5d86xvbjiq9bkszdgnmninaa6zjmmvng9"; +} +{ + lang = "nn"; + sha256 = "0syb3x2mlz7lf6awa1h0lchj7qmwmdmxai2cy0h0ja3jvbh6hrsw"; +} +{ + lang = "pa"; + sha256 = "1dd5bpn409b839blb5zj27gc0mg13r3d36ap80lybivqpga0c5bw"; +} +{ + lang = "pl"; + sha256 = "0cmqh4f846s910jlhgc1vpzwlbry0vc4wwpx5misiybh2didhly9"; +} +{ + lang = "pt"; + sha256 = "01z1bz56r1jpfwl2vhfkb8w667layv2hm163y6x4i940qfiig167"; +} +{ + lang = "pt_BR"; + sha256 = "0swilj7qvsrg66xccjmyzlj4l6k88qghvdcs6m9nha3rv199p35k"; +} +{ + lang = "ro"; + sha256 = "08c8ikxfmxgiwchdhayjflk4773rfan2jmjnbrixmam21x2py5ys"; +} +{ + lang = "ru"; + sha256 = "01nskj9mi28xbg77shnmhc46ilx9qrnsv1rsmpblphqxs3wczpqy"; +} +{ + lang = "sk"; + sha256 = "12ja66s0v85d8w5nk1c0xwfs04wq0ngxmpypc5igky90qxhg3f75"; +} +{ + lang = "sl"; + sha256 = "0qqass959xcc7gg1q76w10alrj1ypxc5hg43hlbjagxy8x1nkd99"; +} +{ + lang = "sr"; + sha256 = "16cq9iz2njvwm4d57f07ay4rzw66pwphblxrdrlk22fvkli1hmps"; +} +{ + lang = "sv"; + sha256 = "05hskmbmr9gzfk7i3xlh6a56inmjgl26cvbkcm967mayfigxcaqp"; +} +{ + lang = "th"; + sha256 = "0n9jbngj3l1crqgqv9am8bl3l3sa3x2ccna4p9ccbjyvl4xgryij"; +} +{ + lang = "tr"; + sha256 = "14lfp80r9vwr4kbway2kzff3qr9dgywal6n68adam7jhagfmxifc"; +} +{ + lang = "uk"; + sha256 = "1ygac3jnjw4y4jfk4r8hba1d9ppb41sq50szbh4s4cw0p77kwi91"; +} +{ + lang = "wa"; + sha256 = "1pg37wyyc2fbjy1pmmk8vchk3jl0x9qahqa8bka3w24piq8k2bal"; +} +{ + lang = "zh_CN"; + sha256 = "1664vjjs2nfldmzwda5p2qv9gayx1jpnr0glm87whgak1yyhwjsb"; +} +{ + lang = "zh_TW"; + sha256 = "05c3m128c92gj6n0jr6d6wwbs142nwyxxj6bf0rq24pdl1m5fdn8"; +} +] From e9e22a7238181a37e9d17dabd5ce5d188157c380 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 26 Dec 2010 17:18:13 +0000 Subject: [PATCH 19/23] Rename hupnp to herqq Don't pass it to kdelibs as it breaks kdelibs build svn path=/nixpkgs/trunk/; revision=25289 --- pkgs/desktops/kde-4.6/libs/default.nix | 14 +++++++----- pkgs/development/libraries/herqq/0.7.0.nix | 22 +++++++++++++++++++ pkgs/development/libraries/herqq/0.8.0.nix | 22 +++++++++++++++++++ .../{hupnp/default.nix => herqq/svn.nix} | 8 +++---- pkgs/top-level/all-packages.nix | 8 +++++-- 5 files changed, 62 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/libraries/herqq/0.7.0.nix create mode 100644 pkgs/development/libraries/herqq/0.8.0.nix rename pkgs/development/libraries/{hupnp/default.nix => herqq/svn.nix} (60%) diff --git a/pkgs/desktops/kde-4.6/libs/default.nix b/pkgs/desktops/kde-4.6/libs/default.nix index 2f89c6bf2f9..88d7391def2 100644 --- a/pkgs/desktops/kde-4.6/libs/default.nix +++ b/pkgs/desktops/kde-4.6/libs/default.nix @@ -2,7 +2,7 @@ , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper , xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt -, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, hspell, udev, grantlee, hupnp +, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, hspell, udev, grantlee }: kde.package { @@ -10,13 +10,15 @@ kde.package { buildInputs = [ cmake perl xz flex bison bzip2 pcre fam libxml2 libxslt shared_mime_info giflib jasper /*openexr*/ aspell avahi kerberos acl attr libXScrnSaver - enchant libdbusmenu_qt polkit_qt_1 automoc4 hspell udev grantlee hupnp + enchant libdbusmenu_qt polkit_qt_1 automoc4 hspell udev grantlee ]; -# TODO: make sonnet plugins (dictionaries) really work. -# There are a few hardcoded paths. -# Let kdelibs find openexr -# Split plugins from libs? +# TODO: +# * make sonnet plugins (dictionaries) really work. +# There are a few hardcoded paths. +# * Let kdelibs find openexr +# * Split plugins from libs? +# * herqq: kdelibs tries to include HDeviceProxy which was never released propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2 shared_desktop_ontologies ]; diff --git a/pkgs/development/libraries/herqq/0.7.0.nix b/pkgs/development/libraries/herqq/0.7.0.nix new file mode 100644 index 00000000000..80bfaf638df --- /dev/null +++ b/pkgs/development/libraries/herqq/0.7.0.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, qt4, unzip }: + +stdenv.mkDerivation rec { + name = "herqq-0.7.0"; + + + buildInputs = [ qt4 unzip ]; + + configurePhase = "qmake PREFIX=$out herqq.pro"; + + src = fetchurl { + url = "mirror://sourceforge/hupnp/${name}.zip"; + sha256 = "13z6wabakn2j57azhik9nvps50l85hrs028kkhn5cpd0pgcigmqz"; + }; + + meta = { + homepage = http://herqq.org; + description = "A software library for building UPnP devices and control points"; + inherit (qt4.meta) platforms; + maintainers = [ stdenv.lib.maintainers.urkud ]; + }; +} diff --git a/pkgs/development/libraries/herqq/0.8.0.nix b/pkgs/development/libraries/herqq/0.8.0.nix new file mode 100644 index 00000000000..29b76065918 --- /dev/null +++ b/pkgs/development/libraries/herqq/0.8.0.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, qt4, unzip }: + +stdenv.mkDerivation rec { + name = "herqq-0.8.0"; + + + buildInputs = [ qt4 unzip ]; + + configurePhase = "qmake PREFIX=$out herqq.pro"; + + src = fetchurl { + url = "mirror://sourceforge/hupnp/${name}.zip"; + sha256 = "0z1z9f48fhdif3wd7gn2gj0yxk15f0lpm01q0igsccv8m1y3mphn"; + }; + + meta = { + homepage = http://herqq.org; + description = "A software library for building UPnP devices and control points"; + inherit (qt4.meta) platforms; + maintainers = [ stdenv.lib.maintainers.urkud ]; + }; +} diff --git a/pkgs/development/libraries/hupnp/default.nix b/pkgs/development/libraries/herqq/svn.nix similarity index 60% rename from pkgs/development/libraries/hupnp/default.nix rename to pkgs/development/libraries/herqq/svn.nix index 2a81cf65bf4..c9f0f09d44a 100644 --- a/pkgs/development/libraries/hupnp/default.nix +++ b/pkgs/development/libraries/herqq/svn.nix @@ -1,17 +1,17 @@ { stdenv, fetchsvn, qt4 }: stdenv.mkDerivation { - name = "hupnp-0.8.0-r91"; + name = "herqq-0.8.0-r91"; buildInputs = [ qt4 ]; - configurePhase = "cd herqq; qmake PREFIX=$out herqq.pro"; + configurePhase = "qmake PREFIX=$out herqq.pro"; src = fetchsvn { - url = http://hupnp.svn.sourceforge.net/svnroot/hupnp/trunk; + url = http://hupnp.svn.sourceforge.net/svnroot/hupnp/trunk/herqq; rev = 91; - sha256 = "1lhg22wy95pkxsvs6yxz4k84sslngphwf2aj5yw1bzrzzc486hqd"; + sha256 = "122md1kn8b5a1vdpn5kisqi6xklwwa57r4lacm1rxlkq3rpca864"; }; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2fcefcc8c08..9a9c5d8025d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3186,6 +3186,12 @@ let heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { }; + herqqSvn = callPackage ../development/libraries/herqq/svn.nix { }; + + herqq070 = callPackage ../development/libraries/herqq/0.7.0.nix { }; + + herqq080 = callPackage ../development/libraries/herqq/0.8.0.nix { }; + hspell = callPackage ../development/libraries/hspell { }; hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { }; @@ -3194,8 +3200,6 @@ let hunspell = callPackage ../development/libraries/hunspell { }; - hupnp = callPackage ../development/libraries/hupnp { }; - hwloc = callPackage ../development/libraries/hwloc { }; hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; From 1d24f3178329c1c16860395656e4c94248853330 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 26 Dec 2010 17:18:19 +0000 Subject: [PATCH 20/23] Really exclude kde-4.6 from hydra builds svn path=/nixpkgs/trunk/; revision=25290 --- pkgs/desktops/kde-4.6/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/kde-4.6/default.nix b/pkgs/desktops/kde-4.6/default.nix index c9ae2cb04c1..3335584a7ef 100644 --- a/pkgs/desktops/kde-4.6/default.nix +++ b/pkgs/desktops/kde-4.6/default.nix @@ -17,7 +17,7 @@ let in -recurseIntoAttrs rec { +rec { inherit callPackage stdenv; qt4 = qt47; From a8bfe3a9b13ac314744cd1f5558a9c1bad9f98c5 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 27 Dec 2010 16:00:29 +0000 Subject: [PATCH 21/23] Bumped disnix again svn path=/nixpkgs/trunk/; revision=25295 --- pkgs/tools/package-management/disnix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 49c51745d46..981afc8bbe3 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv}: stdenv.mkDerivation { - name = "disnix-0.2pre25258"; + name = "disnix-0.2pre25293"; src = fetchurl { - url = http://hydra.nixos.org/build/824993/download/4/disnix-0.2pre25258.tar.gz; - sha256 = "1lj1mji34s79vhs6r8mcm8l5njbvs9m17nn5r16yqz820wisr4a7"; + url = http://hydra.nixos.org/build/829056/download/4/disnix-0.2pre25293.tar.gz; + sha256 = "0nsq0kk390x3s8wvdp043n1mdi6jb43770d8s3vsc96qiajs1b9j"; }; buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv From b2ac724cd6a6ccd06f8091339289b443e8a8f514 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Mon, 27 Dec 2010 20:50:27 +0000 Subject: [PATCH 22/23] xmonad-contrib: Now depends on X11Xft. svn path=/nixpkgs/trunk/; revision=25299 --- pkgs/applications/window-managers/xmonad/xmonad-contrib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix index 62c00faa4ac..1c0619356e0 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix @@ -1,11 +1,11 @@ -{cabal, xmonad, X11, utf8String}: +{cabal, xmonad, X11, utf8String, X11Xft}: cabal.mkDerivation (self : { pname = "xmonad-contrib"; name = "${self.fname}"; version = "0.9.1"; sha256 = "b4ca1d71d12903be76187ce58898697086e7af3ef73468987cb7ef03b076ec47"; - propagatedBuildInputs = [X11 xmonad utf8String]; + propagatedBuildInputs = [X11 xmonad utf8String X11Xft]; meta = { description = "a huge extension library for xmonad"; }; From 7df337558a622da0c7077ec7fabb8301f18d0402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 28 Dec 2010 14:56:08 +0000 Subject: [PATCH 23/23] Trying to add ultrastardx. It fails for me in x86_64. I invite others to test or fix it, as I know zero about fpc. svn path=/nixpkgs/trunk/; revision=25305 --- pkgs/games/ultrastardx/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/games/ultrastardx/default.nix diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix new file mode 100644 index 00000000000..710d14cb86c --- /dev/null +++ b/pkgs/games/ultrastardx/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, pkgconfig, lua, fpc, pcre, portaudio, freetype, libpng +, SDL, SDL_image, ffmpeg, sqlite, zlib, libX11 }: + +stdenv.mkDerivation rec { + name = "ultrastardx-1.1"; + src = fetchurl { + url = "mirror://sourceforge/ultrastardx/${name}-src.tar.gz"; + sha256 = "0sfj5rfgj302avcp6gj5hiypcxms1wc6h3qzjaf5i2a9kcvnibcd"; + }; + + buildInputs = [ pkgconfig fpc pcre portaudio freetype libpng SDL SDL_image ffmpeg + sqlite lua ]; + + + # The fpc is not properly wrapped to add -rpath. I add this manually. + # I even do a trick on lib/lib64 for libgcc, that I expect it will work. + preBuild = '' + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL}/lib -rpath ${SDL_image}/lib -rpath ${libpng}/lib -rpath ${freetype}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg}/lib -rpath ${zlib}/lib -rpath ${sqlite}/lib -rpath ${libX11}/lib -rpath ${pcre}/lib -rpath ${stdenv.gcc.gcc}/lib64 -rpath ${stdenv.gcc.gcc}/lib" + ''; + + # dlopened libgcc requires the rpath not to be shrinked + dontPatchELF = true; + + meta = { + homepage = http://ultrastardx.sourceforge.net/; + description = "Free and open source karaoke game"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a9c5d8025d..a23c76a0417 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6848,6 +6848,11 @@ let ultimatestunts = callPackage ../games/ultimatestunts { }; + ultrastardx = callPackage ../games/ultrastardx { + stdenv = stdenv2; + lua = lua5; + }; + urbanterror = callPackage ../games/urbanterror { }; ut2004demo = callPackage ../games/ut2004demo { };