philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

3489 commits

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