1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 00:22:13 +00:00
Commit graph

547 commits

Author SHA1 Message Date
Eelco Dolstra aa6f43149a * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25308
2010-12-28 16:42:00 +00:00
Yury G. Kudryashov 1d24f31783 Really exclude kde-4.6 from hydra builds
svn path=/nixpkgs/trunk/; revision=25290
2010-12-26 17:18:19 +00:00
Yury G. Kudryashov e9e22a7238 Rename hupnp to herqq
Don't pass it to kdelibs as it breaks kdelibs build

svn path=/nixpkgs/trunk/; revision=25289
2010-12-26 17:18:13 +00:00
Yury G. Kudryashov ac2b5582e2 kde-l10n-4.5.90
svn path=/nixpkgs/trunk/; revision=25288
2010-12-26 15:27:39 +00:00
Yury G. Kudryashov 14e49759aa kdelibs-4.5.90
svn path=/nixpkgs/trunk/; revision=25287
2010-12-26 15:27:33 +00:00
Yury G. Kudryashov 4f140371a5 akonadi-1.4.90
svn path=/nixpkgs/trunk/; revision=25285
2010-12-26 15:27:20 +00:00
Yury G. Kudryashov b0cbe093ba attica-0.2.0
svn path=/nixpkgs/trunk/; revision=25284
2010-12-26 15:27:15 +00:00
Yury G. Kudryashov 3d73157901 polkit-qt-1-0.99.0
svn path=/nixpkgs/trunk/; revision=25283
2010-12-26 15:27:09 +00:00
Yury G. Kudryashov e27e6a97e5 oxygen-icons-4.5.90
svn path=/nixpkgs/trunk/; revision=25282
2010-12-26 15:27:01 +00:00
Yury G. Kudryashov ea3d59b437 soprano-2.5.63
svn path=/nixpkgs/trunk/; revision=25281
2010-12-26 15:26:52 +00:00
Yury G. Kudryashov a7ddd93631 sed 4.5.4->4.5.90, nothing tested
svn path=/nixpkgs/trunk/; revision=25280
2010-12-26 15:26:42 +00:00
Yury G. Kudryashov 58ca4111ad Start kde-4.6: copy 4.5, remove from release
svn path=/nixpkgs/trunk/; revision=25279
2010-12-26 15:26:01 +00:00
Lluís Batlle i Rossell b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
2010-12-17 20:39:58 +00:00
Yury G. Kudryashov c898090c15 Switch to kde-l10n-4.5.4 by default
svn path=/nixpkgs/trunk/; revision=25115
2010-12-14 10:21:29 +00:00
Yury G. Kudryashov dcdfdf3f59 Fix oxygen-icons output hash
svn path=/nixpkgs/trunk/; revision=25114
2010-12-14 10:21:24 +00:00
Yury G. Kudryashov f960334d72 kde-4.5.4, kdepim-4.4.8: evaluates
svn path=/nixpkgs/trunk/; revision=25113
2010-12-14 10:21:17 +00:00
Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
2010-12-11 12:47:00 +00:00
Yury G. Kudryashov f3d4030979 Remove unused items from manifest.nix
svn path=/nixpkgs/trunk/; revision=24995
2010-12-06 12:04:31 +00:00
Yury G. Kudryashov dc44c0eeeb kde-l10n-4.5.3
svn path=/nixpkgs/trunk/; revision=24994
2010-12-06 12:04:27 +00:00
Yury G. Kudryashov 9d8000c968 Fix l10n manifest generation script
svn path=/nixpkgs/trunk/; revision=24993
2010-12-06 12:04:21 +00:00
Yury G. Kudryashov 1f558f78df There will be no kdepim-4.5.x
svn path=/nixpkgs/trunk/; revision=24992
2010-12-06 12:04:16 +00:00
Lluís Batlle i Rossell 0e4c970d11 Updating from trunk - I hope I fixed the conflict around gettext - I left it as
it was before merging.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24876
2010-11-26 14:40:39 +00:00
Yury G. Kudryashov 0dcd86ef0f Make kdebindings compile with newer sip
svn path=/nixpkgs/trunk/; revision=24838
2010-11-24 10:49:34 +00:00
Lluís Batlle i Rossell 8746de3ae8 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24674
2010-11-11 22:18:14 +00:00
Piotr Pietraszkiewicz 7ce8c4b77e fixed compilation error, debian bug #577368 (implicit decl. of function 'GTK_WIDGET_SENSITIVE'), by bumping gtkhtml to version 3.29.92.1
svn path=/nixpkgs/trunk/; revision=24581
2010-11-02 20:09:15 +00:00
Lluís Batlle i Rossell f4f84af4ab Updating from trunk. I only had to take away the usual stdenv2 in
all-packages.nix


svn path=/nixpkgs/branches/stdenv-updates/; revision=24553
2010-10-31 19:30:31 +00:00
Evgeny Egorochkin 84f61bc6d5 Strigi: bump to 0.7.2
svn path=/nixpkgs/trunk/; revision=24461
2010-10-25 05:20:44 +00:00
Yury G. Kudryashov ac0dea26fb Fix typo
svn path=/nixpkgs/trunk/; revision=24439
2010-10-23 20:50:06 +00:00
Yury G. Kudryashov 6863d3f740 kdepim-4.4.7
svn path=/nixpkgs/trunk/; revision=24436
2010-10-23 18:48:49 +00:00
Yury G. Kudryashov 25869d5553 Fix kdepim-4.5 compilation
svn path=/nixpkgs/trunk/; revision=24435
2010-10-23 18:48:42 +00:00
Lluís Batlle i Rossell 6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Yury G. Kudryashov 0a21ec52e5 Sanitize names, so kde4.l10n.ca_valencia works
svn path=/nixpkgs/trunk/; revision=24395
2010-10-21 06:56:28 +00:00
Yury G. Kudryashov edc04aeef5 kde-l10n-4.5.2; refactor kde-l10n
svn path=/nixpkgs/trunk/; revision=24393
2010-10-20 22:42:48 +00:00
Yury G. Kudryashov 6731bd48ee Restore an accidentially removed patch
svn path=/nixpkgs/trunk/; revision=24392
2010-10-20 21:19:30 +00:00
Yury G. Kudryashov 340b02c7c9 kde-4.5.2
svn path=/nixpkgs/trunk/; revision=24332
2010-10-17 18:44:39 +00:00
Yury G. Kudryashov 586de5566a oxygen-icons-4.5.2
svn path=/nixpkgs/trunk/; revision=24330
2010-10-17 18:43:50 +00:00
Yury G. Kudryashov 88ad6e74c8 cleanup
svn path=/nixpkgs/trunk/; revision=24328
2010-10-17 18:43:38 +00:00
Yury G. Kudryashov 7e03aecb57 Add kde-4.5.2 to manifest
svn path=/nixpkgs/trunk/; revision=24327
2010-10-17 18:43:31 +00:00
Yury G. Kudryashov ca15959e2e Remove phonon from kde-4.5: we use one from qt
svn path=/nixpkgs/trunk/; revision=24326
2010-10-17 18:43:24 +00:00
Eelco Dolstra 1758b488e6 * Some hackery to make the split KDE packages available both
individually and combined.  For instance, you can say

    environment.systemPackages = [ pkgs.kde4.kdesdk.kcachegrind ];

  for just kcachegrind, or 

    environment.systemPackages = [ pkgs.kde4.kdesdk ];

  to get all of kdesdk.  Everything can also be installed by name
  through nix-env.  (There is a name clash between the ColorSchemes
  packages in kdeaccessibility and kdeartwork, though.)

svn path=/nixpkgs/trunk/; revision=24294
2010-10-14 16:49:41 +00:00
Eelco Dolstra 0fcf6e1f40 * Added xfce4-mixer. This requires gstreamer and gst-plugins-base.
* Allow gst-plugins-base to be built with a minimal set of dependencies
  (to prevent dependency bloat in Xfce).
* Updated gstreamer.

svn path=/nixpkgs/trunk/; revision=24207
2010-10-10 22:34:48 +00:00
Lluís Batlle i Rossell e7e103b8eb Updating from trunk (to catch cron changes)
svn path=/nixpkgs/branches/stdenv-updates/; revision=24200
2010-10-10 11:44:28 +00:00
Yury G. Kudryashov 29ddcdb5ad kdepim move
svn path=/nixpkgs/trunk/; revision=24191
2010-10-10 05:03:07 +00:00
Lluís Batlle i Rossell fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
2010-10-07 21:21:31 +00:00
Yury G. Kudryashov 673e66e3a3 Move most kde-extragear apps to top-level
svn path=/nixpkgs/trunk/; revision=24092
2010-10-05 17:44:33 +00:00
Yury G. Kudryashov d7d8f7d64f Force stdenv2 in kde4 scope
svn path=/nixpkgs/trunk/; revision=24090
2010-10-05 17:44:11 +00:00
Yury G. Kudryashov 739f82a526 Digikam-1.4.0, move to all-packages.nix
svn path=/nixpkgs/trunk/; revision=24089
2010-10-05 17:44:05 +00:00
Yury G. Kudryashov bf340ad55a Move kipi-plugins to apps/graphics
svn path=/nixpkgs/trunk/; revision=24088
2010-10-05 17:43:57 +00:00
Yury G. Kudryashov 67b5d732a2 Move kdevplatform and kdevelop to all-packages.nix
svn path=/nixpkgs/trunk/; revision=24063
2010-10-05 05:43:39 +00:00
Yury G. Kudryashov 6aaf62e8d7 Remove kde-l10n-ca@valencia to make hydra happy
svn path=/nixpkgs/trunk/; revision=24048
2010-10-04 11:32:56 +00:00