Commit graph

104 commits

Author SHA1 Message Date
Vladimír Čunát 8db4152ddf A more complete fix of cyrus-sasl update (broken KDEs).
This amends commit af656c6698.
2013-03-13 21:06:37 +01:00
Sander van der Burg af656c6698 kdepimlibs break against newer cyrus-sasl. Including this extra header fixes it 2013-03-13 10:44:12 +01:00
Eelco Dolstra 0a47a28f1d Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-22 23:23:53 +01:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra 179df95090 Merge remote-tracking branch 'origin/master' into systemd 2012-12-10 12:39:14 +01:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Eelco Dolstra 9322bee988 Use systemd instead of udev, and don't use consolekit 2012-11-06 13:02:11 +01:00
Petr Rockai e9315d4a1c Enable the aspell plugin for KDE 4.7 (the default kde4). 2012-09-24 16:26:46 +02:00
Eelco Dolstra 7bfdeb102b kde-workspace: Disable parallel building
Maybe this fixes this build failure:

In file included from /tmp/nix-build-103m3iz49n04a7h1pzinalqnw7x5g0da-kde-workspace-4.8.4.drv-0/kde-workspace-4.8.4/plasma/generic/runners/kill/killrunner.h:28:0,
                 from /tmp/nix-build-103m3iz49n04a7h1pzinalqnw7x5g0da-kde-workspace-4.8.4.drv-0/kde-workspace-4.8.4/plasma/generic/runners/kill/killrunner.cpp:20:
/tmp/nix-build-103m3iz49n04a7h1pzinalqnw7x5g0da-kde-workspace-4.8.4.drv-0/kde-workspace-4.8.4/plasma/generic/runners/kill/killrunner_config.h:24:34: fatal error: ui_killrunner_config.h: No such file or directory
compilation terminated.

http://hydra.nixos.org/build/2837527
2012-07-25 14:49:16 -04:00
Yury G. Kudryashov 29b8d20f33 Fix old typo in kdeutils/superkaramba.nix
svn path=/nixpkgs/trunk/; revision=34408
2012-06-09 13:09:59 +00:00
Mathijs Kwik 6ef610851e kde okular: include pkgconfig, otherwise libspectre isn't found (.ps viewing)
svn path=/nixpkgs/trunk/; revision=33676
2012-04-09 10:17:20 +00:00
Yury G. Kudryashov b7642bfdfb svn merge ^/nixpkgs/trunk
I need the latest KDE-related changes

svn path=/nixpkgs/branches/stdenv-updates/; revision=32806
2012-03-05 21:01:47 +00:00
Yury G. Kudryashov 296eff8fbd Pass pkgconfig to kdeplasma-addons
svn path=/nixpkgs/trunk/; revision=32805
2012-03-05 20:59:19 +00:00
Yury G. Kudryashov e07a111edc kdelibs depend on xz. Really.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32397
2012-02-19 11:19:11 +00:00
Yury G. Kudryashov 313a029f16 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
2012-02-19 11:16:24 +00:00
Yury G. Kudryashov 08f6682666 KDE-4.7: build with qt-4.8
svn path=/nixpkgs/trunk/; revision=32392
2012-02-19 09:22:33 +00:00
Eelco Dolstra ce544df561 * Revert r31596 (which changes the Qt for KDE 4.7). This doesn't
belong in the stdenv branch and breaks KDE
  (http://hydra.nixos.org/build/2068311).

svn path=/nixpkgs/branches/stdenv-updates/; revision=32381
2012-02-18 01:30:22 +00:00
Arie Middelkoop 453768b1cc kde-runtime requires libjpeg as buildInput.
svn path=/nixpkgs/trunk/; revision=32363
2012-02-17 18:55:36 +00:00
Yury G. Kudryashov 79d0d410cb svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32350
2012-02-17 13:43:31 +00:00
Yury G. Kudryashov 882b8ea871 kde47.libkdcraw: fix build with qt-4.8
svn path=/nixpkgs/trunk/; revision=32349
2012-02-17 13:36:41 +00:00
Eelco Dolstra d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Yury G. Kudryashov c7a1f309a7 Backport some fixes from kde-4.8
svn path=/nixpkgs/branches/stdenv-updates/; revision=31597
2012-01-16 17:43:55 +00:00
Yury G. Kudryashov bd7fe12cef Use qt-4.8 by default
svn path=/nixpkgs/branches/stdenv-updates/; revision=31596
2012-01-16 17:39:40 +00:00
Yury G. Kudryashov 15ab248bca Revert "Use qt-4.8 by default"
This reverts r31196. Will re-apply after fixing most packages broken by this
change.

svn path=/nixpkgs/trunk/; revision=31203
2012-01-02 12:54:22 +00:00
Yury G. Kudryashov b8a3e5fbc9 kdelibs: depend on libjpeg
svn path=/nixpkgs/trunk/; revision=31202
2012-01-02 12:52:43 +00:00
Yury G. Kudryashov 6639c58398 Use qt-4.8 by default
Some packages may break because pkgconfig is no longer propagated.

svn path=/nixpkgs/trunk/; revision=31196
2012-01-02 10:42:25 +00:00
Yury G. Kudryashov c93380381c kdelibs: remove unused parameter
svn path=/nixpkgs/trunk/; revision=30939
2011-12-16 19:38:43 +00:00
Eelco Dolstra 55688e9d57 * KDE 4.7.4.
svn path=/nixpkgs/trunk/; revision=30803
2011-12-08 12:49:26 +00:00
Eelco Dolstra 89fb4363b4 * Oops, forgot to commit.
svn path=/nixpkgs/trunk/; revision=30385
2011-11-11 02:21:25 +00:00
Eelco Dolstra 5b622e20a1 * KDE 4.7.3.
svn path=/nixpkgs/trunk/; revision=30384
2011-11-10 23:35:58 +00:00
Yury G. Kudryashov 2109983477 Fix comment
svn path=/nixpkgs/trunk/; revision=29852
2011-10-15 13:32:05 +00:00
Yury G. Kudryashov bc0b96370f KDE-4.7.2 mass update
Regenerate manifests+update oxygen-icons hash; kde-wallpapers hash remains the
same.

svn path=/nixpkgs/trunk/; revision=29717
2011-10-08 11:59:24 +00:00
Yury G. Kudryashov e3c935cd2c kde-4.7: akonadi-1.6.1
svn path=/nixpkgs/trunk/; revision=29515
2011-09-27 15:40:54 +00:00
Yury G. Kudryashov 109b36eca9 Move soprano to top-level namespace
svn path=/nixpkgs/trunk/; revision=29513
2011-09-27 15:40:40 +00:00
Yury G. Kudryashov ef664e90a0 Re-enable ntrack support in KDE-4.7
It seems that the patches applied to ntrack in r29105 fixed the problem.

svn path=/nixpkgs/trunk/; revision=29338
2011-09-19 05:16:11 +00:00
Karn Kallio 37651d0e68 Fix kremotecontrol build.
svn path=/nixpkgs/trunk/; revision=29229
2011-09-12 18:46:21 +00:00
Eelco Dolstra 74e4d96e7e * Remove the kde_baseapps wrapper because
1) It broke the Gwenview build (it ended up depending on the
     wrapper).
  2) It's confusing to have two identically named packages.
  3) If upstream's kde_baseapps doesn't include Konsole and Kate, then
     why should ours?

svn path=/nixpkgs/trunk/; revision=29206
2011-09-12 12:45:59 +00:00
Eelco Dolstra f16c8d72db * Remove obsolete file.
svn path=/nixpkgs/trunk/; revision=29205
2011-09-12 12:40:58 +00:00
Eelco Dolstra 3e3613c75a * Update the oxygen-icons output hash.
svn path=/nixpkgs/trunk/; revision=29204
2011-09-12 12:34:06 +00:00
Yury G. Kudryashov b6648e207d KDE SC 4.7.1
Mostly automatic update. The only manual change caused by some movements on
projects.kde.org. Untested.

svn path=/nixpkgs/trunk/; revision=29179
2011-09-11 12:39:06 +00:00
Yury G. Kudryashov 134fb92f73 Drop unused buildInput
Mark virtuoso as a runtime dependency of kdebase-runtime.
The propagatedUserEnvPackages is not used by buildEnv, but I'm going to let it
use this property (instead of/in addition to)
$prefix/nix-support/propagated-user-env-packages.

svn path=/nixpkgs/trunk/; revision=29162
2011-09-11 07:25:30 +00:00
Yury G. Kudryashov 5fb9815469 kioslave-svn does not need subversion server
svn path=/nixpkgs/trunk/; revision=29104
2011-09-07 22:53:20 +00:00
Yury G. Kudryashov 133310cb87 soprano: find virtuoso without LD_LIBRARY_PATH hack
Now it finds virtuoso driver provided that virtuoso-t binary is in PATH.

svn path=/nixpkgs/trunk/; revision=29103
2011-09-07 22:53:11 +00:00
Eelco Dolstra ad51692715 * Style fixes.
svn path=/nixpkgs/trunk/; revision=29048
2011-09-05 21:02:21 +00:00
Eelco Dolstra 378009ff4a * Turn parallel building support on again (got lost somewhere...).
svn path=/nixpkgs/trunk/; revision=29035
2011-09-05 19:23:06 +00:00
Yury G. Kudryashov 50f5c15996 Trying to fix nepomukserver startup problem
svn path=/nixpkgs/trunk/; revision=28909
2011-08-29 22:43:03 +00:00
Yury G. Kudryashov 597412252a Wrap kde-related packages in kdePackagesFor
This lets hydra build kde packages for all available KDE releases.
Will commit NixOS-fix in a few minutes.

svn path=/nixpkgs/trunk/; revision=28833
2011-08-26 13:49:23 +00:00
Yury G. Kudryashov 5c90976c6a Add meta to kde-4.7 'subdir' pkgs
svn path=/nixpkgs/trunk/; revision=28816
2011-08-25 20:00:55 +00:00
Eelco Dolstra 0b99612c18 * Layout.
svn path=/nixpkgs/trunk/; revision=28717
2011-08-21 00:13:34 +00:00
Yury G. Kudryashov b815a9ea40 Pass individual packages in kde-4.7
E.g., use
{ ..., marble, ... } : marble
instead of
{ ..., kdeedu, ... } : kdeedu.marble

svn path=/nixpkgs/trunk/; revision=28694
2011-08-19 15:42:58 +00:00