1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 15:11:35 +00:00
Commit graph

682 commits

Author SHA1 Message Date
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