Commit graph

511 commits

Author SHA1 Message Date
Lluís Batlle i Rossell df68759142 Updating from trunk, to get the new mldonkey.
Cleaning the mldonkey expression to build with the ocaml native compiler in some
platforms, and with the bytecode in others.
Removing the flag to support ocaml-3.11.1, as it is included in this new
version of mldonkey.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19487
2010-01-16 16:41:33 +00:00
Lluís Batlle i Rossell 70dd97620c Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=19485
2010-01-16 15:19:23 +00:00
Lluís Batlle i Rossell 89944b6cf0 Updating unison.
svn path=/nixpkgs/trunk/; revision=19468
2010-01-15 15:09:46 +00:00
Lluís Batlle i Rossell 9183f21f7e Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00
Ludovic Courtès 5080aa43d3 GNUnet: Add `meta.platforms'.
svn path=/nixpkgs/trunk/; revision=19414
2010-01-13 21:34:45 +00:00
Eelco Dolstra de360dbe76 * Firefox 3.0.17.
svn path=/nixpkgs/trunk/; revision=19392
2010-01-13 13:21:06 +00:00
Armijn Hemel 577f4d8325 update to 2.6.5, also add python dependency for extensions and all that
svn path=/nixpkgs/trunk/; revision=19352
2010-01-11 13:25:05 +00:00
Eelco Dolstra cdc307536c * Firefox 3.5.7.
svn path=/nixpkgs/trunk/; revision=19349
2010-01-11 10:43:29 +00:00
Ludovic Courtès 8048817e1e GNU IceCat 3.5.7.
svn path=/nixpkgs/trunk/; revision=19348
2010-01-11 10:16:50 +00:00
Armijn Hemel ae80a8ed48 update to 3.0.7, requires perl now
svn path=/nixpkgs/trunk/; revision=19231
2010-01-05 12:29:58 +00:00
Ludovic Courtès bfb476c7d6 GNUnet 0.8.1.
svn path=/nixpkgs/trunk/; revision=19219
2010-01-05 11:16:42 +00:00
Rob Vermaas c5157f7d9d re-added libjpeg62 for chrome, updated chrome
svn path=/nixpkgs/trunk/; revision=19199
2010-01-04 07:47:32 +00:00
Marc Weber bbf8253985 adding debug version of i686 flash player. See comments
svn path=/nixpkgs/trunk/; revision=19195
2010-01-04 07:44:24 +00:00
Eelco Dolstra 05fce85edc * Thunderbird 3.0. It doesn't use the Xulrunner package, as building
against an external Xulrunner seems to be unsupported currently.

svn path=/nixpkgs/trunk/; revision=19169
2010-01-02 13:21:50 +00:00
Eelco Dolstra 0dc9f7dd4f * Put the Thunderbird 2 and 3 expressions in one directory.
svn path=/nixpkgs/trunk/; revision=19167
2010-01-01 16:35:43 +00:00
Armijn Hemel c8af5fd4dc update to 1.2.4
svn path=/nixpkgs/trunk/; revision=19162
2009-12-30 22:11:43 +00:00
Rob Vermaas 6f41d4d034 different hash flash player 10
svn path=/nixpkgs/trunk/; revision=19149
2009-12-30 07:17:42 +00:00
Lluís Batlle i Rossell d864771e26 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19139
2009-12-28 11:40:34 +00:00
Armijn Hemel d993cf0f5f add voice and video
svn path=/nixpkgs/trunk/; revision=19136
2009-12-27 16:49:08 +00:00
Armijn Hemel 500f81e68d update to 1.5.20, add perl as extra dependency
svn path=/nixpkgs/trunk/; revision=19127
2009-12-25 20:02:31 +00:00
Armijn Hemel c066f11f80 update to 3.0.6
svn path=/nixpkgs/trunk/; revision=19120
2009-12-25 18:33:44 +00:00
Armijn Hemel c79eb46c7e update to 2.7.1
svn path=/nixpkgs/trunk/; revision=19119
2009-12-25 18:27:48 +00:00
Armijn Hemel 2009c65a99 konversation project website has moved, konversation.org has been abandoned
svn path=/nixpkgs/trunk/; revision=19117
2009-12-25 17:17:24 +00:00
Armijn Hemel 29bd8e55f8 update to 0.8.14
svn path=/nixpkgs/trunk/; revision=19116
2009-12-25 17:15:44 +00:00
Armijn Hemel 0814a30d2c update to 2.8.7
svn path=/nixpkgs/trunk/; revision=19111
2009-12-25 14:34:11 +00:00
Armijn Hemel a53ab8a2e7 update to 1.3.2
svn path=/nixpkgs/trunk/; revision=19107
2009-12-25 12:38:08 +00:00
Armijn Hemel 2e6b173032 update to 2.6.4. voice and video are not working atm
svn path=/nixpkgs/trunk/; revision=19086
2009-12-23 21:05:29 +00:00
Eelco Dolstra 6eb6fec8a1 * Firefox 3.5.6.
svn path=/nixpkgs/trunk/; revision=19075
2009-12-22 09:07:19 +00:00
Ludovic Courtès 310d6e4bbf Update from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19066
2009-12-21 11:09:23 +00:00
Ludovic Courtès 99f646595c GNU IceCat 3.5.6.
svn path=/nixpkgs/trunk/; revision=19053
2009-12-20 19:49:40 +00:00
Lluís Batlle i Rossell dae3eb2383 Merging from trunk.
I resolved two conflicts:
- cmake (trunk fixes + stdenv-updates cross-compiling)
- all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44)


svn path=/nixpkgs/branches/stdenv-updates/; revision=18912
2009-12-12 18:39:09 +00:00
Marc Weber f62924477e fix hash of libCSS (netsurf browser)
svn path=/nixpkgs/trunk/; revision=18908
2009-12-12 00:20:29 +00:00
Marc Weber 5319704f80 removing old bleeding edge cruft replacing it by a niftier version using
source regions which are substituded by the tool nix-repository-manager.
See http://github.com/MarcWeber/nix-repository-manager/raw/master/README.

sourceByName is called sourceFromHead now.

updates: MPlayerTrunk, haxe, neko, netsurf, cinelerra, ctags
cinelerra does no longer build due to Xorg update

svn path=/nixpkgs/trunk/; revision=18894
2009-12-11 13:58:23 +00:00
Lluís Batlle i Rossell 89fe676bb3 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
2009-12-10 14:48:45 +00:00
Marco Maggesi ec6f4788bb Fixed download url for Unison File Syncronizer.
svn path=/nixpkgs/trunk/; revision=18793
2009-12-03 16:40:18 +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
Eelco Dolstra 0df5c155c6 * Firefox 3.5.5.
svn path=/nixpkgs/trunk/; revision=18548
2009-11-22 22:40:39 +00:00
Rob Vermaas 132a1db1ee newer version of chrome (32599)
svn path=/nixpkgs/trunk/; revision=18520
2009-11-22 14:41:38 +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 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
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
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
Michael Raskin dbb59beb89 Update uzbl-experimental
svn path=/nixpkgs/trunk/; revision=18182
2009-11-06 06:22:22 +00:00