mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 23:20:55 +00:00
Code Issues Wiki Activity
19536 commits 224 branches 124 tags 7.2 GiB
Commit graph

3642 commits

Author SHA1 Message Date
Lluís Batlle i Rossell 8849219c81 Trying to update libreoffice to the version today released. Cross fingers; we can revert this, if it does not work. 
svn path=/nixpkgs/trunk/; revision=33117
 2012-03-15 19:50:23 +00:00
Peter Simons 6ff954a5e8 git-annex: updated to version 3.20120315 
svn path=/nixpkgs/trunk/; revision=33116
 2012-03-15 18:07:49 +00:00
Lluís Batlle i Rossell 6fe531299e Avoiding the wrapper in libreoffice, and trying to use '-lcups'. 
svn path=/nixpkgs/trunk/; revision=33113
 2012-03-15 16:45:04 +00:00
Lluís Batlle i Rossell 3337fa7b87 Adding the cups lib path to ld_libraray_path for libreoffice to be able to 
print with cups.

That would have been also the fix for go-oo for this problem, I think.


svn path=/nixpkgs/trunk/; revision=33112
 2012-03-15 16:38:24 +00:00
Lluís Batlle i Rossell 1ebf45400a Making more symlinks in libreoffice. 
svn path=/nixpkgs/trunk/; revision=33105
 2012-03-15 11:29:13 +00:00
Lluís Batlle i Rossell 5c0c0ff632 Adding a '$out/bin/soffice' link to the libreoffice soffice binary. 
svn path=/nixpkgs/trunk/; revision=33104
 2012-03-15 11:02:52 +00:00
Yury G. Kudryashov bd17f891dd +1 patch (from Gentoo) 
svn path=/nixpkgs/trunk/; revision=33094
 2012-03-14 23:34:30 +00:00
Yury G. Kudryashov fe1115caf4 Make nixpkgs ready for gst_all attrset removal 
svn path=/nixpkgs/trunk/; revision=33092
 2012-03-14 22:44:52 +00:00
Yury G. Kudryashov 03875e0bce Make nixpkgs ready to gtkLibs attrset removal 
svn path=/nixpkgs/trunk/; revision=33091
 2012-03-14 22:44:41 +00:00
Shea Levy 6c99fad938 OMVF: Only need some of the sources, and symlinks instead of copies are fine 
svn path=/nixpkgs/trunk/; revision=33090
 2012-03-14 22:43:07 +00:00
Yury G. Kudryashov 003b24ac45 Trying to fix k3d build 
svn path=/nixpkgs/trunk/; revision=33089
 2012-03-14 21:57:43 +00:00
Yury G. Kudryashov 68fe867e19 Get rid of most references to gtkLibs 
svn path=/nixpkgs/trunk/; revision=33088
 2012-03-14 21:57:32 +00:00
Lluís Batlle i Rossell fd1867ec92 The libreoffice expression needs the 'help' package, or it fails on install. 
(or pass --disable-help, I think).

Thus, the fontconfig tests now pass, I remove the disabletests patch.

I also removed some configure options that configure did not understand
anymore. They were picked from older openoffice expressions.


svn path=/nixpkgs/trunk/; revision=33087
 2012-03-14 21:51:33 +00:00
Lluís Batlle i Rossell bed87f75ca Updating paraview. 
svn path=/nixpkgs/trunk/; revision=33086
 2012-03-14 21:50:17 +00:00
Lluís Batlle i Rossell ae7b8e3907 Updating truecrypt, as the old url didn not work already. 
Notified by kirelagin@freenode


svn path=/nixpkgs/trunk/; revision=33085
 2012-03-14 21:28:42 +00:00
Yury G. Kudryashov a05e5e7add mysql-workbench needs gnome-keyring as well 
svn path=/nixpkgs/trunk/; revision=33083
 2012-03-14 19:39:04 +00:00
Yury G. Kudryashov f105c2353b Pass libgnome_keyring, not gnome_keyring 
svn path=/nixpkgs/trunk/; revision=33082
 2012-03-14 19:35:55 +00:00
Yury G. Kudryashov 044361ec18 Pass qt_gstreamer to ktp-call-ui 
svn path=/nixpkgs/trunk/; revision=33080
 2012-03-14 19:35:46 +00:00
Yury G. Kudryashov 7a31872261 Add kde4.telepathy.call_ui 
Very experimental, fails to build (missing deps)

svn path=/nixpkgs/trunk/; revision=33077
 2012-03-14 19:35:30 +00:00
Lluís Batlle i Rossell a288984843 Fixing another script shebang in libreoffice. And the lang configure parameter. 
svn path=/nixpkgs/trunk/; revision=33074
 2012-03-14 18:51:59 +00:00
Lluís Batlle i Rossell 73f9e302a0 I think libreoffice does not want the 'en-US' language anymore. 
svn path=/nixpkgs/trunk/; revision=33071
 2012-03-14 17:49:23 +00:00
Yury G. Kudryashov 0a7c3ff061 Add telepathy-mission-control 
svn path=/nixpkgs/trunk/; revision=33066
 2012-03-14 16:28:11 +00:00
Yury G. Kudryashov 4874ff1144 Move some IM clients to instant-messengers/ 
svn path=/nixpkgs/trunk/; revision=33065
 2012-03-14 15:41:44 +00:00
Yury G. Kudryashov dc2d99ec96 Move telepathy-gabble to applications 
svn path=/nixpkgs/trunk/; revision=33064
 2012-03-14 15:41:37 +00:00
Yury G. Kudryashov cddd413130 Add KDE-Telepathy 
It compiles but I haven't tried to run it.

svn path=/nixpkgs/trunk/; revision=33063
 2012-03-14 09:52:21 +00:00
Lluís Batlle i Rossell 3418970f3b Making libreoffice have a configured fontconfig. I hope this will make some cppunit tests work, and thus we would not need to disable them. 
I update the patch that disables tests with one more test disabled, but I don't
use it because I hope the build with fonts.conf will work fine. If that is the case,
I'll remove the patch file later. If the fonts.conf trick does not work, I may want
to extend the patch to disable all failing cases.


svn path=/nixpkgs/trunk/; revision=33062
 2012-03-14 09:40:26 +00:00
Shea Levy 80f47974b7 OVMF: Actually support i686 
svn path=/nixpkgs/trunk/; revision=33060
 2012-03-14 07:29:11 +00:00
Shea Levy 6cf8e4f815 EDK2: Significant cleanup and 
modularization, and add OVMF as an example of how to use it

svn path=/nixpkgs/trunk/; revision=33059
 2012-03-14 06:57:58 +00:00
Lluís Batlle i Rossell 63b934c36f Next attempt at building libreoffice. I reached it to build it in the build environment, 
but I don't know if make install will succeed.

I also added the translations, that could work with luck.

I removed the force field.


svn path=/nixpkgs/trunk/; revision=33048
 2012-03-13 21:23:25 +00:00
Eelco Dolstra c6ac45f832 * Tribler updated to 5.5.21. 
svn path=/nixpkgs/trunk/; revision=33036
 2012-03-13 17:35:11 +00:00
Lluís Batlle i Rossell 1b7e6447f9 Fix for an early build failure of libreoffice. Enabling it for hydra to see if it builds further. 
svn path=/nixpkgs/trunk/; revision=33026
 2012-03-12 21:38:00 +00:00
Lluís Batlle i Rossell 6b88ad4b16 I try to package libreoffice 3.5, as there was a weird segfault in 3.4, and they 
changed the build system in 3.5. It still does not build either... hopefully
by more reachable troubles.

svn path=/nixpkgs/trunk/; revision=33022
 2012-03-12 20:15:08 +00:00
Peter Simons c86a90c4e9 Updating Haskell packages. 
- Agda-executable: updated to version 2.3.0.1
 - Agda: updated to version 2.3.0.1
 - gio: added version 0.12.3
 - hamlet: updated to version 0.10.9.1
 - leksah-server: updated to version 0.12.0.4
 - leksah: updated to version 0.12.0.3
 - ltk: updated to version 0.12.0.0
 - packages.nix: cosmetic change
 - pandoc: updated to version 1.9.1.2
 - polyparse: added version 1.8
 - shakespeare-css: updated to version 0.10.8
 - shakespeare-i18n: updated to version 0.0.2.1
 - shakespeare-js: updated to version 0.11.2
 - shakespeare-text: updated to version 0.11
 - shakespeare: updated to version 0.11
 - tls: updated to version 0.9.1
 - unordered-containers: updated to version 0.2.0.1
 - uuagc: updated to version 0.9.40.3
 - yesod-core: updated to version 0.10.2.2
 - yesod-form: updated to version 0.4.2.1
 - yesod: updated to version 0.10.1.4

svn path=/nixpkgs/trunk/; revision=33015
 2012-03-12 14:06:18 +00:00
Peter Simons f5219b23a4 git-annex: updated to version 3.20120309 
The test suite failure introduced recently has been fixed.

svn path=/nixpkgs/trunk/; revision=33014
 2012-03-12 14:06:11 +00:00
Eelco Dolstra 613dd942c7 * Subversion updated to 1.7.4. 
svn path=/nixpkgs/trunk/; revision=33013
 2012-03-12 13:40:40 +00:00
Florian Friesdorf 7b47dea7b0 emacs-24.0.94 (pretest) 
svn path=/nixpkgs/trunk/; revision=32997
 2012-03-11 20:45:49 +00:00
Yury G. Kudryashov a38ba26fbe cinelerra: drop esound support 
I'm going to remove esound from nixpkgs in a few minutes.

svn path=/nixpkgs/trunk/; revision=32981
 2012-03-11 14:07:19 +00:00
Lluís Batlle i Rossell 9d2d98aab2 Libreoffice is still broken. Setting back the 'force' wall. 
svn path=/nixpkgs/trunk/; revision=32979
 2012-03-11 10:36:50 +00:00
Lluís Batlle i Rossell 251b9b6472 I made libreoffice build further... Let's see if further enough. I make hydra build it regardless of 'force'. Tomorrow we'll see the result. 
svn path=/nixpkgs/trunk/; revision=32977
 2012-03-10 21:18:07 +00:00
Eelco Dolstra 42617f5f83 * It's that time of year again. 
svn path=/nixpkgs/trunk/; revision=32976
 2012-03-10 19:23:04 +00:00
Yury G. Kudryashov eb81f33244 Remove zapping, zvbi and rte 
Feel free to revert&fix compile if you need these packages.

svn path=/nixpkgs/trunk/; revision=32966
 2012-03-09 20:16:02 +00:00
Joachim Schiele 92c04c80c7 tvtime is now on nixos, thanks to the patches taken from the portage team! 
svn path=/nixpkgs/trunk/; revision=32962
 2012-03-09 18:21:10 +00:00
Michael Raskin 7c0d7abdd7 Adding GAP discrete algebra system 
svn path=/nixpkgs/trunk/; revision=32908
 2012-03-08 18:23:47 +00:00
Lluís Batlle i Rossell 214c1357f9 Updating feh to 2.4 
svn path=/nixpkgs/trunk/; revision=32893
 2012-03-08 13:45:58 +00:00
Lluís Batlle i Rossell b73a6999d0 Adding a patch for go-oo, so it does not dislike gcc 4.6. 
svn path=/nixpkgs/trunk/; revision=32892
 2012-03-08 13:35:42 +00:00
Joachim Schiele 88b69df2dc Added two missing dependencies (to make the packages build) 
svn path=/nixpkgs/trunk/; revision=32890
 2012-03-08 13:31:16 +00:00
Lluís Batlle i Rossell bb724044b6 Updating giv. 
svn path=/nixpkgs/trunk/; revision=32881
 2012-03-08 10:08:56 +00:00
Lluís Batlle i Rossell dc0fd8219c I take back r32860; I'll try to fix libwpd_08 
svn path=/nixpkgs/trunk/; revision=32870
 2012-03-07 22:34:54 +00:00
Yury G. Kudryashov 11f64b0449 rekonq-0.9.0-1 needs pkg-config 
svn path=/nixpkgs/trunk/; revision=32865
 2012-03-07 22:06:29 +00:00
Lluís Batlle i Rossell c62d643520 Let's see if go_oo will build without system libwpd. The libwpd required by oo.org fails to build. 
svn path=/nixpkgs/trunk/; revision=32860
 2012-03-07 21:48:26 +00:00
Lluís Batlle i Rossell 749df87304 Removing a patch not needed anymore, for vlc. 
svn path=/nixpkgs/trunk/; revision=32856
 2012-03-07 20:36:42 +00:00
Yury G. Kudryashov ce5a0fdf68 rekonq-0.9.0-1 
svn path=/nixpkgs/trunk/; revision=32825
 2012-03-06 13:08:46 +00:00
Eelco Dolstra 3c56e571af * Final sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32820
 2012-03-06 11:34:11 +00:00
Peter Simons 88d14c0e29 git-annex: updated to version 3.20120230 
Note that the latest version of git-annex must be compiled with GHC 7.4.1 or
later, because it takes advantage of some freaky file name encoding guessing
features that are absent in older versions of the base library.

svn path=/nixpkgs/trunk/; revision=32819
 2012-03-06 11:24:20 +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
Eelco Dolstra c1b59aa71d * Firefox 10.0.2. 
svn path=/nixpkgs/trunk/; revision=32776
 2012-03-04 16:34:01 +00:00
Yury G. Kudryashov d4ffc7332c Merge trunk right before reintegrating 
svn path=/nixpkgs/branches/libpng15/; revision=32758
 2012-03-04 09:09:21 +00:00
Yury G. Kudryashov d982e10f34 fbida-2.09 (builds with libpng-1.5) 
Cherry-pick r32756 from trunk

svn path=/nixpkgs/branches/libpng15/; revision=32757
 2012-03-04 08:56:42 +00:00
Yury G. Kudryashov b0d12859fc fbida-2.09 (builds with libpng-1.5) 
svn path=/nixpkgs/trunk/; revision=32756
 2012-03-04 08:53:46 +00:00
Eelco Dolstra 000051b196 * VirtualBox: drop the unnecessary dependency on HAL. 
svn path=/nixpkgs/trunk/; revision=32745
 2012-03-02 14:54:14 +00:00
Yury G. Kudryashov 84fb9ca331 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32719
 2012-03-01 15:05:27 +00:00
Yury G. Kudryashov 0210e20b5a svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
 2012-03-01 07:04:39 +00:00
Arie Middelkoop 45120513fb Cosmetic changes to newsreaders/kwooty and dropbox expressions. 
svn path=/nixpkgs/trunk/; revision=32689
 2012-02-29 12:54:35 +00:00
Arie Middelkoop 6e8c9ea906 ocaml-mode for emacs. 
There seem to exist multiple (very old) versions.
I'm taking the one shipped with the ocaml compiler, which is hopefully the "most appropriate".

svn path=/nixpkgs/trunk/; revision=32688
 2012-02-29 12:53:13 +00:00
Peter Simons 617614d220 haskell-mathblog: updated to version 0.5 
svn path=/nixpkgs/trunk/; revision=32615
 2012-02-27 10:11:56 +00:00
Michael Raskin e6fa414b64 Update and fix Tulip 
svn path=/nixpkgs/trunk/; revision=32613
 2012-02-27 07:10:05 +00:00
Michael Raskin 3a4916369e Fix LyX dependencies 
svn path=/nixpkgs/trunk/; revision=32612
 2012-02-27 07:00:01 +00:00
Peter Simons ae5fefca48 audacious: updated to version 3.2.1 
svn path=/nixpkgs/trunk/; revision=32609
 2012-02-26 22:47:28 +00:00
Lluís Batlle i Rossell b7f1724543 Gtkwave needs the xz libraries to build. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32601
 2012-02-26 21:02:03 +00:00
Lluís Batlle i Rossell a9b800c8af Updating blender to 2.67. Maybe this will build in stdenv-updates too. 
I remove the blender 2.49; I think I don't need it anymore.


svn path=/nixpkgs/trunk/; revision=32599
 2012-02-26 20:47:12 +00:00
Lluís Batlle i Rossell e1c8ab095c Removing a duplicated line so the hydra stdenv evaluation can go. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32576
 2012-02-26 16:04:57 +00:00
Shea Levy ea195b2507 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
 2012-02-25 19:57:34 +00:00
Arie Middelkoop 72450d9b73 Added dropbox (binary). 
svn path=/nixpkgs/trunk/; revision=32545
 2012-02-24 17:53:19 +00:00
Arie Middelkoop 2c7845859f Added the irc proxy "bip". 
svn path=/nixpkgs/trunk/; revision=32529
 2012-02-23 23:47:26 +00:00
Peter Simons 0660134750 git: updated to version 1.7.9.2 
svn path=/nixpkgs/trunk/; revision=32528
 2012-02-23 22:31:09 +00:00
Eelco Dolstra 5f20423948 * Fix the VirtualBox build. It was broken since the Qt 4.8 update 
because Qt 4.8 doesn't propagate dependencies such as "which" and
  "pkgconfig".  Thanks to Yury for pointing this out.
* Also updated VirtualBox to 4.1.8.

svn path=/nixpkgs/trunk/; revision=32527
 2012-02-23 22:04:54 +00:00
Eelco Dolstra 722db331a3 * Updated novaclient. 
svn path=/nixpkgs/trunk/; revision=32526
 2012-02-23 21:25:59 +00:00
Yury G. Kudryashov b3ef710273 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32524
 2012-02-23 21:25:15 +00:00
Yury G. Kudryashov 04d2aa443e graphicsmagick-1.3.13 builds with libpng-1.5 
svn path=/nixpkgs/trunk/; revision=32523
 2012-02-23 21:14:19 +00:00
Yury G. Kudryashov 3652c61aed svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32522
 2012-02-23 20:35:33 +00:00
Yury G. Kudryashov 38e3d7bc86 svn merge ^/nixpkgs/trunk 
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
 2012-02-23 20:06:21 +00:00
Peter Simons 31e7a2ce7a gecko-mediaplayer: updated to version 1.0.5 
I hoped this update would fix the build errors, but in fact it didn't. :-(

svn path=/nixpkgs/trunk/; revision=32518
 2012-02-23 18:32:42 +00:00
Peter Simons 7c2ca58329 xchat: fixed trivial syntax error 
svn path=/nixpkgs/trunk/; revision=32516
 2012-02-23 17:56:52 +00:00
Lluís Batlle i Rossell 211be0db63 Tell hydra to build xchat 
svn path=/nixpkgs/trunk/; revision=32515
 2012-02-23 16:20:09 +00:00
Peter Simons 23f9485c94 haskell-mathblog: added version 0.4 
svn path=/nixpkgs/trunk/; revision=32511
 2012-02-23 11:33:39 +00:00
Peter Simons e91b090577 upgraded vlc to 2.0 - with bluray support 
svn path=/nixpkgs/trunk/; revision=32487
 2012-02-22 20:29:33 +00:00
Yury G. Kudryashov c6f0449124 Let hydra build kdesvn and krusader. 
Also fix kdesvn build with qt-4.8.

svn path=/nixpkgs/trunk/; revision=32473
 2012-02-22 14:51:15 +00:00
Lluís Batlle i Rossell 2ce218c434 Updating Wings3D to 1.4.1 
svn path=/nixpkgs/trunk/; revision=32470
 2012-02-22 11:25:17 +00:00
Eelco Dolstra f71dd91a43 * Apply r32435 from the trunk (always build Python with SSL support). 
Remove .ssl references from some packages missed in that commit.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32469
 2012-02-21 23:35:35 +00:00
Eelco Dolstra e64443baf1 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32468
 2012-02-21 23:29:21 +00:00
Lluís Batlle i Rossell fb12a6838f I remove clapack, and an unused reference I found. 
Now liblapack provides a c interface too.


svn path=/nixpkgs/trunk/; revision=32466
 2012-02-21 22:16:33 +00:00
Ludovic Courtès a283887388 Xfig: Fix URL; add `meta.platforms'. 
svn path=/nixpkgs/trunk/; revision=32457
 2012-02-21 14:45:53 +00:00
Yury G. Kudryashov 578847f8b3 Let hydra build kdesvn 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32455
 2012-02-21 14:04:51 +00:00
Yury G. Kudryashov 743c7e3539 Let hydra build paraview with qt-4.7 and qt-4.8 
svn path=/nixpkgs/trunk/; revision=32452
 2012-02-21 12:57:23 +00:00
Eelco Dolstra 45fed14272 * Revert r32435. We'll be doing a stdenv merge in a few days, so 
let's put it in there rather than having the Nth near-complete
  rebuild of the trunk in a few days.

svn path=/nixpkgs/trunk/; revision=32436
 2012-02-20 18:59:43 +00:00
Peter Simons 95cbf4ed55 Modified the Python 2.7 expression so that the interpreter has unconditional 
OpenSSL support. Having OpenSSL available at the time the core interpreter is
built enables all kinds of important crypto features (i.e. additional hashlib
algorithms, etc.) that otherwise won't be available.

svn path=/nixpkgs/trunk/; revision=32435
 2012-02-20 18:52:52 +00:00
Yury G. Kudryashov d8454e538c svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32417
 2012-02-20 05:30:06 +00:00
Yury G. Kudryashov af126735b2 amarok-2.5.0 
svn path=/nixpkgs/trunk/; revision=32415
 2012-02-20 05:28:03 +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 aaad871c35 inkscape: a couple of upstream patches to fix FTBFS with libpng-1.5 
svn path=/nixpkgs/trunk/; revision=32391
 2012-02-19 09:22:24 +00:00
Yury G. Kudryashov 26f5bdfde1 xplanet: pass netpbm, edit meta 
svn path=/nixpkgs/trunk/; revision=32390
 2012-02-19 09:22:20 +00:00
Yury G. Kudryashov 045d0a3ea0 xplanet-1.2.2; builds with libpng-1.5 
svn path=/nixpkgs/trunk/; revision=32389
 2012-02-19 09:22:14 +00:00
Eelco Dolstra 5178c6fcc6 * GNUcash updated to 2.4.10. 
svn path=/nixpkgs/trunk/; revision=32388
 2012-02-18 18:47:42 +00:00
Eelco Dolstra cdece69773 * Fix building Firefox 3.6 with GCC 4.6. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32387
 2012-02-18 18:07:22 +00:00
Eelco Dolstra 8dc12887e1 * Fix building VLC with zlib 1.2.6. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32385
 2012-02-18 17:23:17 +00:00
Eelco Dolstra 2eb0d0f246 * Chatzilla updated to 0.9.88. 
svn path=/nixpkgs/trunk/; revision=32384
 2012-02-18 17:11:57 +00:00
Eelco Dolstra a0bc441980 * Updated Xen to 4.0.3 (mostly to get it to build with GCC 4.6). 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32380
 2012-02-18 00:18:26 +00:00
Eelco Dolstra 9b4b40f053 * Caneda: fix the version number. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32361
 2012-02-17 18:04:27 +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 e446dee4c3 Backport r32353 from stdenv-udpates 
* Get rid of Qt 4.6.  It doesn't compile with GCC 4.6.  There was only
  one application still using it (Caneda), but upgrading it allowed it
  to build with Qt 4.7.

Eelco, could you please fix the date in caneda version?

svn path=/nixpkgs/trunk/; revision=32359
 2012-02-17 17:40:58 +00:00
Eelco Dolstra 31ebc5d950 * Get rid of Qt 4.6. It doesn't compile with GCC 4.6. There was only 
one application still using it (Caneda), but upgrading it allowed it
  to build with Qt 4.7.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32353
 2012-02-17 14:34:42 +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 ed8caa2c7f svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32347
 2012-02-17 13:10:05 +00:00
Yury G. Kudryashov 950d8f5d60 linphone: set meta.platforms 
svn path=/nixpkgs/trunk/; revision=32345
 2012-02-17 13:03:37 +00:00
Yury G. Kudryashov 84c3137a96 linphone: use external mediastreamer 
svn path=/nixpkgs/trunk/; revision=32344
 2012-02-17 13:03:33 +00:00
Yury G. Kudryashov ee75764bdb svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32338
 2012-02-16 18:46:10 +00:00
Yury G. Kudryashov 4df117c395 ufraw-0.18 (builds with libpng-1.5) 
svn path=/nixpkgs/trunk/; revision=32336
 2012-02-16 18:39:31 +00:00
Yury G. Kudryashov f8926aa0d7 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32335
 2012-02-16 18:18:34 +00:00
Yury G. Kudryashov e5027e5b36 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
 2012-02-16 15:02:26 +00:00
Peter Simons cb28766341 Re-generated Haskell package descriptions with the latest version of cabal2nix. 
svn path=/nixpkgs/trunk/; revision=32327
 2012-02-16 14:05: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 1eed9f56e3 gimp-2.6.12 
svn path=/nixpkgs/trunk/; revision=32320
 2012-02-16 11:17:16 +00:00
Lluís Batlle i Rossell 4ad673b3f4 Updating paraview. 
svn path=/nixpkgs/trunk/; revision=32319
 2012-02-16 11:07:07 +00:00
Eelco Dolstra 95e87e71c5 * Tribler: optionally support streaming playback of torrents via VLC. 
svn path=/nixpkgs/trunk/; revision=32306
 2012-02-15 16:24:02 +00:00
Eelco Dolstra cdd8d2b163 * Subversion updated to 1.7.3. 
svn path=/nixpkgs/trunk/; revision=32305
 2012-02-15 16:23:40 +00:00
Eelco Dolstra 848f583ba3 * VLC: build with xcb-util-keysyms instead of xcb-util, otherwise the 
keyboard doesn't work properly.  (xcb-util-keysyms was split from
  xcb-util.)

svn path=/nixpkgs/trunk/; revision=32300
 2012-02-15 15:42:59 +00:00
Eelco Dolstra c29e492417 * Tribler updated to to 5.5.13. 
svn path=/nixpkgs/trunk/; revision=32299
 2012-02-15 15:39:12 +00:00
Peter Simons ac69747aa8 Regenerated all Haskell packages with the latest version of cabal2nix. 
svn path=/nixpkgs/trunk/; revision=32292
 2012-02-14 17:00:37 +00:00
Peter Simons 02eaa57b56 merge latest changes from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32270
 2012-02-14 13:47:27 +00:00
Cillian de Roiste 1c885d3dee Updating to 2.10.1, security fixes and also fixes #14351 'multiple display of room members' 
svn path=/nixpkgs/trunk/; revision=32267
 2012-02-14 09:56:46 +00:00
Lluís Batlle i Rossell af1b08ac32 Updating firefox to 10.0.1. I'll let hydra build it. 
svn path=/nixpkgs/trunk/; revision=32266
 2012-02-13 21:04:39 +00:00
Yury G. Kudryashov f7886ac78b svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32265
 2012-02-13 19:47:36 +00:00
Yury G. Kudryashov 19dde94ddc Add calligra suite 
KOffice, rebranded. Let hydra build it.

svn path=/nixpkgs/trunk/; revision=32264
 2012-02-13 19:34:42 +00:00
Yury G. Kudryashov fc21cca549 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32231
 2012-02-12 09:33:54 +00:00
Yury G. Kudryashov af62434159 kmymoney-4.6.2, fix build with qt-4.8 
svn path=/nixpkgs/trunk/; revision=32230
 2012-02-11 21:15:16 +00:00
Arie Middelkoop af2f845060 Kwooty binary newsreader version bump 0.8.0 -> 0.8.1. 
Newer version builds against the updated dependencies of the package.

svn path=/nixpkgs/trunk/; revision=32226
 2012-02-11 09:06:09 +00:00
Yury G. Kudryashov 5144a19987 svn merge ^/nixpkgs/trunk 
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
 2012-02-10 10:24:30 +00:00
Yury G. Kudryashov e9974606a5 kmymoney: explicitly pass pkgconfig 
svn path=/nixpkgs/trunk/; revision=32173
 2012-02-10 10:13:52 +00:00
Yury G. Kudryashov c84eb70b51 Latest exosip and linphone 
svn path=/nixpkgs/trunk/; revision=32172
 2012-02-10 10:13:48 +00:00
Yury G. Kudryashov 3217e1c5c3 djview-4.8, fix build with qt-4.8 
svn path=/nixpkgs/trunk/; revision=32171
 2012-02-10 10:13:44 +00:00
Yury G. Kudryashov f9c551a41f hugin-2011.4.0 
svn path=/nixpkgs/trunk/; revision=32170
 2012-02-10 10:13:39 +00:00
Lluís Batlle i Rossell ab93b3a032 Updating imagemagick; I think it's meant to build with the new zlib 1.2.6. 
I'll let hydra try it.

I don't update this in trunk because a lot depends on this.


svn path=/nixpkgs/branches/stdenv-updates/; revision=32166
 2012-02-09 19:45:31 +00:00
Peter Simons 1a7d345aab wxmaxima: updated to version 12.01.0 
svn path=/nixpkgs/trunk/; revision=32158
 2012-02-09 13:22:57 +00:00
Eelco Dolstra 1e0012c1ab * Tribler updated to 5.5.10. 
svn path=/nixpkgs/trunk/; revision=32144
 2012-02-08 16:46:09 +00:00
Yury G. Kudryashov 912637f33a Enable/disable libreoffice build in nixpkgs.config, not in tree. 
I've tried to use override instead of getConfig but failed because exception is
thrown before the function is called with force = true.

svn path=/nixpkgs/trunk/; revision=32131
 2012-02-07 21:03:25 +00:00
Peter Simons 4afaf0be23 emacs-w3m: updated the SHA256 hash 
Thanks Ludo!

svn path=/nixpkgs/trunk/; revision=32124
 2012-02-07 17:45:47 +00:00
Florian Friesdorf 2f7102afc0 emacs 24.0.93 
svn path=/nixpkgs/trunk/; revision=32123
 2012-02-07 17:40:05 +00:00
Florian Friesdorf df12f0bd01 emacs js2-mode 
svn path=/nixpkgs/trunk/; revision=32122
 2012-02-07 17:40:02 +00:00
Florian Friesdorf af8aceb847 notmuch cosmetical change 
svn path=/nixpkgs/trunk/; revision=32121
 2012-02-07 17:39:59 +00:00
Florian Friesdorf f3b60febd3 calfw-1.3-5-ga9b6615 for fix in combination with org-mode 
svn path=/nixpkgs/trunk/; revision=32119
 2012-02-07 17:39:54 +00:00
Florian Friesdorf 4e3afe1b8d emacs mode calfw-1.3 
svn path=/nixpkgs/trunk/; revision=32118
 2012-02-07 17:39:51 +00:00
Peter Simons 29869899a8 ikiwiki: updated to version 3.20120202 
svn path=/nixpkgs/trunk/; revision=32116
 2012-02-07 14:01:05 +00:00
Eelco Dolstra e4ee3e2c9b * svn2git updated to 2.2.0. 
svn path=/nixpkgs/trunk/; revision=32108
 2012-02-07 12:22:48 +00:00
Yury G. Kudryashov c615cbae70 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32099
 2012-02-07 09:38:20 +00:00
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk 
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
 2012-02-06 23:03:12 +00:00
Peter Simons 4e3dcd9254 esniper: updated to version 2.27.0 
svn path=/nixpkgs/trunk/; revision=32087
 2012-02-06 21:26:46 +00:00
Peter Simons ace1095639 upgraded emacs-w3m 
svn path=/nixpkgs/trunk/; revision=32080
 2012-02-06 19:08:58 +00:00
Michael Raskin 8bae3c51ff Add Firefox 11beta 
svn path=/nixpkgs/trunk/; revision=32048
 2012-02-06 08:28:24 +00:00
Alexander Tsamutali 109068c605 applications/misc/goldendict: New nixpkg. 
svn path=/nixpkgs/trunk/; revision=32045
 2012-02-05 21:02:27 +00:00
Yury G. Kudryashov a810d44d81 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32024
 2012-02-03 21:33:28 +00:00
Yury G. Kudryashov 4a5673f520 graphicsmagick: add meta.platforms 
svn path=/nixpkgs/trunk/; revision=32022
 2012-02-03 21:02:00 +00:00
Peter Simons 412e5dd87d haskell-hledger-interest: updated to version 1.4 
svn path=/nixpkgs/trunk/; revision=32015
 2012-02-03 21:00:16 +00:00
Lluís Batlle i Rossell cf2591c5ec Updating rdesktop to 1.7.1 
svn path=/nixpkgs/trunk/; revision=31993
 2012-02-03 16:16:18 +00:00
Yury G. Kudryashov df037ddafd svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31987
 2012-02-02 20:36:11 +00:00
Eelco Dolstra 9d9e33b98d * Added Firefox 10.0. P.S. it seems that Firefox 10 no longer needs 
--enable-official-branding to get a browser that calls itself
  "Firefox".  But I'll leave the flag in for the moment.
* Removed Firefox 8.0.

svn path=/nixpkgs/trunk/; revision=31984
 2012-02-02 15:44:22 +00:00
Eelco Dolstra 7b5db94b5f * Updated Adobe Reader to 9.4.7. 
svn path=/nixpkgs/trunk/; revision=31978
 2012-02-02 12:19:17 +00:00
Lluís Batlle i Rossell f53c231cc4 Updating truecrypt to 7.1. 
I pick the tarball not from the mainsite, but we checked that the hash
corresponds with that of the main site.


svn path=/nixpkgs/trunk/; revision=31963
 2012-02-02 08:54:54 +00:00
Yury G. Kudryashov 2b3fb5a824 Merge two nix exprs for links2, upgrade to 2.5 
svn path=/nixpkgs/trunk/; revision=31962
 2012-02-01 22:33:35 +00:00
Arie Middelkoop cc145f2ae9 Update of skype expression: make the use of pulse audio optional based on the configuration setting for pulse audio (off by default). 
Removing pulse audio from the build inputs when it is not used prevents the bug of Skype taking 100% cpu from showing up.
This demonstrates nicely nix' features: in other distributions the recomended solution was to remove read permission from the
pulse audio libs.

svn path=/nixpkgs/trunk/; revision=31959
 2012-02-01 22:09:35 +00:00
Marco Maggesi 7c90b6a9bc Update HOL Light to rev 122. 
svn path=/nixpkgs/trunk/; revision=31956
 2012-02-01 14:37:50 +00:00
Eelco Dolstra f7626c1ddd * Unbreak icewm. Without -lfontconfig, it barfs with 
icewm: error while loading shared libraries: libfontconfig.so.1:
    cannot open shared object file: No such file or directory

  This causes various NixOS tests to fail
  (e.g. http://hydra.nixos.org/build/1952097).

svn path=/nixpkgs/trunk/; revision=31945
 2012-01-31 14:55:43 +00:00
Eelco Dolstra 399c575139 * Updated Spotify to 0.6.6.10. 
svn path=/nixpkgs/trunk/; revision=31935
 2012-01-30 16:44:56 +00:00
Peter Simons f1e16ea3c9 ikiwiki: updated to version 3.20120115 
svn path=/nixpkgs/trunk/; revision=31933
 2012-01-30 11:40:16 +00:00
Cillian de Roiste 467722ad1a Patching the prefix, since it is hardcoded. The application seems to work correctly now, although it does crash with my current gtk theme (oxygen) when adding a stream. Using the gnome gtk-icon-theme does work, but this is probably just a bug in the oxygen gtk theme and should be fixed there. 
svn path=/nixpkgs/trunk/; revision=31913
 2012-01-29 13:39:30 +00:00
Yury G. Kudryashov 71c28d0e33 Use meta.platforms 
svn path=/nixpkgs/trunk/; revision=31909
 2012-01-28 14:39:56 +00:00
Yury G. Kudryashov 9d67ff2a48 Remove glib-1.x and its reverse dependencies 
Nobody told me that he uses generator or xmms, so I'm removing this old stuff.

svn path=/nixpkgs/trunk/; revision=31907
 2012-01-28 13:06:07 +00:00
Yury G. Kudryashov e9e0418145 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31891
 2012-01-27 18:57:35 +00:00
Yury G. Kudryashov ed92080b8d icewm-1.3.7 
svn path=/nixpkgs/trunk/; revision=31890
 2012-01-27 18:56:31 +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
Lluís Batlle i Rossell 3c5fee5243 I revert the previous change to libreoffice. 
svn path=/nixpkgs/trunk/; revision=31885
 2012-01-27 15:14:29 +00:00
Lluís Batlle i Rossell 29ca4d272f Updating gdb. I did not update the 'bleeding edge' thing though. That should be 
better named to "one git checkout" instead of bleeding edge.


svn path=/nixpkgs/trunk/; revision=31883
 2012-01-27 15:11:17 +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
Arie Middelkoop 7c8ab92620 kwooty expression: slight improvement of the build inputs. 
svn path=/nixpkgs/trunk/; revision=31873
 2012-01-26 23:24:40 +00:00
Michael Raskin 393f2479f8 Fix mismatch... 
svn path=/nixpkgs/trunk/; revision=31870
 2012-01-26 19:39:45 +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
Michael Raskin b9916f0fd9 Add K3D 3D editor 
svn path=/nixpkgs/trunk/; revision=31850
 2012-01-26 13:12:36 +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 eb59b98c26 vlc-1.1.13 
svn path=/nixpkgs/trunk/; revision=31843
 2012-01-26 08:36:18 +00:00
Lluís Batlle i Rossell 06548b79e9 Adding what I have for today of libreoffice. It still does not build. 
svn path=/nixpkgs/trunk/; revision=31839
 2012-01-25 23:04:34 +00:00
Lluís Batlle i Rossell 7fc001306c I add some little code to fetch the srcs of libreoffice. 
svn path=/nixpkgs/trunk/; revision=31838
 2012-01-25 19:12:27 +00:00
Peter Simons 6e4f0b6365 git-annex: updated to version 3.20120123 
svn path=/nixpkgs/trunk/; revision=31836
 2012-01-25 16:07:52 +00:00
Arie Middelkoop f9fabb4626 added kwooty: a binary newsreader (kde). 
svn path=/nixpkgs/trunk/; revision=31829
 2012-01-24 22:09:17 +00:00
Arie Middelkoop d6f60f7135 emacs htmlize: fix of broken source url. 
svn path=/nixpkgs/trunk/; revision=31827
 2012-01-24 22:06:35 +00:00
Karn Kallio 47ae4a01bd kdenlive builds for kde48 release candidate (and kde47). 
svn path=/nixpkgs/trunk/; revision=31802
 2012-01-24 04:50:55 +00:00
Karn Kallio 8e00bbb06b Get kadu to compile with kde48 (as well as kde47). 
svn path=/nixpkgs/trunk/; revision=31800
 2012-01-24 00:00:41 +00:00
Karn Kallio 39206f5b44 Get psi to compile with kde47 and kde48. 
svn path=/nixpkgs/trunk/; revision=31799
 2012-01-24 00:00:34 +00:00
Florian Friesdorf 5c05e3f866 emacs-24 alsaLib and imagemagickBig 
svn path=/nixpkgs/trunk/; revision=31788
 2012-01-23 00:55:48 +00:00
Peter Simons 9b740035a4 mplayer: renamed the expression from "mplayer-r${version}" to "mplayer-${version}" 
The additional 'r' after the hyphen prevented nix-env from recognizing the SVN
revision number as a version'ish kind of thing; thus nix-env would never update
an installed mplayer in any user profile.

In other words, to get this particular update, you must remove the old
expression by running

    nix-env -e mplayer-r33472

..., and then install the new one:

nix-env -i mplayer

svn path=/nixpkgs/trunk/; revision=31785
 2012-01-21 21:25:45 +00:00
Peter Simons c9d11ba56a mplayer: update mplayer and ffmpeg to current HEAD versions 
svn path=/nixpkgs/trunk/; revision=31784
 2012-01-21 21:25:41 +00:00