Commit graph

1583 commits

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