Commit Graph

818 Commits

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