Commit graph

3495 commits

Author SHA1 Message Date
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
Peter Simons 7f062680e4 ledger3: updated to current HEAD
svn path=/nixpkgs/trunk/; revision=31782
2012-01-21 19:25:50 +00:00
Peter Simons 83fef2d3fa ledger3: added some kind of date-based fake version number to help nix-env decide when to update
svn path=/nixpkgs/trunk/; revision=31781
2012-01-21 19:25:45 +00:00
Peter Simons cf287936ac ledger: renamed 2.6.3 version's nix file for consistency
svn path=/nixpkgs/trunk/; revision=31780
2012-01-21 19:25:41 +00:00
Peter Simons 680787f13e mercurial: updated to version 2.0.2
svn path=/nixpkgs/trunk/; revision=31775
2012-01-21 19:08:48 +00:00
Peter Simons e926d8d9f2 emacs: updated 23.3 to 23.3b
svn path=/nixpkgs/trunk/; revision=31771
2012-01-21 18:46:37 +00:00
Peter Simons e86daecce9 emacs: strip trailing whitespace from expression for 23.x
svn path=/nixpkgs/trunk/; revision=31770
2012-01-21 18:46:28 +00:00
Florian Friesdorf a8a8f5df23 notmuch-0.11
svn path=/nixpkgs/trunk/; revision=31767
2012-01-21 18:29:11 +00:00
Florian Friesdorf c554168536 org-7.8.03
svn path=/nixpkgs/trunk/; revision=31765
2012-01-21 18:29:06 +00:00
Florian Friesdorf 57733bae5d remove emacsSnapshot in favour of emacs24
svn path=/nixpkgs/trunk/; revision=31764
2012-01-21 18:29:02 +00:00
Florian Friesdorf 0d2d1dd139 emacs-24.0.92
svn path=/nixpkgs/trunk/; revision=31763
2012-01-21 18:28:57 +00:00
Florian Friesdorf aa277f7d06 emacs-23 as base for emacs-24
svn path=/nixpkgs/trunk/; revision=31762
2012-01-21 18:28:54 +00:00
Florian Friesdorf 2d0a86d057 conkeror-1.0pre-20120105
svn path=/nixpkgs/trunk/; revision=31761
2012-01-21 18:28:51 +00:00
Florian Friesdorf c9a2081809 conkeror, added myself as maintainer
svn path=/nixpkgs/trunk/; revision=31760
2012-01-21 18:28:48 +00:00
Florian Friesdorf 0c01cddb03 chromium 18.0.975.0-pre114925
svn path=/nixpkgs/trunk/; revision=31759
2012-01-21 18:28:44 +00:00
Florian Friesdorf 98613aa43d chromium, added myself as maintainer
svn path=/nixpkgs/trunk/; revision=31758
2012-01-21 18:28:39 +00:00
Peter Simons f8eee42a66 git-annex: updated to version 3.20120116
svn path=/nixpkgs/trunk/; revision=31757
2012-01-21 14:32:42 +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 185a3d13aa digikam-2.5.0
svn path=/nixpkgs/trunk/; revision=31715
2012-01-19 20:28:13 +00:00
Yury G. Kudryashov 8deba0e4f8 Revert digikam change
svn path=/nixpkgs/trunk/; revision=31714
2012-01-19 20:28:09 +00:00
Yury G. Kudryashov d38c5e7ee4 KTorrent 4.1.3, fix build with KDE 4.8
svn path=/nixpkgs/trunk/; revision=31713
2012-01-19 20:28:05 +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
Ludovic Courtès ed221cf4cc GNUnet 0.9.1.
svn path=/nixpkgs/trunk/; revision=31677
2012-01-18 20:53:00 +00:00
Ludovic Courtès 449c5b537d GNU Zile 2.4.3.
svn path=/nixpkgs/trunk/; revision=31664
2012-01-18 20:51:58 +00:00
Peter Simons 1e4a7842d2 rsync: optional feature (disabled by default) to sync devices
I use this feature for doing snapshot backups, which is way faster
than copying a huge files tree.

The patch is semi-official, rsync-patches is maintained by rsync
upstream itself.
The patch doesn't affect any behaviour, it only adds 1 option
so it shouldn't affect you if you don't use it.

svn path=/nixpkgs/trunk/; revision=31659
2012-01-18 20:38:24 +00:00
Peter Simons db009e0eb8 emacs org-mode: upgraded to latest version
svn path=/nixpkgs/trunk/; revision=31645
2012-01-18 20:32:10 +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
Alexander Tsamutali 6b174cfb82 applications/networking/remote/freerdp: Updated to 1.0.0.
svn path=/nixpkgs/trunk/; revision=31620
2012-01-18 13:45:46 +00:00
Michael Raskin 6fd326a636 Remove obsolete phase
svn path=/nixpkgs/trunk/; revision=31618
2012-01-18 10:27:48 +00:00
Michael Raskin a975a35254 Update Vacuum-IM
svn path=/nixpkgs/trunk/; revision=31617
2012-01-18 10:26:38 +00:00
Arie Middelkoop ef07990836 Update of the 'thunderbird' package to 9.0.1.
Note: this update simplified the nix expression, as some of the problems mentioned in
the original expression do not seem present anymore.

Also note: the original expression did not compile in combination with the 3.1 kernel. 

svn path=/nixpkgs/trunk/; revision=31615
2012-01-17 22:43:26 +00:00
Arie Middelkoop b02bc1ef59 Update of the 'jedit' package.
svn path=/nixpkgs/trunk/; revision=31614
2012-01-17 22:40:05 +00:00
Peter Simons 01bea39bad gource: cosmetic, no functional change
svn path=/nixpkgs/trunk/; revision=31589
2012-01-16 11:33:57 +00:00
Peter Simons 7ccde05271 git-annex: cosmetic change for the meta.license attribute
svn path=/nixpkgs/trunk/; revision=31572
2012-01-15 11:44:08 +00:00
Peter Simons 3c8a798411 gource: added meta information and moved the package into version-management category
svn path=/nixpkgs/trunk/; revision=31570
2012-01-15 11:44:02 +00:00
Peter Simons 97e815a9af git-annex: bumped to version 3.20120113
svn path=/nixpkgs/trunk/; revision=31569
2012-01-15 11:43:57 +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 0c79434ccb svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31567
2012-01-14 21:34:37 +00:00
Yury G. Kudryashov cced3d2b86 Fix compilation with qt-4.8
- Explicitly depend on libX11 and mesa
- Include GL/glu.h

svn path=/nixpkgs/trunk/; revision=31552
2012-01-14 18:03:41 +00:00
Yury G. Kudryashov c2e38f32c0 avogadro: explicitly depend on pkg-config
svn path=/nixpkgs/trunk/; revision=31541
2012-01-14 18:03:01 +00:00
Peter Simons 9ddd085129 subversion: instantiate SASL only when it's actually enabled
svn path=/nixpkgs/trunk/; revision=31532
2012-01-14 12:05:18 +00:00
Peter Simons ef343ed3ab subversion: add sasl support
svn path=/nixpkgs/trunk/; revision=31530
2012-01-14 11:41:06 +00:00
Arie Middelkoop edc1c525ba Removed some debugging info that I forgot to remove *oops*.
svn path=/nixpkgs/trunk/; revision=31525
2012-01-13 22:31:42 +00:00
Arie Middelkoop 0368987722 Desktopitem for the Skype package.
svn path=/nixpkgs/trunk/; revision=31522
2012-01-13 22:21:48 +00:00
Peter Simons bae5b8dabb git-annex: updated to version 3.20120106
svn path=/nixpkgs/trunk/; revision=31509
2012-01-13 09:27:08 +00:00
Peter Simons 6f5294ec94 ikiwiki: updated to version 3.20120109
svn path=/nixpkgs/trunk/; revision=31508
2012-01-13 09:27:05 +00:00
Lluís Batlle i Rossell 4238637b40 Adding GNU archimedes.
svn path=/nixpkgs/trunk/; revision=31505
2012-01-12 19:23:47 +00:00
Lluís Batlle i Rossell 1c186a3207 Making 'withGpg' optional in centerim.
svn path=/nixpkgs/trunk/; revision=31504
2012-01-12 19:00:35 +00:00
Lluís Batlle i Rossell 72aa6f5ffc Adding centerim.
svn path=/nixpkgs/trunk/; revision=31503
2012-01-12 18:55:08 +00:00
Arie Middelkoop 9cea0dd1c6 Update of XChat to 2.8.8; old version 2.8.4 does not compile.
svn path=/nixpkgs/trunk/; revision=31485
2012-01-11 22:32:17 +00:00
Alexander Tsamutali b61e32f19d google-talk-plugin: Updated x86_64 hash.
svn path=/nixpkgs/trunk/; revision=31470
2012-01-10 20:04:37 +00:00
Marco Maggesi 97d48a5426 Update HOL Light to rev 118
svn path=/nixpkgs/trunk/; revision=31468
2012-01-10 16:12:11 +00:00
Yury G. Kudryashov 2b50deaafc svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31459
2012-01-09 17:58:22 +00:00
Yury G. Kudryashov 4a11f058e4 update darktable, apply upstream libpng-15 patch
svn path=/nixpkgs/trunk/; revision=31458
2012-01-09 17:55:31 +00:00
Yury G. Kudryashov 7d018a5bc0 xine-ui: use libpng-1.2
svn path=/nixpkgs/branches/libpng15/; revision=31455
2012-01-09 12:48:45 +00:00
Yury G. Kudryashov 9e269f7e5e svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31452
2012-01-09 10:30:13 +00:00
Yury G. Kudryashov f4a079a76c Upgrade xine-lib and xine-ui
svn path=/nixpkgs/trunk/; revision=31451
2012-01-09 10:25:56 +00:00
Yury G. Kudryashov 365e05f7ce svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31448
2012-01-08 23:33:18 +00:00
Cillian de Roiste d9d74208b5 Adding dvswitch: a digital video mixer intended for interactive live mixing of several incoming DV video streams, typically used for recording conferences
svn path=/nixpkgs/trunk/; revision=31446
2012-01-08 23:27:45 +00:00
Yury G. Kudryashov de228351cd slim needs libpng-1.2.x
svn path=/nixpkgs/branches/libpng15/; revision=31445
2012-01-08 21:33:55 +00:00
Yury G. Kudryashov de82ba69f8 kde4.basket works. Remove kde3.kbasket
svn path=/nixpkgs/trunk/; revision=31442
2012-01-08 20:57:55 +00:00
Yury G. Kudryashov a398e2a401 Add skrooge
svn path=/nixpkgs/trunk/; revision=31438
2012-01-08 19:29:28 +00:00
Yury G. Kudryashov 532930a55f kmymoney-4.6.1
No aqbanking nor gwenhywfar since aqbanking FTBFS

svn path=/nixpkgs/trunk/; revision=31437
2012-01-08 19:29:17 +00:00
Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
Yury G. Kudryashov 3b672f9b75 (lib)gphoto-2.4.11
svn path=/nixpkgs/trunk/; revision=31412
2012-01-07 19:41:59 +00:00
Yury G. Kudryashov cd6824cb9f -kde3.kuickshow, +kde4.kuickshow
svn path=/nixpkgs/trunk/; revision=31407
2012-01-07 17:06:57 +00:00
Yury G. Kudryashov 7e320a7043 State qt version (3/4) in packages, not in all-packages.nix
svn path=/nixpkgs/trunk/; revision=31406
2012-01-07 17:06:49 +00:00
Alexander Tsamutali 69c91f30ce applications/virtualization/qemu: Added 0.15.nix
svn path=/nixpkgs/trunk/; revision=31401
2012-01-07 15:06:49 +00:00
Lluís Batlle i Rossell d1807a7b9b Making fbida cross-build.
svn path=/nixpkgs/trunk/; revision=31400
2012-01-07 15:03:56 +00:00
Yury G. Kudryashov ac911fce68 Fix XaraLX, add debian-patches.sh
svn path=/nixpkgs/trunk/; revision=31358
2012-01-06 18:13:11 +00:00
Shea Levy d788929c64 ledger3: Get building on darwin
svn path=/nixpkgs/trunk/; revision=31351
2012-01-06 15:55:24 +00:00
Shea Levy b884e56aa2 Enable parallel building of ledger 3
svn path=/nixpkgs/trunk/; revision=31350
2012-01-06 15:44:14 +00:00
Shea Levy 06c29d5ae7 Ledger isn't Linux-specific
svn path=/nixpkgs/trunk/; revision=31338
2012-01-06 05:52:21 +00:00
Yury G. Kudryashov 900c6e18cd svn merge ^/nixpkgs/trunk
Conflicts: openssl, libplist

svn path=/nixpkgs/branches/stdenv-updates/; revision=31337
2012-01-06 01:07:45 +00:00
Yury G. Kudryashov 5a0de50cf5 Add kde4.basket
svn path=/nixpkgs/trunk/; revision=31334
2012-01-06 00:55:30 +00:00
Yury G. Kudryashov 80d21cb05b Fix djvulibre compilation
Also remove djview3. Use djview4 instead.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31307
2012-01-05 09:54:46 +00:00
Lluís Batlle i Rossell b1ba53e50d Adding vimprobable2. Patch by Alexander Forenmy.
svn path=/nixpkgs/trunk/; revision=31303
2012-01-04 22:12:43 +00:00
Lluís Batlle i Rossell d0321537d9 Updating dwm to 6.0.
svn path=/nixpkgs/trunk/; revision=31301
2012-01-04 22:05:26 +00:00
Yury G. Kudryashov 394fd28e4e svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31280
2012-01-04 15:22:16 +00:00
Michael Raskin 07de46c2fa Update E prover
svn path=/nixpkgs/trunk/; revision=31269
2012-01-04 10:31:49 +00:00
Yury G. Kudryashov 3d61c49b42 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31268
2012-01-04 09:54:17 +00:00
Karn Kallio ec8e23cc97 In Emacs site-start.el check that NIX_PROFILES is set.
In the stdenv this is not set, which causes an elisp error
which in turn makes builds depending on Emacs (eg gnuplot) fail.

svn path=/nixpkgs/trunk/; revision=31261
2012-01-04 05:48:38 +00:00
Lluís Batlle i Rossell d028c7e00d Adding a preliminary package for librecad. It fails to install still.
svn path=/nixpkgs/trunk/; revision=31255
2012-01-03 21:14:14 +00:00
Florian Friesdorf 5a78287adf added myself to maintainers
svn path=/nixpkgs/trunk/; revision=31254
2012-01-03 20:59:00 +00:00
Florian Friesdorf f051f29fbd load-path also for emacs-22 and emacs-snapshot
svn path=/nixpkgs/trunk/; revision=31253
2012-01-03 20:58:57 +00:00
Florian Friesdorf 195ff32a63 set emacs load-path according to NIX_PROFILES via site-start.el
svn path=/nixpkgs/trunk/; revision=31252
2012-01-03 20:58:54 +00:00
Lluís Batlle i Rossell e43bd7c4ce Made lua and task warrior unstable crossbuild fine
svn path=/nixpkgs/trunk/; revision=31251
2012-01-03 19:12:06 +00:00
Yury G. Kudryashov 2bca92e32d Merge trunk
Conflicts:
1. cmake upgrade: use 2.8.7
2. openssl: left FreeBSD-asm patch.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31245
2012-01-03 17:25:24 +00:00
Eelco Dolstra ab13fb0c34 * Firefox updated to 9.0.1.
svn path=/nixpkgs/trunk/; revision=31236
2012-01-03 15:18:03 +00:00
Yury G. Kudryashov e785aae6e8 Fix most packages depending on fltk
I failed to build cinepaint

svn path=/nixpkgs/trunk/; revision=31224
2012-01-03 10:32:56 +00:00
Yury G. Kudryashov 995d3d3e03 tulip-3.6.1
svn path=/nixpkgs/trunk/; revision=31216
2012-01-02 18:36:04 +00:00
Yury G. Kudryashov 98e4666dcd update xfig, pull a few patches from debian
svn path=/nixpkgs/trunk/; revision=31213
2012-01-02 15:29:14 +00:00
Peter Simons 38f6d36e91 git-annex: updated to version 3.20111231
svn path=/nixpkgs/trunk/; revision=31212
2012-01-02 14:51:26 +00:00
Peter Simons b21a827d2a ikiwiki: updated to version 3.20111229
svn path=/nixpkgs/trunk/; revision=31210
2012-01-02 14:51:20 +00:00
Yury G. Kudryashov cb2202e499 libpano13-2.9.18
svn path=/nixpkgs/trunk/; revision=31209
2012-01-02 14:25:03 +00:00
Yury G. Kudryashov ae88794123 dia-0.97.2
svn path=/nixpkgs/trunk/; revision=31208
2012-01-02 14:13:03 +00:00
Yury G. Kudryashov 08761e83fc Merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
2012-01-02 14:12:40 +00:00
Yury G. Kudryashov 7928d532a2 Fix dia.name
svn path=/nixpkgs/trunk/; revision=31204
2012-01-02 13:42:11 +00:00
Yury G. Kudryashov 097b7635af Explicitly add sqlite to calibre.buildInputs
The better way would be adding sqlite to
pythonPackages.sqlite3.propagatedBuildInputs but I don't want to touch this
code.

svn path=/nixpkgs/trunk/; revision=31197
2012-01-02 10:42:36 +00:00
Florian Friesdorf 90dda8a07f adjusted awesome to generated names of xcbutil-*
svn path=/nixpkgs/trunk/; revision=31186
2011-12-31 06:14:31 +00:00
Florian Friesdorf 8dd443c8df awesome-3.4.11 - ru manpages disabled because of build failure
svn path=/nixpkgs/trunk/; revision=31173
2011-12-31 04:06:02 +00:00
Lluís Batlle i Rossell 3e9953290a THe stable task warrior has a licence GPLv2+, not MIT.
svn path=/nixpkgs/trunk/; revision=31152
2011-12-29 22:28:22 +00:00
Lluís Batlle i Rossell 7d4e6bbec9 Adding task warrior unstable.
svn path=/nixpkgs/trunk/; revision=31151
2011-12-29 22:27:32 +00:00
Lluís Batlle i Rossell 99e6a23f03 Adding task warrior, stable.
svn path=/nixpkgs/trunk/; revision=31150
2011-12-29 22:14:08 +00:00
Eelco Dolstra bf55fb9192 * Fixed Calibre (it was referring to "python2", which doesn't exist)
and updated it to 0.8.32.

svn path=/nixpkgs/trunk/; revision=31140
2011-12-29 16:22:46 +00:00
Marco Maggesi fd64bc5289 Oops!
svn path=/nixpkgs/trunk/; revision=31126
2011-12-28 12:49:29 +00:00
Marco Maggesi ff3b0ed420 Update HOL Light to r116
svn path=/nixpkgs/trunk/; revision=31125
2011-12-28 12:45:59 +00:00
Peter Simons 1d7bc50e9a emacs-modes/magit: updated to 1.1.0.0
svn path=/nixpkgs/trunk/; revision=31106
2011-12-26 20:24:59 +00:00
Lluís Batlle i Rossell 94a638d119 Updating digikam.
Now at least digikam now passes the configure stage. I've still not finished building it though.


svn path=/nixpkgs/trunk/; revision=31080
2011-12-25 22:54:32 +00:00
Yury G. Kudryashov f77741e018 merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31067
2011-12-25 05:47:23 +00:00
Peter Simons c7bed207d8 maxima: updated to version 5.26.0
svn path=/nixpkgs/trunk/; revision=31042
2011-12-22 12:30:19 +00:00
Michael Raskin 64290dbd96 Try updating veracity
svn path=/nixpkgs/trunk/; revision=30990
2011-12-20 21:37:23 +00:00
Eelco Dolstra 63c643d072 * Firefox 9.0.
svn path=/nixpkgs/trunk/; revision=30985
2011-12-20 14:51:26 +00:00
Lluís Batlle i Rossell 25bf67915d Updating kicad.
svn path=/nixpkgs/trunk/; revision=30953
2011-12-18 14:49:39 +00:00
Yury G. Kudryashov a670a7aca1 merge trunk
A few conflicts due to renames

svn path=/nixpkgs/branches/stdenv-updates/; revision=30947
2011-12-16 22:57:21 +00:00
Yury G. Kudryashov 1e74801dc4 wacomtablet-1.3.5
svn path=/nixpkgs/trunk/; revision=30946
2011-12-16 22:33:28 +00:00
Yury G. Kudryashov 9d43831de2 krusader-2.4.0beta1
svn path=/nixpkgs/trunk/; revision=30945
2011-12-16 22:33:16 +00:00
Yury G. Kudryashov bbc4ac6e9f rsibreak-0.11
Add some metadata

svn path=/nixpkgs/trunk/; revision=30941
2011-12-16 19:55:40 +00:00
Yury G. Kudryashov eff443fdd7 yakuake-2.9.8
svn path=/nixpkgs/trunk/; revision=30938
2011-12-16 19:38:34 +00:00
Peter Simons bf2e8e0bcc amarok: added missing function arguments
svn path=/nixpkgs/trunk/; revision=30932
2011-12-16 11:44:40 +00:00
Yury G. Kudryashov 2c3b02169f rekonq-0.8.1
svn path=/nixpkgs/trunk/; revision=30930
2011-12-16 10:48:59 +00:00
Yury G. Kudryashov 0971831ddc Reintegrate branches/drop-kde4.5
svn path=/nixpkgs/trunk/; revision=30928
2011-12-16 10:39:22 +00:00
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