Commit graph

951 commits

Author SHA1 Message Date
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
3b39886275 Oops, fix evaluation
Forgotten to pass pkgconfig to kdeplasma-addons

svn path=/nixpkgs/trunk/; revision=32804
2012-03-05 20:59:15 +00:00
Yury G. Kudryashov
55adb6c2f7 kdeplasma-addons depends on libdbusmenu-qt
svn path=/nixpkgs/trunk/; revision=32803
2012-03-05 20:51:25 +00:00
Yury G. Kudryashov
4767246246 kdeplasma-addons needs pkg-config to find some dependencies
svn path=/nixpkgs/trunk/; revision=32802
2012-03-05 20:51:18 +00:00
Yury G. Kudryashov
57fd764a39 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
2012-03-05 10:00:23 +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
5c6a3faf4e Merge ^/nixpkgs/trunk
svn tried to change libpng/default.nix version, I've changed libpng/12.nix
version manually.

svn path=/nixpkgs/branches/libpng15/; revision=32395
2012-02-19 11:06:00 +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
Yury G. Kudryashov
024c247807 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32382
2012-02-18 16:26:34 +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
14a5b4991c svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32360
2012-02-17 17:44:20 +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
Yury G. Kudryashov
070874c5f1 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32321
2012-02-16 11:23:36 +00:00
Yury G. Kudryashov
c81f618a34 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32273
2012-02-14 14:33:10 +00:00
Yury G. Kudryashov
5d70cfcb25 kdepim-runtime: fix mailindexer eating 100% CPU
svn path=/nixpkgs/trunk/; revision=32271
2012-02-14 14:29:22 +00:00
Yury G. Kudryashov
e155073b2c svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31888
2012-01-27 17:49:20 +00:00
Yury G. Kudryashov
b31c67e24d svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31887
2012-01-27 16:43:39 +00:00
Yury G. Kudryashov
afc0aea6d1 kalzium: patch pushed upstream
svn path=/nixpkgs/trunk/; revision=31886
2012-01-27 16:31:54 +00:00
Yury G. Kudryashov
3256c40575 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31878
2012-01-27 11:48:58 +00:00
Yury G. Kudryashov
fdae7ad9f4 Pass stable/unstable to l10n
svn path=/nixpkgs/trunk/; revision=31876
2012-01-27 10:03:32 +00:00
Yury G. Kudryashov
94372bc342 akonadi-1.7.0
svn path=/nixpkgs/trunk/; revision=31871
2012-01-26 20:07:54 +00:00
Yury G. Kudryashov
5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Yury G. Kudryashov
68d3727a41 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31848
2012-01-26 10:11:47 +00:00
Yury G. Kudryashov
2ac0c88674 Fix errors found by test-eval-release
svn path=/nixpkgs/trunk/; revision=31847
2012-01-26 10:07:00 +00:00
Yury G. Kudryashov
2ced89b7f1 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31846
2012-01-26 08:45:19 +00:00
Yury G. Kudryashov
ecea8900e7 KDE-4.8.0
svn path=/nixpkgs/trunk/; revision=31845
2012-01-26 08:36:28 +00:00
Karn Kallio
3206dbd63d As pointed out by Yury Kudryashov kde48.kdelibs does not in fact need
pkgconfig

svn path=/nixpkgs/trunk/; revision=31832
2012-01-24 22:26:10 +00:00
Karn Kallio
151fcc6133 Get kdelibs from kde48 release candidate to build.
svn path=/nixpkgs/trunk/; revision=31801
2012-01-24 01:54:49 +00:00
Karn Kallio
90563b958f kde 4.8 release candidate uses unstable directory for download.
svn path=/nixpkgs/trunk/; revision=31798
2012-01-23 21:56:33 +00:00
Yury G. Kudryashov
84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Yury G. Kudryashov
a525fdb18d svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31718
2012-01-19 21:00:43 +00:00
Yury G. Kudryashov
8899e60693 Remove unused patches, fix pykde4 patch
svn path=/nixpkgs/trunk/; revision=31712
2012-01-19 20:27:59 +00:00
Eelco Dolstra
3fa83e15e7 * Missed a reference to xz.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31682
2012-01-19 13:56:57 +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
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Eelco Dolstra
48ee2523da * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31633
2012-01-18 15:53:12 +00:00
Eelco Dolstra
2f1edcc1eb * Added Xfce's appfinder application.
svn path=/nixpkgs/trunk/; revision=31611
2012-01-17 18:08:09 +00:00
Eelco Dolstra
24431bd0f6 * Update various Xfce packages.
svn path=/nixpkgs/trunk/; revision=31607
2012-01-17 17:43:48 +00:00
Yury G. Kudryashov
3aa99d803e Remove PATHS from find-svn.patch
svn path=/nixpkgs/trunk/; revision=31605
2012-01-17 16:27:57 +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
81b4eef864 jasper: propagate libjpeg, kopete: remove 'fix'
svn path=/nixpkgs/trunk/; revision=31595
2012-01-16 17:36:59 +00:00
Yury G. Kudryashov
13c81f6c79 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31568
2012-01-14 21:40:24 +00:00
Yury G. Kudryashov
d5b73eadeb Fix kalzium build
svn path=/nixpkgs/trunk/; revision=31564
2012-01-14 18:04:25 +00:00
Yury G. Kudryashov
810ab36e24 kde48.krdc depends on libjpeg
svn path=/nixpkgs/trunk/; revision=31563
2012-01-14 18:04:21 +00:00
Yury G. Kudryashov
cd62169a20 kopete: depend on sqlite, fix FindJasper
svn path=/nixpkgs/trunk/; revision=31562
2012-01-14 18:04:18 +00:00
Yury G. Kudryashov
abcc1e56db Fix gwenview build
svn path=/nixpkgs/trunk/; revision=31561
2012-01-14 18:04:14 +00:00
Yury G. Kudryashov
3d8668b713 Fix ksecrets build
svn path=/nixpkgs/trunk/; revision=31560
2012-01-14 18:04:10 +00:00
Yury G. Kudryashov
84d691d520 kget depends on sqlite
svn path=/nixpkgs/trunk/; revision=31559
2012-01-14 18:04:07 +00:00
Yury G. Kudryashov
50e898b904 kscreensaver depends on libXt and needs pkg-config at build time
svn path=/nixpkgs/trunk/; revision=31558
2012-01-14 18:04:03 +00:00
Yury G. Kudryashov
547827b73b kmousetool depends on libXt
svn path=/nixpkgs/trunk/; revision=31557
2012-01-14 18:04:00 +00:00
Yury G. Kudryashov
269b696112 libkdcraw: depend o libjpeg and lcms1
svn path=/nixpkgs/trunk/; revision=31556
2012-01-14 18:03:56 +00:00
Yury G. Kudryashov
893994372f Depend on libjpeg
svn path=/nixpkgs/trunk/; revision=31555
2012-01-14 18:03:53 +00:00
Yury G. Kudryashov
e36b7005cc Pass sqlite and pkgconfig to kdegames
svn path=/nixpkgs/trunk/; revision=31554
2012-01-14 18:03:48 +00:00
Yury G. Kudryashov
4dfdbed318 Fix kde48.kde_workspace FTBFS
svn path=/nixpkgs/trunk/; revision=31553
2012-01-14 18:03:45 +00:00
Yury G. Kudryashov
bbee586d14 kde48.kalgebra: depend on kde48.analitza
svn path=/nixpkgs/trunk/; revision=31549
2012-01-14 18:03:31 +00:00
Yury G. Kudryashov
4675c738e6 PyKDE4: one part of purity patch fixed upstream
svn path=/nixpkgs/trunk/; revision=31548
2012-01-14 18:03:27 +00:00
Yury G. Kudryashov
dab22380e0 KDE4.8.kdemultimedia: depend on pulseaudio
svn path=/nixpkgs/trunk/; revision=31547
2012-01-14 18:03:24 +00:00
Yury G. Kudryashov
4024d33469 kde48.kdepim: depend on prison
svn path=/nixpkgs/trunk/; revision=31546
2012-01-14 18:03:20 +00:00
Yury G. Kudryashov
5df14ab40f konsole: depend on kde-baseapps for libkonq
svn path=/nixpkgs/trunk/; revision=31545
2012-01-14 18:03:17 +00:00
Yury G. Kudryashov
8133e47172 Fix output hash
svn path=/nixpkgs/trunk/; revision=31544
2012-01-14 18:03:12 +00:00
Yury G. Kudryashov
94af5f0664 kde48.kactivities: depend on SDO
svn path=/nixpkgs/trunk/; revision=31543
2012-01-14 18:03:08 +00:00
Yury G. Kudryashov
8b66ae590f kde48.kdelibs: use kerberos
svn path=/nixpkgs/trunk/; revision=31461
2012-01-09 23:44:48 +00:00
Yury G. Kudryashov
af58b6ec5f Pass libpng12 to qt3 and kdelibs3
svn path=/nixpkgs/branches/libpng15/; revision=31441
2012-01-08 20:51:49 +00:00
Yury G. Kudryashov
7e320a7043 State qt version (3/4) in packages, not in all-packages.nix
svn path=/nixpkgs/trunk/; revision=31406
2012-01-07 17:06:49 +00:00
Yury G. Kudryashov
a3f507892a Add gnome2.libgnome_keyring
svn path=/nixpkgs/trunk/; revision=31404
2012-01-07 15:31:36 +00:00
Yury G. Kudryashov
50dab98373 gnome2.gnome_vfs: disable HAL, enable ACL
svn path=/nixpkgs/trunk/; revision=31403
2012-01-07 15:31:31 +00:00
Yury G. Kudryashov
735de44b72 KDE SC 4.8: latest unstable akonadi
svn path=/nixpkgs/trunk/; revision=31391
2012-01-07 00:10:22 +00:00
Yury G. Kudryashov
1f0c154676 Make test-eval-release happy
svn path=/nixpkgs/trunk/; revision=31389
2012-01-07 00:02:36 +00:00
Yury G. Kudryashov
50de8e181f Fix kde48.kdelibs evaluation error
Will write kactivities.nix when hydra will build kde48.kdelibs

svn path=/nixpkgs/trunk/; revision=31388
2012-01-07 00:02:28 +00:00
Yury G. Kudryashov
d4509553e6 Fix oxygen-icons outputHash
svn path=/nixpkgs/trunk/; revision=31387
2012-01-07 00:02:23 +00:00
Yury G. Kudryashov
cfc9de7311 KDE SC 4.8 RC2
(Semi-)automatic updates

svn path=/nixpkgs/trunk/; revision=31384
2012-01-06 23:03:43 +00:00
Yury G. Kudryashov
b9c72433cc Copy kde-4.7->kde-4.8
svn path=/nixpkgs/trunk/; revision=31380
2012-01-06 21:50:10 +00:00
Yury G. Kudryashov
a6288f1701 gnome3.gnome-user-docs
svn path=/nixpkgs/trunk/; revision=31373
2012-01-06 20:09:54 +00:00
Yury G. Kudryashov
a9dc08d887 Add meta to many GNOME3 packages
svn path=/nixpkgs/trunk/; revision=31367
2012-01-06 18:54:02 +00:00
Yury G. Kudryashov
80480acf78 Remove TODO.txt
svn path=/nixpkgs/trunk/; revision=31366
2012-01-06 18:53:52 +00:00
Yury G. Kudryashov
af347062d0 Add gnome3.clutter
svn path=/nixpkgs/trunk/; revision=31363
2012-01-06 18:13:51 +00:00
Yury G. Kudryashov
24448ed3de gnome3.libsoup
svn path=/nixpkgs/trunk/; revision=31361
2012-01-06 18:13:33 +00:00
Yury G. Kudryashov
f3923f5b4a Remove some 'rec'
svn path=/nixpkgs/trunk/; revision=31360
2012-01-06 18:13:26 +00:00
Yury G. Kudryashov
265b149db1 Add gnome3.libgnome_keyring
svn path=/nixpkgs/trunk/; revision=31359
2012-01-06 18:13:19 +00:00
Yury G. Kudryashov
09060a0a19 Add gnome3.{glib_networking,gsettings_desktop_schemas}
Cherry-pick from stdenv-updates

svn path=/nixpkgs/trunk/; revision=31356
2012-01-06 18:12:38 +00:00
Yury G. Kudryashov
20973a9280 GConf-2.28.1, policykit->polkit
svn path=/nixpkgs/trunk/; revision=31333
2012-01-06 00:55:14 +00:00
Yury G. Kudryashov
6a27a67605 gnome-2/audiofile-0.3.2
svn path=/nixpkgs/trunk/; revision=31331
2012-01-06 00:54:39 +00:00
Lluís Batlle i Rossell
8046598a80 Make gnome panel 2.28 build - it missed libtool as buildInputs.
svn path=/nixpkgs/trunk/; revision=31275
2012-01-04 13:37:54 +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
Yury G. Kudryashov
0971831ddc Reintegrate branches/drop-kde4.5
svn path=/nixpkgs/trunk/; revision=30928
2011-12-16 10:39:22 +00:00
Alexander Tsamutali
4451d32a36 desktops/e17: Updated everything.
svn path=/nixpkgs/trunk/; revision=30820
2011-12-10 18:11:37 +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
b5861542dd gtkLibs3x.atkmm
svn path=/nixpkgs/trunk/; revision=29748
2011-10-10 22:26:41 +00:00
Yury G. Kudryashov
57b11967c8 Remove already packaged packages from gnome-3/TODO.txt
svn path=/nixpkgs/trunk/; revision=29747
2011-10-10 22:10:18 +00:00
Yury G. Kudryashov
c3863358ef libgnomeui-2.24.5; add libtool to deps
svn path=/nixpkgs/trunk/; revision=29746
2011-10-10 21:48:21 +00:00
Yury G. Kudryashov
57d384459e Add gnome3. Do not recurse into attrs
svn path=/nixpkgs/trunk/; revision=29732
2011-10-09 17:23:54 +00:00
Yury G. Kudryashov
da80ec5203 libbonoboui-2.24.4, fix build
svn path=/nixpkgs/trunk/; revision=29731
2011-10-09 17:23:47 +00:00
Yury G. Kudryashov
f865f7c26d libIDL-0.8.14
svn path=/nixpkgs/trunk/; revision=29725
2011-10-09 07:11:38 +00:00
Yury G. Kudryashov
026325e75b Update a few gnome packages
svn path=/nixpkgs/trunk/; revision=29724
2011-10-09 07:11:28 +00:00
Yury G. Kudryashov
bbd24e9c87 Update gnome-common
svn path=/nixpkgs/trunk/; revision=29723
2011-10-08 19:12:24 +00:00
Yury G. Kudryashov
2fdeacfebb libunique-1.1.6
svn path=/nixpkgs/trunk/; revision=29722
2011-10-08 19:05:13 +00:00
Yury G. Kudryashov
e60fe8673b gnome: use callPackage, move to gnome-2
gnome28 was a mix of packages from various releases, so do not mention 2.28 in
the attribute name.

svn path=/nixpkgs/trunk/; revision=29721
2011-10-08 16:58:32 +00:00
Yury G. Kudryashov
a2d0e3b739 libgnome-2.32.1, drop esound dependency
svn path=/nixpkgs/trunk/; revision=29720
2011-10-08 14:08:44 +00:00
Yury G. Kudryashov
0ba5532d4b gnome-vfs-2.24.4
svn path=/nixpkgs/trunk/; revision=29719
2011-10-08 14:08:39 +00:00
Yury G. Kudryashov
c35c6ec9fa Drop 'gnomevfs = gnome_vfs;' alias
s/gnomevfs/gnome_vfs/ in packages

svn path=/nixpkgs/trunk/; revision=29718
2011-10-08 12:06:03 +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
7e3c1b357b Drop kde3.kdebase
Hydra fails to build it for a while, and nobody noticed.

svn path=/nixpkgs/trunk/; revision=29714
2011-10-07 20:46:21 +00:00
Eelco Dolstra
b1b09c1510 * gnome-keyring: drop the (unused) dependency on HAL.
svn path=/nixpkgs/trunk/; revision=29692
2011-10-06 11:56:18 +00:00
Yury G. Kudryashov
371cd8bc51 kde3: use meta.platforms
svn path=/nixpkgs/trunk/; revision=29596
2011-10-02 21:15:36 +00:00
Alexander Tsamutali
3a24231510 pkgs/desktops/e17: Some fixes and now I can start it! \o/
svn path=/nixpkgs/trunk/; revision=29518
2011-09-27 23:49:28 +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
Alexander Tsamutali
e3ccdb4bcd desktops/e17:
Add e17. WIP. Make hangs during build of enlightenment.

svn path=/nixpkgs/trunk/; revision=29506
2011-09-26 22:28:35 +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
Peter Simons
12e7407abe libgnomeprint: updated to version 2.18.8
I made this update hoping that it would fix the build errors with CUPS 1.5.x,
but unfortunately the new version still fails to compile:

  gnome-print-cups-transport.c:59:2: error: expected specifier-qualifier-list before 'FILE'
  gnome-print-cups-transport.c: In function 'gp_transport_cups_init':
  gnome-print-cups-transport.c:128:11: error: 'GPTransportCups' has no member named 'file'
  gnome-print-cups-transport.c: In function 'gp_transport_cups_finalize':
  gnome-print-cups-transport.c:140:15: error: 'GPTransportCups' has no member named 'file'
  gnome-print-cups-transport.c: In function 'gp_transport_cups_open':
  gnome-print-cups-transport.c:194:11: error: 'GPTransportCups' has no member named 'file'
  gnome-print-cups-transport.c:196:15: error: 'GPTransportCups' has no member named 'file'
  gnome-print-cups-transport.c: In function 'gp_transport_cups_close':
  gnome-print-cups-transport.c:238:2: error: 'GPTransportCups' has no member named 'file'
  gnome-print-cups-transport.c:241:23: error: 'GPTransportCups' has no member named 'file'
  gnome-print-cups-transport.c:245:11: error: 'GPTransportCups' has no member named 'file'
  gnome-print-cups-transport.c: In function 'gp_transport_cups_write':
  gnome-print-cups-transport.c:270:2: error: 'GPTransportCups' has no member named 'file'
  gnome-print-cups-transport.c:276:13: warning: incompatible implicit declaration of built-in function 'fwrite'
  gnome-print-cups-transport.c:276:57: error: 'GPTransportCups' has no member named 'file'
  make[4]: *** [gnome-print-cups-transport.lo] Error 1

I commit the update anyway, because (a) I feel that having the latest version
probably can't hurt and (b) the old expression had an incorrect name attribute,
which is now fixed.

svn path=/nixpkgs/trunk/; revision=29281
2011-09-14 17:35:26 +00:00
Peter Simons
2f7372b107 libgnomecups-0.2.3: cosmetic, no functional change
svn path=/nixpkgs/trunk/; revision=29280
2011-09-14 17:35:20 +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
e236848406 Disable networkmanager in kdebase-workspace-4.5.5
NM-0.8 never worked in NixOS, and KDE-4.5 doesn't support newer NM

svn path=/nixpkgs/trunk/; revision=29161
2011-09-10 20:09:11 +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
30bf1fcb29 * Add libgdu as a dependency to gvfs to enable mounting of volumes
(through udisks) in Xfce.  Libgdu is part of gnome-disk-utility,
  which would pull in lots of Gnome dependencies, so some hackery is
  necessary to build only the useful part.

svn path=/nixpkgs/trunk/; revision=29054
2011-09-06 01:00:23 +00:00
Eelco Dolstra
0b7d7153e3 * Urgh. Should test first.
svn path=/nixpkgs/trunk/; revision=29052
2011-09-05 23:31:04 +00:00
Eelco Dolstra
fde6f69688 * Oops.
svn path=/nixpkgs/trunk/; revision=29051
2011-09-05 23:30:42 +00:00
Eelco Dolstra
d80391b7df * Add Xfce 4.8 to the channel.
svn path=/nixpkgs/trunk/; revision=29050
2011-09-05 23:30:26 +00:00
Eelco Dolstra
ad51692715 * Style fixes.
svn path=/nixpkgs/trunk/; revision=29048
2011-09-05 21:02:21 +00:00
Eelco Dolstra
0dfd245a17 * Add thunar-volman and gvfs.
svn path=/nixpkgs/trunk/; revision=29043
2011-09-05 20:36:37 +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
Michael Raskin
6a49d6a920 Re-add GNU TLS 2.12 - it does fix glib-networking
svn path=/nixpkgs/trunk/; revision=28853
2011-08-27 17:04:25 +00:00
Yury G. Kudryashov
3244114412 Remove copies from hydra jobs
Namely, kde45.kde4.kdenetwork == kde45.kdenetwork etc.

svn path=/nixpkgs/trunk/; revision=28843
2011-08-26 20:08:46 +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
f3d7bcc851 * Fix description.
svn path=/nixpkgs/trunk/; revision=28779
2011-08-23 12:10:08 +00:00
Eelco Dolstra
8c37d99fd9 * Forgot to commit.
svn path=/nixpkgs/trunk/; revision=28778
2011-08-23 12:08:21 +00:00
Eelco Dolstra
8a70005921 * Updated xfce4-power-manager.
svn path=/nixpkgs/trunk/; revision=28763
2011-08-22 23:08:42 +00:00
Eelco Dolstra
ffe1af714d * Xfce 4.8.
svn path=/nixpkgs/trunk/; revision=28761
2011-08-22 22:51:23 +00:00
Eelco Dolstra
1475781b19 * Rename xfce-4 to xfce-4.6 in preparation for Xfce 4.8.
svn path=/nixpkgs/trunk/; revision=28757
2011-08-22 17:40:07 +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
Yury G. Kudryashov
365cb2d262 kde-4.7: let nix-env and hydra find all modules
List of changes:
 * All individual packages moved to the top-level kde47 namespace.
 * Utility functions moved back to kde-package/default.nix

nix-env will not find kde-4.7 modules unless you add something like
'kde4 = pkgs.recurseIntoAttrs pkgs.kde47;' to your packageOverrides.

This is done because kde-4.7.0 on NixOS is not ready yet.

svn path=/nixpkgs/trunk/; revision=28693
2011-08-19 15:37:12 +00:00
Yury G. Kudryashov
25461a3939 kde-runtime-4.7: don't use ntrack as it causes kded4 to consume 100% CPU
svn path=/nixpkgs/trunk/; revision=28654
2011-08-18 12:52:35 +00:00
Yury G. Kudryashov
c6458b5269 Do not pass kdebase to kget as buildInput
svn path=/nixpkgs/trunk/; revision=28653
2011-08-18 12:52:29 +00:00
Yury G. Kudryashov
06a34e5825 Use soprano-2.7.0 in kde-4.5.5
svn path=/nixpkgs/trunk/; revision=28601
2011-08-15 20:45:48 +00:00
Yury G. Kudryashov
519f4ea4b8 Add attribute that holds the resulting hierarchy
See comment in the committed code for details

svn path=/nixpkgs/trunk/; revision=28600
2011-08-15 19:28:12 +00:00
Yury G. Kudryashov
8abd44f249 Big kde-4.7.0 update
* Remove a lot of code duplication.
* Package almost all (except for smoke-based bindings).

svn path=/nixpkgs/trunk/; revision=28597
2011-08-15 18:06:26 +00:00
Yury G. Kudryashov
5a70c2dca8 Add samba and ntrack to deps
svn path=/nixpkgs/trunk/; revision=28471
2011-08-10 20:20:00 +00:00
Yury G. Kudryashov
63ea7f8950 Add boost and gpsd to deps
svn path=/nixpkgs/trunk/; revision=28470
2011-08-10 20:19:55 +00:00
Andres Löh
ce5ccbb0ea Updating leksah.
svn path=/nixpkgs/trunk/; revision=28376
2011-08-08 07:41:45 +00:00
Karn Kallio
d0fa51f709 Fi wrapper kde47 runtime.nix
svn path=/nixpkgs/trunk/; revision=28224
2011-08-07 17:50:45 +00:00
Karn Kallio
b2a20db522 Copy kde45 wrap of nepomukservicestub with virtuoso.
svn path=/nixpkgs/trunk/; revision=28223
2011-08-07 17:50:32 +00:00
Karn Kallio
a233ebf891 Switch to forward compatibility of kde45 on kde_baseapps.
svn path=/nixpkgs/trunk/; revision=28217
2011-08-07 01:45:26 +00:00
Karn Kallio
875b65ca0e Backwards compatibility on kdebase breaks detection.
svn path=/nixpkgs/trunk/; revision=28216
2011-08-07 01:27:23 +00:00
Karn Kallio
cc160e2dc6 Extend kde47 backwards compatibility to include kdebase.
svn path=/nixpkgs/trunk/; revision=28215
2011-08-07 01:14:34 +00:00
Karn Kallio
278cc6dc0b First few programs of kde 4.7 kdeedu.
svn path=/nixpkgs/trunk/; revision=28213
2011-08-07 00:38:11 +00:00
Karn Kallio
37c45263c6 Repair kruler build (phonon is required).
svn path=/nixpkgs/trunk/; revision=28212
2011-08-07 00:37:49 +00:00
Karn Kallio
d587e3720b Forgot to move kruler.nix
svn path=/nixpkgs/trunk/; revision=28211
2011-08-07 00:37:32 +00:00
Karn Kallio
7648a6cf65 Set up kdegraphics section in kde 4.7
svn path=/nixpkgs/trunk/; revision=28210
2011-08-07 00:37:14 +00:00
Eelco Dolstra
99ff06be3e * KDE 4.5 needs an older version of shared-desktop-ontologies.
svn path=/nixpkgs/branches/kde-4.7/; revision=28103
2011-08-01 09:08:57 +00:00
Eelco Dolstra
08b9b370a4 * KDE 4.5: use an old ffmpeg.
svn path=/nixpkgs/branches/kde-4.7/; revision=28102
2011-08-01 08:32:20 +00:00
Eelco Dolstra
483bedccda * Disable kdebindings in the old KDE 4.5. It doesn't build anymore
due to changes in Phonon and other packages.  It's not really
  important anyway.

svn path=/nixpkgs/branches/kde-4.7/; revision=28022
2011-07-31 19:12:10 +00:00
Eelco Dolstra
35437ef75b * Updated kdepim-runtime and kdepim.
svn path=/nixpkgs/branches/kde-4.7/; revision=28008
2011-07-29 19:05:52 +00:00
Eelco Dolstra
980b453102 * Fix localisation.
svn path=/nixpkgs/branches/kde-4.7/; revision=28007
2011-07-29 17:48:39 +00:00
Eelco Dolstra
76fffef175 * More stuff.
svn path=/nixpkgs/branches/kde-4.7/; revision=28006
2011-07-29 17:24:59 +00:00
Eelco Dolstra
aee4ccdee0 * Updated kdeartwork.
svn path=/nixpkgs/branches/kde-4.7/; revision=28005
2011-07-29 16:09:55 +00:00
Eelco Dolstra
d3df8a3085 * Updated kdeaccessibility.
svn path=/nixpkgs/branches/kde-4.7/; revision=28001
2011-07-29 14:30:07 +00:00
Eelco Dolstra
2d4c4ae1bd * Updated kdewebdev.
svn path=/nixpkgs/branches/kde-4.7/; revision=28000
2011-07-29 14:16:12 +00:00
Eelco Dolstra
9650b1283e * Updated kdesdk.
svn path=/nixpkgs/branches/kde-4.7/; revision=27999
2011-07-29 13:50:53 +00:00
Eelco Dolstra
e7b76a6db3 * Updated kdetoys.
svn path=/nixpkgs/branches/kde-4.7/; revision=27998
2011-07-29 12:41:31 +00:00
Eelco Dolstra
dd8cc506b5 * Update kdeutils.
svn path=/nixpkgs/branches/kde-4.7/; revision=27997
2011-07-29 12:31:07 +00:00
Eelco Dolstra
7d06b01a34 * Fix KDE's fixed-output derivations.
svn path=/nixpkgs/branches/kde-4.7/; revision=27995
2011-07-29 08:43:43 +00:00
Eelco Dolstra
6f8c9ddc39 * KDE 4.7.0.
svn path=/nixpkgs/branches/kde-4.7/; revision=27989
2011-07-28 12:52:15 +00:00
Eelco Dolstra
bf229fc985 * Move Phonon out of KDE.
svn path=/nixpkgs/branches/kde-4.7/; revision=27988
2011-07-28 12:20:12 +00:00
Eelco Dolstra
6c4f6ceb4f * Remove the KDE 4.6 RC expressions.
svn path=/nixpkgs/branches/kde-4.7/; revision=27984
2011-07-28 11:18:57 +00:00
Eelco Dolstra
9725e1376f * Updated kdemultimedia.
svn path=/nixpkgs/branches/kde-4.7/; revision=27953
2011-07-25 20:17:36 +00:00
Eelco Dolstra
012e221de9 * kde-workspace requires PAM.
svn path=/nixpkgs/branches/kde-4.7/; revision=27907
2011-07-22 23:59:59 +00:00
Eelco Dolstra
a5a9f1fb2e * Fix kpythonpluginfactory.
svn path=/nixpkgs/branches/kde-4.7/; revision=27899
2011-07-22 01:54:04 +00:00
Eelco Dolstra
9379248ef3 * Update kdeadmin and kdegames.
svn path=/nixpkgs/branches/kde-4.7/; revision=27898
2011-07-22 01:28:09 +00:00
Eelco Dolstra
5a03576cb4 * Update kdegames.
svn path=/nixpkgs/branches/kde-4.7/; revision=27894
2011-07-21 21:54:40 +00:00
Eelco Dolstra
aa6f8184b5 * Update kdepimlibs.
* Remove unnecessary NIX_LDFLAGS hacks.

svn path=/nixpkgs/branches/kde-4.7/; revision=27887
2011-07-21 19:16:21 +00:00
Eelco Dolstra
439714b3fa * Allow KDE to find the xkeyboard-config files.
svn path=/nixpkgs/branches/kde-4.7/; revision=27871
2011-07-21 12:33:44 +00:00
Eelco Dolstra
ef041b7aa3 * Hack to fix evaluation.
svn path=/nixpkgs/branches/kde-4.7/; revision=27869
2011-07-21 11:56:11 +00:00
Eelco Dolstra
b32ea60b4e * Remove some obsolete expressions.
svn path=/nixpkgs/branches/kde-4.7/; revision=27868
2011-07-21 11:53:49 +00:00
Eelco Dolstra
7ae6dbd7d6 * Add the GStreamer backend for Phonon.
svn path=/nixpkgs/branches/kde-4.7/; revision=27819
2011-07-18 12:37:50 +00:00
Eelco Dolstra
3c668adea1 * Pass Phonon as a dependency where needed.
svn path=/nixpkgs/branches/kde-4.7/; revision=27815
2011-07-18 10:29:20 +00:00
Eelco Dolstra
9e92839468 * Fix incorrect path to kde4-config in startkde.
svn path=/nixpkgs/branches/kde-4.7/; revision=27812
2011-07-17 15:55:33 +00:00
Eelco Dolstra
f3d8b47f22 * Add kde-wallpapers, which contains the default KDE and KDM
wallpaper.

svn path=/nixpkgs/branches/kde-4.7/; revision=27811
2011-07-17 14:24:43 +00:00
Eelco Dolstra
e482393ad1 * Add kde-runtime. It requires a newer Phonon than provided by Qt, so
add that as well.  Maybe we should build Qt without Phonon to remove
  potential interference...

svn path=/nixpkgs/branches/kde-4.7/; revision=27810
2011-07-17 14:10:41 +00:00
Eelco Dolstra
bc16ee83ae * The NixOS kdm.nix module expects a kdebase_workspace attribute.
svn path=/nixpkgs/branches/kde-4.7/; revision=27794
2011-07-15 09:50:37 +00:00
Eelco Dolstra
298c78ef40 * Build kdm.
svn path=/nixpkgs/branches/kde-4.7/; revision=27772
2011-07-14 08:42:01 +00:00