JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,562 Commits 2 Branches 0 Tags 12 GiB
84c0185038
Commit Graph

3269 Commits

Author SHA1 Message Date
Marco Maggesi
74c3fc3085 Update HOL Light to rev 114 
svn path=/nixpkgs/trunk/; revision=30922
 2011-12-16 07:44:29 +00:00
Yury G. Kudryashov
b077940b3b svn merge https://nixos.org/repos/nix/nixpkgs/trunk 
No conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=30916
 2011-12-15 19:16:38 +00:00
Yury G. Kudryashov
76c2e7d82f xournal: prepare to poppler upgrade 
svn path=/nixpkgs/trunk/; revision=30901
 2011-12-15 08:01:03 +00:00
Yury G. Kudryashov
471ebaf6f8 calibre-0.8.30 
svn path=/nixpkgs/trunk/; revision=30900
 2011-12-15 06:58:27 +00:00
Marco Maggesi
f6689d01a3 Update fossil to version 1.21 
svn path=/nixpkgs/trunk/; revision=30875
 2011-12-13 22:19:06 +00:00
Michael Raskin
d5c702939c Update Golly 
svn path=/nixpkgs/trunk/; revision=30874
 2011-12-13 21:00:42 +00:00
Karn Kallio
135fe9059f ProofGeneral 4.1 
svn path=/nixpkgs/trunk/; revision=30863
 2011-12-13 01:13:46 +00:00
Eelco Dolstra
39c8bfdcc4 * New version of ‘ed’. W00t! 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30862
 2011-12-12 23:44:49 +00:00
Alexander Tsamutali
7e82cfb7d6 Added support for Quake Live to Firefox wrapper. 
svn path=/nixpkgs/trunk/; revision=30856
 2011-12-12 17:25:51 +00:00
Eelco Dolstra
eda3fd1730 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
 2011-12-12 16:54:35 +00:00
Peter Simons
a856742950 torchat: tell Hydra that it shouldn't attempt to build that package an Cygwin (fails with an assertion) 
svn path=/nixpkgs/trunk/; revision=30833
 2011-12-11 18:35:20 +00:00
Peter Simons
cd90831b3c haskell-xmobar: updated to version 0.14 
svn path=/nixpkgs/trunk/; revision=30823
 2011-12-10 22:30:49 +00:00
Alexander Tsamutali
9ec2f699d6 applications/misc/bitcoin: Hash changed. 
svn path=/nixpkgs/trunk/; revision=30819
 2011-12-10 18:01:51 +00:00
Peter Simons
1817b55a7f git: updated to version 1.7.8 
svn path=/nixpkgs/trunk/; revision=30805
 2011-12-09 11:44:42 +00:00
Piotr Pietraszkiewicz
1bd85e4159 added libdvbpsi and added it to the dependency list of vlc so that vlc can play DVB 
svn path=/nixpkgs/trunk/; revision=30789
 2011-12-06 23:09:19 +00:00
Piotr Pietraszkiewicz
32163fa1ff added dvb-apps 
svn path=/nixpkgs/trunk/; revision=30788
 2011-12-06 23:01:22 +00:00
Eelco Dolstra
acd7288678 * Proper version number. 
svn path=/nixpkgs/trunk/; revision=30784
 2011-12-06 21:16:20 +00:00
Piotr Pietraszkiewicz
6cb70eea88 upgraded to kadu-0.10.1 
svn path=/nixpkgs/trunk/; revision=30781
 2011-12-06 19:11:15 +00:00
Eelco Dolstra
621963488f * GnuCash updated to 2.4.8. 
svn path=/nixpkgs/trunk/; revision=30780
 2011-12-06 18:44:05 +00:00
Eelco Dolstra
3aedd3770f * Get svn2git to work. 
svn path=/nixpkgs/trunk/; revision=30778
 2011-12-06 15:41:16 +00:00
Eelco Dolstra
b1e6ccae4e * Subversion 1.7.2. 
svn path=/nixpkgs/trunk/; revision=30776
 2011-12-06 14:56:47 +00:00
Peter Simons
c86e037939 wxMaxima: updated to version 11.08.0 
svn path=/nixpkgs/trunk/; revision=30774
 2011-12-06 14:07:14 +00:00
Peter Simons
1382203c29 maxima: updated to version 5.25.1 
svn path=/nixpkgs/trunk/; revision=30773
 2011-12-06 14:07:11 +00:00
Peter Simons
e2e5f9693d gv: updated to version 3.7.3 
svn path=/nixpkgs/trunk/; revision=30767
 2011-12-05 19:58:19 +00:00
Peter Simons
3357437461 git-annex: updated to version 3.20111203 
svn path=/nixpkgs/trunk/; revision=30762
 2011-12-05 16:23:05 +00:00
Peter Simons
42757e653a Temporarily keep monad-control 0.2.0.3 until a new version of git-annex comes out that supports the current version. 
svn path=/nixpkgs/trunk/; revision=30761
 2011-12-05 16:23:02 +00:00
Lluís Batlle i Rossell
a9a03946df Updating gtkwave 
svn path=/nixpkgs/trunk/; revision=30738
 2011-12-05 10:44:53 +00:00
Shea Levy
69e12ad16e Add ncmpcpp 
Patch by mornfall

svn path=/nixpkgs/trunk/; revision=30730
 2011-12-05 01:32:25 +00:00
Ludovic Courtès
dccc3f83b3 GNUnet 0.9.0. 
svn path=/nixpkgs/trunk/; revision=30725
 2011-12-04 13:49:03 +00:00
Shea Levy
3de62cd12a Add quvi 
Patch submitted by mornfall

svn path=/nixpkgs/trunk/; revision=30720
 2011-12-03 22:21:00 +00:00
Peter Simons
72e5c8176e rsync: stripped trailing whitespace 
svn path=/nixpkgs/trunk/; revision=30715
 2011-12-03 16:11:57 +00:00
Peter Simons
74d6145917 rsync: added meta.maintainers section 
svn path=/nixpkgs/trunk/; revision=30714
 2011-12-03 16:11:54 +00:00
Peter Simons
504bd76b0e ikiwiki: updated to version 3.20111107 
svn path=/nixpkgs/trunk/; revision=30713
 2011-12-03 16:11:50 +00:00
Lluís Batlle i Rossell
0160f222cc Adding flashplayer11. It builds fine for me on x86_64. 
Patch by Eduard Carreras.


svn path=/nixpkgs/trunk/; revision=30712
 2011-12-03 15:16:17 +00:00
Lluís Batlle i Rossell
43a5b41802 Updating eaglemode 
svn path=/nixpkgs/trunk/; revision=30711
 2011-12-03 15:04:05 +00:00
Lluís Batlle i Rossell
b330b79160 Updating rsync. 
svn path=/nixpkgs/trunk/; revision=30707
 2011-12-02 23:14:09 +00:00
Ludovic Courtès
57b602b5ae Remove GNU IceCat 4, which never built. 
svn path=/nixpkgs/trunk/; revision=30660
 2011-12-01 22:43:17 +00:00
Lluís Batlle i Rossell
95c759a536 Fixing xpdf, so it finds the pdf base fonts now. 
svn path=/nixpkgs/trunk/; revision=30658
 2011-12-01 20:17:42 +00:00
Sander van der Burg
a56033ea14 Bumped virtualbox version to 4.1.6 
svn path=/nixpkgs/trunk/; revision=30637
 2011-11-30 14:44:29 +00:00
Peter Simons
438305146e haskell-xmonad-extras: updated to version 0.10.1 
svn path=/nixpkgs/trunk/; revision=30586
 2011-11-28 18:11:27 +00:00
Marco Maggesi
bf394d80ec Update url for Isabelle2011 
svn path=/nixpkgs/trunk/; revision=30574
 2011-11-26 18:45:15 +00:00
Eelco Dolstra
a7b50dc5de * Do an "exec" to get rid of an unnecessary shell. 
svn path=/nixpkgs/trunk/; revision=30566
 2011-11-25 17:01:54 +00:00
Russell O'Connor
c9b2f32c45 Updating bitcoin to version 0.5.0. 
svn path=/nixpkgs/trunk/; revision=30553
 2011-11-24 19:48:20 +00:00
Russell O'Connor
845f2a8658 adding camlp5 as a propogated build input to ulex 0.8 
matita and ulex must build against the same version of camlp5, so in an attempt to force them to always be the same I am adding a propgatedBuildInput to ulex.
Granted Matita still requires camlp5_traditional and this is less obvious in the matita file now, so I am not entirely sure this is the right design choice.

svn path=/nixpkgs/trunk/; revision=30552
 2011-11-24 19:43:03 +00:00
Eelco Dolstra
ec390f4bbb * Fix incorrect URL. 
svn path=/nixpkgs/trunk/; revision=30548
 2011-11-24 14:22:13 +00:00
Eelco Dolstra
7a7fb5bc5a * Firefox 8.0.1. 
* Make Firefox 8 the default.

svn path=/nixpkgs/trunk/; revision=30546
 2011-11-24 11:55:15 +00:00
Peter Simons
1193eabfa1 git-annex: updated to version 3.20111122 
svn path=/nixpkgs/trunk/; revision=30538
 2011-11-23 09:21:20 +00:00
Peter Simons
d471371bd0 haskell-xmonad-extras: enable mpd and hlist extras 
svn path=/nixpkgs/trunk/; revision=30516
 2011-11-21 18:02:24 +00:00
Peter Simons
80dc05cc9a haskell-xmonad-extras: updated to version 0.10 
svn path=/nixpkgs/trunk/; revision=30513
 2011-11-21 17:54:29 +00:00
Lluís Batlle i Rossell
eb38ca06bf Updating giv. 
svn path=/nixpkgs/trunk/; revision=30508
 2011-11-21 14:47:28 +00:00
Florian Friesdorf
50bfde368e notmuch use license path instead of string 
svn path=/nixpkgs/trunk/; revision=30498
 2011-11-20 21:49:06 +00:00
Ludovic Courtès
36da53ebc3 Adobe Reader: Set `meta.license'. 
svn path=/nixpkgs/trunk/; revision=30495
 2011-11-20 20:42:24 +00:00
Florian Friesdorf
b555892dff notmuch-0.9 
svn path=/nixpkgs/trunk/; revision=30491
 2011-11-20 19:22:53 +00:00
Peter Simons
59fa8fc940 xmonad: patch source code to refer to xmessage(1) using its complete path 
svn path=/nixpkgs/trunk/; revision=30488
 2011-11-20 10:21:38 +00:00
Peter Simons
589be8e754 haskell-xmonad-contrib: updated to version 0.10 
svn path=/nixpkgs/trunk/; revision=30486
 2011-11-20 10:13:43 +00:00
Peter Simons
32f1cfcd26 haskell-xmonad: updated to version 0.10 
svn path=/nixpkgs/trunk/; revision=30485
 2011-11-20 10:13:34 +00:00
Evgeny Egorochkin
351ff3583d TorChat: packaged 
svn path=/nixpkgs/trunk/; revision=30480
 2011-11-19 17:12:00 +00:00
Peter Simons
1c0ae7e8ed git: updated to version 1.7.7.3 
svn path=/nixpkgs/trunk/; revision=30476
 2011-11-18 18:37:20 +00:00
Rob Vermaas
a456047fc1 update chrome 
svn path=/nixpkgs/trunk/; revision=30462
 2011-11-18 02:40:33 +00:00
Peter Simons
692efb76e4 mercurial: updated to version 2.0 
svn path=/nixpkgs/trunk/; revision=30443
 2011-11-16 14:37:11 +00:00
Peter Simons
1a4f43c7b3 wireshark: updated to version 1.6.2 
svn path=/nixpkgs/trunk/; revision=30426
 2011-11-14 15:11:23 +00:00
Lluís Batlle i Rossell
45388a9ae1 Updating aMSN. 
svn path=/nixpkgs/trunk/; revision=30420
 2011-11-14 09:59:26 +00:00
Ludovic Courtès
db1b4e2edc GNU Zile: Fix cross-compilation. 
svn path=/nixpkgs/trunk/; revision=30414
 2011-11-13 21:28:29 +00:00
Lluís Batlle i Rossell
accdb3b19f Fixing xfontsel, so it now starts finding the dynamic libs. 
svn path=/nixpkgs/trunk/; revision=30396
 2011-11-12 17:29:11 +00:00
Michael Raskin
94149403e5 Firefox 9.0beta1 
svn path=/nixpkgs/trunk/; revision=30391
 2011-11-12 09:38:31 +00:00
Eelco Dolstra
c8da189d39 * Added Firefox 8.0. 
* Removed Firefox 6.

svn path=/nixpkgs/trunk/; revision=30382
 2011-11-10 23:06:58 +00:00
Marco Maggesi
fa47d66e22 Updated HOL Light to revision 112 
svn path=/nixpkgs/trunk/; revision=30369
 2011-11-10 15:35:53 +00:00
Lluís Batlle i Rossell
3f160bea0e Updating xterm. Just to have the latest. 
svn path=/nixpkgs/trunk/; revision=30364
 2011-11-09 22:59:46 +00:00
Evgeny Egorochkin
11426750a0 Revert "DigiKam: fix deps" 
This commit breaks hydra evaluation for some reason, but it works locally for some reason...
This reverts commit 3ba002080ab1d8e28ca1b824de01a5156487735f.

svn path=/nixpkgs/trunk/; revision=30355
 2011-11-09 14:24:14 +00:00
Evgeny Egorochkin
f8799c65fd DigiKam: fix deps 
svn path=/nixpkgs/trunk/; revision=30354
 2011-11-09 13:01:55 +00:00
Evgeny Egorochkin
6d51717fcf Bangarang: fix deps to get it to compile against kde 4.7 
svn path=/nixpkgs/trunk/; revision=30353
 2011-11-09 13:01:51 +00:00
Peter Simons
9dcb5da174 git-annex: updated to version 3.20111107 
svn path=/nixpkgs/trunk/; revision=30337
 2011-11-08 16:59:30 +00:00
Michael Raskin
6947317d3c Fix xine-ui build - curl dropped curl/types.h 
svn path=/nixpkgs/trunk/; revision=30318
 2011-11-08 11:18:24 +00:00
Michael Raskin
753ef6a635 Fix gosmore build - curl dropped curl/types.h 
svn path=/nixpkgs/trunk/; revision=30317
 2011-11-08 10:19:50 +00:00
Peter Simons
368ac01473 synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30316
 2011-11-08 10:18:35 +00:00
Peter Simons
4098071398 gravit: cosmetic 
svn path=/nixpkgs/trunk/; revision=30314
 2011-11-08 10:01:14 +00:00
Peter Simons
dd8a7b38db esniper: fixed build with current version of curl 
svn path=/nixpkgs/trunk/; revision=30299
 2011-11-07 17:48:51 +00:00
Peter Simons
cf77f59ce9 stellarium: updated to version 0.11.1 
svn path=/nixpkgs/trunk/; revision=30289
 2011-11-07 10:04:40 +00:00
Peter Simons
a0cf7c24e1 git-annex: updated to version 3.20111025 
svn path=/nixpkgs/trunk/; revision=30241
 2011-11-05 00:03:44 +00:00
Lluís Batlle i Rossell
c95d373b68 Patching gtmess; it did not build on arm. 
svn path=/nixpkgs/trunk/; revision=30230
 2011-11-04 18:10:44 +00:00
Lluís Batlle i Rossell
6d9179983b Semicolon 
svn path=/nixpkgs/trunk/; revision=30222
 2011-11-04 10:35:21 +00:00
Lluís Batlle i Rossell
0f0ca48a8d Adding gtmess 
svn path=/nixpkgs/trunk/; revision=30221
 2011-11-04 10:28:18 +00:00
Lluís Batlle i Rossell
b931fd862d Updating scribus to 1.4.0rc6. The developers say they abandoned 1.3 long ago. 
svn path=/nixpkgs/trunk/; revision=30190
 2011-11-02 15:00:11 +00:00
Lluís Batlle i Rossell
665dc49d43 I make qcad compile further... and more importantly, I make it fail the build 
if the compilation fails. It was not so.

But it still needs some patching to build.

svn path=/nixpkgs/trunk/; revision=30189
 2011-11-02 15:00:04 +00:00
Peter Simons
69488d688d synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30186
 2011-11-02 10:28:32 +00:00
Shea Levy
3447d62e64 pidgin-sipe: Bump to 1.12.0 
svn path=/nixpkgs/trunk/; revision=30177
 2011-11-02 00:19:19 +00:00
Lluís Batlle i Rossell
4cf25b19de Updating xpdf. 
svn path=/nixpkgs/trunk/; revision=30157
 2011-10-31 21:38:30 +00:00
Ludovic Courtès
e26fc2311a GNU Zile 2.4.2. 
svn path=/nixpkgs/trunk/; revision=30110
 2011-10-30 00:00:25 +00:00
Eelco Dolstra
eeb4d231b3 * Subversion updated to 1.7.1. 
svn path=/nixpkgs/trunk/; revision=30034
 2011-10-26 15:32:56 +00:00
Peter Simons
dfd063cf12 synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30027
 2011-10-26 09:15:25 +00:00
Shea Levy
892889cf35 Add netperf 
I will add meta later, I promise, I just need to use this now

svn path=/nixpkgs/trunk/; revision=30026
 2011-10-25 20:49:22 +00:00
Lluís Batlle i Rossell
b74d8fb90f Making gpgme optional in mutt. A dependency of gpgme (pth) does not build on arm. 
svn path=/nixpkgs/trunk/; revision=30019
 2011-10-25 17:46:26 +00:00
Lluís Batlle i Rossell
f71f99ce48 Updating mldonkey 
svn path=/nixpkgs/trunk/; revision=29998
 2011-10-24 19:03:18 +00:00
Lluís Batlle i Rossell
22ff0a19c3 Updating the fossil tarball hash, due to an update upstream: 
http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg06730.html

I also add readline (it may provide a nicer prompt on fossil sqlite)
and sqlite (required for some tests).

The old tarballs were broken in a way that the tests requiring sqlite were not run.


svn path=/nixpkgs/trunk/; revision=29974
 2011-10-22 20:41:37 +00:00
Nicolas Pierron
87bf637319 Mercurial: Give access to ssl and curses python packages for 
fast-export and crecord.

svn path=/nixpkgs/trunk/; revision=29972
 2011-10-22 15:41:20 +00:00
Cillian de Roiste
d91165c368 Updating Inkscape to 0.48.2 
svn path=/nixpkgs/trunk/; revision=29971
 2011-10-22 00:01:26 +00:00
Peter Simons
9016346fbd git: updated to version 1.7.7 
svn path=/nixpkgs/trunk/; revision=29965
 2011-10-21 16:50:36 +00:00
Peter Simons
e98852cefd git-annex: updated to version 3.20111011 
svn path=/nixpkgs/trunk/; revision=29964
 2011-10-21 16:34:38 +00:00
Eelco Dolstra
5e51aadc10 * Fix evaluation errors. 
svn path=/nixpkgs/trunk/; revision=29955
 2011-10-21 14:43:18 +00:00
Marco Maggesi
11d18ba4fd Update fossil to version 1.20 
svn path=/nixpkgs/trunk/; revision=29954
 2011-10-21 14:12:46 +00:00
Eelco Dolstra
572b54cb9c * Spotify updated to the latest version. 
svn path=/nixpkgs/trunk/; revision=29953
 2011-10-21 02:26:26 +00:00
Eelco Dolstra
8f76df522e * 32-bit Flash player updated. 
svn path=/nixpkgs/trunk/; revision=29951
 2011-10-20 23:11:13 +00:00
Sander van der Burg
9ee72eb9ae Added license to yafc 
svn path=/nixpkgs/trunk/; revision=29930
 2011-10-20 11:17:24 +00:00
Peter Simons
7edf0e8eaf synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29870
 2011-10-18 08:47:36 +00:00
Russell O'Connor
491c6e43b1 Package for picosat. 
svn path=/nixpkgs/trunk/; revision=29869
 2011-10-17 22:18:21 +00:00
Peter Simons
8dfef0f4a0 synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29851
 2011-10-14 22:06:50 +00:00
Florian Friesdorf
d2b089cc0b notmuch - simplify expression 
svn path=/nixpkgs/trunk/; revision=29834
 2011-10-14 10:30:14 +00:00
Lluís Batlle i Rossell
7a2cb5bc64 Updating dmenu 
svn path=/nixpkgs/trunk/; revision=29832
 2011-10-14 07:55:02 +00:00
Lluís Batlle i Rossell
58e9385e70 Downgrading boinc to the last stable version. 
svn path=/nixpkgs/trunk/; revision=29808
 2011-10-13 08:58:45 +00:00
Eelco Dolstra
18bd78f116 * Get k3b to build again. 
svn path=/nixpkgs/trunk/; revision=29801
 2011-10-12 21:59:36 +00:00
Lluís Batlle i Rossell
ce2bceeeac Updating feh. 
svn path=/nixpkgs/trunk/; revision=29798
 2011-10-12 21:25:05 +00:00
Ludovic Courtès
14e951e6d5 GNU RCS 5.8. 
svn path=/nixpkgs/trunk/; revision=29795
 2011-10-12 20:43:44 +00:00
Lluís Batlle i Rossell
2c6200c025 Updating veracity 
svn path=/nixpkgs/trunk/; revision=29772
 2011-10-11 19:30:11 +00:00
Peter Simons
e3984c2caf synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29739
 2011-10-10 17:01:17 +00:00
Yury G. Kudryashov
c35c6ec9fa Drop 'gnomevfs = gnome_vfs;' alias 
s/gnomevfs/gnome_vfs/ in packages

svn path=/nixpkgs/trunk/; revision=29718
 2011-10-08 12:06:03 +00:00
Yury G. Kudryashov
c7d6b60287 Drop kde3.kile 
Use kde4.kile instead

svn path=/nixpkgs/trunk/; revision=29715
 2011-10-07 20:46:29 +00:00
Lluís Batlle i Rossell
c67c7d49b0 Boinc wanted to be told to link to libX11 
svn path=/nixpkgs/trunk/; revision=29713
 2011-10-07 19:01:27 +00:00
Lluís Batlle i Rossell
80d397413d Boinc can even run, but only if placed in the proper (writeable) path. 
svn path=/nixpkgs/trunk/; revision=29712
 2011-10-07 19:01:19 +00:00
Eelco Dolstra
79ab307dd7 * Fix Chatzilla (it doesn't work with recent Xulrunners). 
* Get rid of xulrunnerWrapper.

svn path=/nixpkgs/trunk/; revision=29706
 2011-10-07 09:26:03 +00:00
Lluís Batlle i Rossell
fefaa7a6ea Adding boinc. It installs. I don't know how to use it. 
svn path=/nixpkgs/trunk/; revision=29704
 2011-10-06 20:25:05 +00:00
Eelco Dolstra
f1dcb1ccd0 * Thunderbird: install a desktop item. 
svn path=/nixpkgs/trunk/; revision=29703
 2011-10-06 14:10:56 +00:00
Eelco Dolstra
ee74cf87dc * Set the Chrome icon in its desktop item. 
svn path=/nixpkgs/trunk/; revision=29701
 2011-10-06 13:52:54 +00:00
Eelco Dolstra
57f482e2c3 * Get rid of old Thunderbird versions. 
svn path=/nixpkgs/trunk/; revision=29700
 2011-10-06 13:28:03 +00:00
Eelco Dolstra
f4d88c2197 * Thunderbird 7.0.1. 
svn path=/nixpkgs/trunk/; revision=29697
 2011-10-06 13:21:05 +00:00
Peter Simons
1add4b2e6d synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29696
 2011-10-06 13:16:47 +00:00
Eelco Dolstra
bcf053ed23 * Firefox 7.0.1. 
svn path=/nixpkgs/trunk/; revision=29687
 2011-10-06 10:47:09 +00:00
Peter Simons
1abdc56a12 Synchronized stdenv-updates branch with trunk. 
There were conflicting patches of pkgs/os-specific/linux/module-init-tools.
Apparently, the expression was updated independently in both branches. I've
resolved the conflict by preferring the patches from stdenv-updates, because
those patches appeared to be more sophisticated, i.e. they build the manual,
etc.

svn path=/nixpkgs/branches/stdenv-updates/; revision=29680
 2011-10-06 09:37:22 +00:00
Yury G. Kudryashov
9f1347ae7e virtualbox-4.1.2 
svn path=/nixpkgs/trunk/; revision=29677
 2011-10-05 19:54:44 +00:00
Yury G. Kudryashov
1b87ef25db calibre-0.8.21 
The old version failed to build on hydra, so I've upgraded

svn path=/nixpkgs/trunk/; revision=29637
 2011-10-04 15:20:17 +00:00
Yury G. Kudryashov
dd19f22e7e Add kde4.kile 
svn path=/nixpkgs/trunk/; revision=29622
 2011-10-04 11:12:11 +00:00
Yury G. Kudryashov
371cd8bc51 kde3: use meta.platforms 
svn path=/nixpkgs/trunk/; revision=29596
 2011-10-02 21:15:36 +00:00
Shea Levy
3b260bfbf7 Merge from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29553
 2011-10-01 18:12:00 +00:00
Michael Raskin
a8a3ede5e9 Adding Firefox 8.0beta1 
svn path=/nixpkgs/trunk/; revision=29549
 2011-09-30 15:44:22 +00:00
Michael Raskin
8e02768459 Firefox 7.0 release 
svn path=/nixpkgs/trunk/; revision=29544
 2011-09-30 07:10:47 +00:00
Peter Simons
e460e459bf synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29531
 2011-09-28 19:26:00 +00:00
Yury G. Kudryashov
e2c4af0946 Update opera to the latest version 
Also add missing dependencies (KDE, cups, gstreamer)

svn path=/nixpkgs/trunk/; revision=29527
 2011-09-28 15:23:28 +00:00
Peter Simons
07a5a121fb synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29524
 2011-09-28 14:48:34 +00:00
Shea Levy
790d78fb6f FreeRDP-unstable: Bump 
svn path=/nixpkgs/trunk/; revision=29522
 2011-09-28 14:23:47 +00:00
Peter Simons
01022a1502 lxc: moved package into the "applications/virtualization" category 
svn path=/nixpkgs/trunk/; revision=29491
 2011-09-26 08:12:14 +00:00
Shea Levy
01df54f5cc Merge from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29461
 2011-09-23 16:58:45 +00:00
Eelco Dolstra
f607e23168 * Spotify needs OpenSSL now. 
svn path=/nixpkgs/trunk/; revision=29456
 2011-09-23 15:37:15 +00:00
Shea Levy
65898538b5 Bump spotify... Sure wish they kept around old versions 
svn path=/nixpkgs/trunk/; revision=29454
 2011-09-23 15:23:30 +00:00
Michael Raskin
8e6bbd66aa Update LinuxDC++. Does not eliminate some of the strange segfaults 
svn path=/nixpkgs/trunk/; revision=29449
 2011-09-23 06:52:10 +00:00
Karn Kallio
48dbddd831 Advance mysqlworkbench version to 5.2.35; fix failing build. 
svn path=/nixpkgs/trunk/; revision=29446
 2011-09-23 00:03:21 +00:00
Lluís Batlle i Rossell
1175e3e46b Adding etherape, although it wants those gconf things I think. 
svn path=/nixpkgs/trunk/; revision=29437
 2011-09-22 09:19:33 +00:00
Lluís Batlle i Rossell
d7d6755654 Updating gnunet 0.9 svn version, although it brings little or nothing new I had noticed. 
svn path=/nixpkgs/trunk/; revision=29436
 2011-09-22 09:15:48 +00:00
Shea Levy
514e07ba96 Update freerdpUnstable 
svn path=/nixpkgs/trunk/; revision=29432
 2011-09-22 02:07:49 +00:00
Florian Friesdorf
12a38dd5c6 notmuch-0.8 all tests pass 
svn path=/nixpkgs/trunk/; revision=29427
 2011-09-21 20:04:43 +00:00
Lluís Batlle i Rossell
c289ea7c4f Making rsync cross build. 
svn path=/nixpkgs/trunk/; revision=29408
 2011-09-21 07:04:22 +00:00
Yury G. Kudryashov
9ee5230537 Move qt3/qt4 choice to .nix expressions 
svn path=/nixpkgs/trunk/; revision=29404
 2011-09-20 22:49:13 +00:00