Commit graph

1635 commits

Author SHA1 Message Date
Lluís Batlle i Rossell 32f2dda5de Fixing hugin (we now install boost without tags on library file names, and
the hugin expression still used the tag for 'multithread' in the boost library
file names).

svn path=/nixpkgs/trunk/; revision=18698
2009-11-29 19:22:22 +00:00
Peter Simons af0a961e3d pkgs/applications/editors/emacs-modes/prolog: initial version of prolog-mode for Emacs
svn path=/nixpkgs/trunk/; revision=18675
2009-11-27 17:40:56 +00:00
Lluís Batlle i Rossell a3403e6828 Finishing the update from trunk, having resolved the eclipse related directory
renaming.
I think directory renaming breaks the usual merges... because it leaves the
'to be removed' directory in the working directory still. A manual 'rm' of the
'to be removed' directory fixed the commit.

svn merge  ^/nixpkgs/trunk


svn path=/nixpkgs/branches/stdenv-updates/; revision=18661
2009-11-26 21:46:08 +00:00
Lluís Batlle i Rossell 3cda62f6e1 Trying to merge from trunk the eclipse-classic -> eclipse move.
svn merge -r 18485:18486 ^/nixpkgs/trunk



svn path=/nixpkgs/branches/stdenv-updates/; revision=18660
2009-11-26 21:42:46 +00:00
Lluís Batlle i Rossell adc61253b9 Merging from trunk, partially, to get rid of the annoying failing commits from
svn when files were removed, recreated and whatever...
 svn merge -r 18479:18485 ^/nixpkgs/trunk



svn path=/nixpkgs/branches/stdenv-updates/; revision=18659
2009-11-26 21:34:53 +00:00
Ludovic Courtès f1f286052e Remove `unpackCmd's not needed with GNU tar format auto-detection (r18492).
svn path=/nixpkgs/branches/stdenv-updates/; revision=18653
2009-11-26 15:50:26 +00:00
Eelco Dolstra a71971f671 * Inkscape 0.47.
svn path=/nixpkgs/trunk/; revision=18641
2009-11-26 12:39:22 +00:00
Ludovic Courtès 57fa034f8a Geeqie: Fix typos.
svn path=/nixpkgs/trunk/; revision=18615
2009-11-25 09:08:27 +00:00
Ludovic Courtès aca6f17400 Add Geeqie, a GQview fork.
svn path=/nixpkgs/trunk/; revision=18613
2009-11-25 08:58:42 +00:00
Lluís Batlle i Rossell 6f2e018c7a Enabling plugins in avidemux.
Adding an assertion, for stdenv having glibc. avidemux wants pthreads.

svn path=/nixpkgs/trunk/; revision=18593
2009-11-24 14:01:48 +00:00
Lluís Batlle i Rossell d634b32abf Adding avidemux.
svn path=/nixpkgs/trunk/; revision=18584
2009-11-24 08:27:18 +00:00
Eelco Dolstra 0df5c155c6 * Firefox 3.5.5.
svn path=/nixpkgs/trunk/; revision=18548
2009-11-22 22:40:39 +00:00
Eelco Dolstra 11c3e92738 * Bring back Emacs 22 by request from Ludovic.
svn path=/nixpkgs/trunk/; revision=18529
2009-11-22 16:29:15 +00:00
Rob Vermaas 132a1db1ee newer version of chrome (32599)
svn path=/nixpkgs/trunk/; revision=18520
2009-11-22 14:41:38 +00:00
Ludovic Courtès 96d3032ea0 Fix Ufraw.
svn path=/nixpkgs/trunk/; revision=18510
2009-11-21 22:30:00 +00:00
Eelco Dolstra 86f8f47d87 * eclipse-classic -> eclipse.
svn path=/nixpkgs/trunk/; revision=18486
2009-11-20 15:33:06 +00:00
Eelco Dolstra e0491358eb * Removed a lot of old Eclipse versions.
* Cleaned up the Eclipse classic expression a bit (e.g. use
  makeWrapper).  Also fall back to GTK 2.16 to fix some GUI glitches.

svn path=/nixpkgs/trunk/; revision=18485
2009-11-20 15:19:00 +00:00
Lluís Batlle i Rossell e85500987b Merging from trunk. I had to do two manual merges, quite trivial I think.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18472
2009-11-19 19:09:10 +00:00
Eelco Dolstra 58f543f19f * Remove some old Emacs versions.
svn path=/nixpkgs/trunk/; revision=18470
2009-11-19 17:36:43 +00:00
Eelco Dolstra 7f5b839524 * Removed selectVersion. There's no good reason to write
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
  packages.
* Renamed several files to `default.nix'.  As a general rule, version
  numbers should only be included in the filename when there is a
  reason to keep multiple versions of a package in Nixpkgs.
  Otherwise, it just makes it harder to update the package.

svn path=/nixpkgs/trunk/; revision=18403
2009-11-18 09:39:59 +00:00
Lluís Batlle i Rossell 6864119104 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18341
2009-11-13 19:19:34 +00:00
Marc Weber f5d0193047 synergy broke by xorg-update
svn path=/nixpkgs/trunk/; revision=18335
2009-11-12 16:11:44 +00:00
Rob Vermaas b325a34361 chrome 31663
svn path=/nixpkgs/trunk/; revision=18328
2009-11-11 15:34:21 +00:00
Ludovic Courtès 8799678836 GNU IceCat 3.5.5.
svn path=/nixpkgs/trunk/; revision=18327
2009-11-11 14:24:52 +00:00
Rob Vermaas efe661ab0e update chrome to version 31662 to let dropdownlists work properly again
svn path=/nixpkgs/trunk/; revision=18326
2009-11-11 14:06:57 +00:00
Marco Maggesi e2057ffe04 Add package ledger
svn path=/nixpkgs/trunk/; revision=18316
2009-11-10 11:02:45 +00:00
Lluís Batlle i Rossell de6aa89c45 Updating xchm.
svn path=/nixpkgs/trunk/; revision=18310
2009-11-09 11:55:31 +00:00
Lluís Batlle i Rossell 4f906f38a8 Updating qemu to 0.11.0, and making it use stdenv with the usual gcc, and not an older.
svn path=/nixpkgs/trunk/; revision=18305
2009-11-09 09:15:58 +00:00
Michael Raskin 24162c6b4a Fix fetchmtn
svn path=/nixpkgs/trunk/; revision=18298
2009-11-08 22:12:14 +00:00
Lluís Batlle i Rossell 4326d07c11 Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates2/; revision=18278
2009-11-08 01:57:40 +00:00
Lluís Batlle i Rossell f1ee14bfaf Removing fetchgit --depth and its usage. It does not provide much advantages...
I think it takes the recent N commits into the repository, which says very little,
even for wanting master/HEAD.

svn path=/nixpkgs/trunk/; revision=18277
2009-11-08 01:51:20 +00:00
Lluís Batlle i Rossell 17876de2c5 Updating from trunk.
Many property change come, all on merge info, because those files have explicit merge info
in trunk already.
It is a problem in trunk, not in stdenv-updates. Every time we will update from trunk, the explcit merge info for these files will be updated.


svn path=/nixpkgs/branches/stdenv-updates2/; revision=18274
2009-11-08 00:40:07 +00:00
Lluís Batlle i Rossell 4b27d28701 Porting changes from stdenv-updates into this branch.
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
2009-11-08 00:32:12 +00:00
Michael Raskin cd5338a18c Fix Uzbl build
svn path=/nixpkgs/trunk/; revision=18269
2009-11-07 23:09:36 +00:00
Andres Löh c3e966b0cb Updated xmonad to 0.9.
svn path=/nixpkgs/trunk/; revision=18204
2009-11-06 13:08:47 +00:00
Sander van der Burg 866bbe32f2 Updated VirtualBox guest additions and changed some files to support Xorg 7.5
svn path=/nixpkgs/trunk/; revision=18199
2009-11-06 11:41:34 +00:00
Sander van der Burg ab55ac28b4 Upgraded VirtualBox to 3.0.10
svn path=/nixpkgs/trunk/; revision=18196
2009-11-06 11:31:28 +00:00
Michael Raskin dbb59beb89 Update uzbl-experimental
svn path=/nixpkgs/trunk/; revision=18182
2009-11-06 06:22:22 +00:00
Michael Raskin 183e6593be One more program needs libXi explicitly passed..
svn path=/nixpkgs/trunk/; revision=18181
2009-11-06 05:14:41 +00:00
Michael Raskin 4d02c927e6 Fix ratpoison dependencies
svn path=/nixpkgs/trunk/; revision=18166
2009-11-05 21:53:37 +00:00
Michael Raskin 3be216a703 Links2 works in FB without directfb just fine
svn path=/nixpkgs/trunk/; revision=18157
2009-11-05 21:09:36 +00:00
Marco Maggesi c713b0ed67 Preliminary version of package ssreflect
Add expression for ssreflect, an extension to the Coq Proof Assistant.
Still has some clitches (see TODO in default.nix) but is usable anyway.


svn path=/nixpkgs/trunk/; revision=18145
2009-11-05 15:08:12 +00:00
Rob Vermaas 724d21e3b0 updated version of chrome
svn path=/nixpkgs/trunk/; revision=18131
2009-11-05 10:50:57 +00:00
Eelco Dolstra b039fddfbc * Merged the xorg-7.5 branch, which provides X.org 7.5 and various
other X-related updates.

svn path=/nixpkgs/trunk/; revision=18124
2009-11-04 22:42:44 +00:00
Lluís Batlle i Rossell 2e8ae96930 Updating vwm and its libraries.
svn path=/nixpkgs/trunk/; revision=18123
2009-11-04 22:38:26 +00:00
Eelco Dolstra 4f839e9a54 * Sync with the trunk.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18122
2009-11-04 22:37:24 +00:00
Lluís Batlle i Rossell 13a369476b Updating truecrypt from 6.2a to 6.3, mostly because the old src disappeared.
svn path=/nixpkgs/trunk/; revision=18121
2009-11-04 22:17:08 +00:00
Eelco Dolstra ac4d183051 * Added gnome-icon-theme.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18118
2009-11-04 21:44:01 +00:00
Eelco Dolstra 7a233c1629 * GIMP updated to 2.6.7. It no longer needs libgtkhtml.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18117
2009-11-04 21:28:11 +00:00
Eelco Dolstra 25a675da23 * Subversion 1.6.6.
svn path=/nixpkgs/trunk/; revision=18093
2009-11-04 13:41:55 +00:00
Peter Simons 3659747127 pkgs/applications/editors/emacs-modes/haskell/default.nix: updated to version 2.6.1
svn path=/nixpkgs/trunk/; revision=18089
2009-11-04 10:29:38 +00:00
Peter Simons b06c0d1a1d pkgs/applications/version-management/git-and-tools/default.nix: use docbook dtd 4.5
Ensure that the 4.5 DTD required by asciidoc is available.

svn path=/nixpkgs/trunk/; revision=18078
2009-11-03 15:57:31 +00:00
Peter Simons 990d7c05e7 pkgs/applications/window-managers/ratpoison/default.nix: updated to version 1.4.5
svn path=/nixpkgs/trunk/; revision=18075
2009-11-03 15:57:17 +00:00
Sander van der Burg 5ed64ae7c0 Enabled my eclipse package again, since I want to have eclipse installed when typing nix-env -i. BTW. the eclipse plugins can be installed this way either
svn path=/nixpkgs/trunk/; revision=18074
2009-11-03 11:00:18 +00:00
Marco Maggesi a0207b3dc7 Updated Coq to version 8.2pl1
svn path=/nixpkgs/trunk/; revision=18069
2009-11-02 11:44:27 +00:00
Ludovic Courtès dc673480e6 GNU Zile 2.3.13.
svn path=/nixpkgs/trunk/; revision=18066
2009-11-01 20:55:14 +00:00
Ludovic Courtès 806a5a9b6c GNU IceCat 3.5.4.
svn path=/nixpkgs/trunk/; revision=18064
2009-11-01 14:47:13 +00:00
Eelco Dolstra 65c0916cb7 * Updated Firefox 3.0.x to 3.0.15 (because the old tarball disappeared).
svn path=/nixpkgs/branches/xorg-7.5/; revision=18054
2009-10-30 12:45:28 +00:00
Rob Vermaas a73cef1057 added chromeWrapper, like firefoxWrapper, to allow plugins to work, added previously undefined dependencies on flash plugin
svn path=/nixpkgs/trunk/; revision=18050
2009-10-30 12:28:44 +00:00
Rob Vermaas d025709a8a chrome 20565
svn path=/nixpkgs/trunk/; revision=18046
2009-10-30 08:45:58 +00:00
Peter Simons 7fa0d73966 pkgs/applications/science/math/wxmaxima/default.nix: cosmetic changes
Note that wxMaxima does *not* have a proper store path to maxima built
into the binary. It relies on $PATH, /etc/wxMaxima.conf, or ~/.wxMaxima
to find the binary.

svn path=/nixpkgs/trunk/; revision=18020
2009-10-29 12:53:22 +00:00
Peter Simons d330b000fc Updated git to version 1.6.5.2.
svn path=/nixpkgs/trunk/; revision=18018
2009-10-29 12:06:04 +00:00
Peter Simons 96a32cffe2 Added wxMaxima version 0.8.3.
svn path=/nixpkgs/trunk/; revision=18015
2009-10-29 11:57:58 +00:00
Peter Simons 5dd3252557 Updated Maxima to version 5.19.2.
svn path=/nixpkgs/trunk/; revision=18014
2009-10-29 11:57:45 +00:00
Eelco Dolstra 82baac23a7 * Idem for gtk-libs/2.16.
svn path=/nixpkgs/trunk/; revision=17993
2009-10-28 15:31:52 +00:00
Eelco Dolstra 5398eceff3 * Getting rid of gtk-libs by moving the packages in gtk-libs to
development/libraries/{glib,gtk+,pango,atk,...}.  Done for glib/gtk+
  1.2.  Also deleted some obsolete, unused versions (gtkLibs 2.10,
  2.12, and 2.14).

svn path=/nixpkgs/trunk/; revision=17992
2009-10-28 15:06:18 +00:00
Eelco Dolstra f53195f29e * Improved a bunch of "name" attributes (mostly missing version
numbers).

svn path=/nixpkgs/trunk/; revision=17991
2009-10-28 14:06:56 +00:00
Eelco Dolstra 64f2e5d8e4 * Firefox 3.5.4.
svn path=/nixpkgs/trunk/; revision=17984
2009-10-28 11:47:48 +00:00
Michael Raskin cd04c58fe2 Allow not-that-shallow git fetches; enable it for uzbl
svn path=/nixpkgs/trunk/; revision=17980
2009-10-27 19:52:01 +00:00
Marc Weber a7261348d8 Netsurf update
svn path=/nixpkgs/trunk/; revision=17978
2009-10-27 17:46:45 +00:00
Marc Weber 748dd33b25 hg2git has been put into repo fast-export. make it work again
svn path=/nixpkgs/trunk/; revision=17977
2009-10-27 17:46:37 +00:00
Michael Raskin bd7526951e Adding Links2
svn path=/nixpkgs/trunk/; revision=17949
2009-10-24 15:39:54 +00:00
Michael Raskin 59613ffe56 Updating uzbl-experimental
svn path=/nixpkgs/trunk/; revision=17932
2009-10-23 05:26:02 +00:00
Marc Weber efca5daeb7 tell skype where to find its resources - by Russell O'Connor
svn path=/nixpkgs/trunk/; revision=17924
2009-10-22 15:41:34 +00:00
Ludovic Courtès be6b6b73f9 Add Emacs Scala-Mode.
svn path=/nixpkgs/trunk/; revision=17904
2009-10-20 15:12:29 +00:00
Peter Simons 4cf582c570 pkgs/applications/version-management/git-and-tools/git/default.nix: dropped 'set -x' from builder script
svn path=/nixpkgs/trunk/; revision=17903
2009-10-20 14:08:58 +00:00
Peter Simons 2139d48872 pkgs/applications/version-management/git-and-tools/git/default.nix: updated to version 1.6.5.1
svn path=/nixpkgs/trunk/; revision=17902
2009-10-20 14:08:53 +00:00
Eelco Dolstra 24661f4c45 svn path=/nixpkgs/trunk/; revision=17892 2009-10-20 10:33:38 +00:00
Michael Raskin 708c876572 Update LyX
svn path=/nixpkgs/trunk/; revision=17890
2009-10-20 06:57:29 +00:00
Lluís Batlle i Rossell 3b3ee13b9d Updating lame
Updating libgpod
Making gtkpod accept 'ogg' files, and made it convert them well to mp3, if 'lame'
and oggdec is in path. It should better reference lame and libvorbis store path
files.

svn path=/nixpkgs/trunk/; revision=17888
2009-10-19 22:05:34 +00:00
Marc Weber 5411beb172 fix for other platforms (suggested by Eelco Dolstra)
svn path=/nixpkgs/trunk/; revision=17887
2009-10-19 20:47:21 +00:00
Ludovic Courtès 2aaf37cdf9 Add UFRaw.
svn path=/nixpkgs/trunk/; revision=17881
2009-10-19 12:50:45 +00:00
Marc Weber da731ce190 doh!
svn path=/nixpkgs/trunk/; revision=17877
2009-10-19 12:27:51 +00:00
Marc Weber 9ea9133183 adding scribus - don't miss the comment about fonts!
svn path=/nixpkgs/trunk/; revision=17866
2009-10-18 04:44:01 +00:00
Marc Weber 5b3c7c6b7a wireshark update - old source vanished
svn path=/nixpkgs/trunk/; revision=17865
2009-10-18 04:43:59 +00:00
Marc Weber 523d1b8216 updating sox, adding maintainer, enabling mp3 support
svn path=/nixpkgs/trunk/; revision=17864
2009-10-18 04:43:56 +00:00
Marc Weber dd3564aba9 adding ps2edit
svn path=/nixpkgs/trunk/; revision=17863
2009-10-18 04:43:53 +00:00
Marc Weber 6614345f29 adding yate2 telephony engine
svn path=/nixpkgs/trunk/; revision=17861
2009-10-18 04:43:48 +00:00
Marc Weber 84a2555b2c topgit: remove obsolete patches
svn path=/nixpkgs/trunk/; revision=17859
2009-10-18 04:43:43 +00:00
Marc Weber f808690b16 adding python package lxml to make scripts in inkscape work
svn path=/nixpkgs/trunk/; revision=17858
2009-10-18 04:43:40 +00:00
Sander van der Burg d72c439a26 The OpenOffice.org icons should work now. I really mean it this time
svn path=/nixpkgs/trunk/; revision=17854
2009-10-16 15:31:31 +00:00
Sander van der Burg 702871ef25 It appears that the OpenOffice.org desktop files are read only. Changing this so that they can be adapted
svn path=/nixpkgs/trunk/; revision=17853
2009-10-16 12:16:17 +00:00
Sander van der Burg 3c00ca8da0 Corrected path to the .desktop files. Why do I keep making these silly mistakes?
svn path=/nixpkgs/trunk/; revision=17846
2009-10-16 08:56:35 +00:00
Michael Raskin 7d52bceffb Adding support of external utilities in ikiwiki
svn path=/nixpkgs/trunk/; revision=17845
2009-10-16 08:38:25 +00:00
Michael Raskin 206a941597 Add optional Monotone support for ikiwiki; made git support optional.
svn path=/nixpkgs/trunk/; revision=17842
2009-10-16 06:39:29 +00:00
Michael Raskin 22644a3fb6 Remove the debugging config copying. The actual expression hasn't changed for quite a while anyway
svn path=/nixpkgs/trunk/; revision=17841
2009-10-16 05:15:44 +00:00
Lluís Batlle i Rossell 54a04a789a Made ikiwiki work at least using 'git'. I tested the CGI this time.
I had to add some perl modules again.

svn path=/nixpkgs/trunk/; revision=17838
2009-10-15 22:08:35 +00:00
Sander van der Burg 9dced99013 It seems that the OpenOffice.org desktop files have wrong icon identifiers. I corrected them now. Maybe I'll win the most wasted builtime award now
svn path=/nixpkgs/trunk/; revision=17835
2009-10-15 20:48:58 +00:00
Ludovic Courtès 2ea3e03077 Snd: Don't expect /tmp to be writable.
svn path=/nixpkgs/trunk/; revision=17834
2009-10-15 16:53:45 +00:00
Sander van der Burg ea9a9e5fae Fixed directory name for OpenOffice icons, sorry everyone
svn path=/nixpkgs/trunk/; revision=17826
2009-10-15 13:00:43 +00:00