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

3440 commits

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