1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 06:31:02 +00:00
Commit graph

802 commits

Author SHA1 Message Date
Peter Simons f7896f322e libgnomeprint: fix gcc 4.6 compilation error
svn path=/nixpkgs/trunk/; revision=32832
2012-03-06 20:04:58 +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 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