Commit Graph

476 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
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
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
Rob Vermaas
724d21e3b0 updated version of chrome
svn path=/nixpkgs/trunk/; revision=18131
2009-11-05 10:50:57 +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
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
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
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
Marc Weber
5b3c7c6b7a wireshark update - old source vanished
svn path=/nixpkgs/trunk/; revision=17865
2009-10-18 04:43:59 +00:00
Marc Weber
2db48fc660 skype url changed
patch provided by Russell O'Connor

svn path=/nixpkgs/trunk/; revision=17796
2009-10-14 03:13:44 +00:00
Lluís Batlle i Rossell
331d7185f2 Adding vnstat. Unless using "vnstat -l", it wants some directories in /var, where
it collects information.

svn path=/nixpkgs/trunk/; revision=17753
2009-10-12 11:08:52 +00:00
Lluís Batlle i Rossell
71fab59b62 Adding iptraf 3.0.0 (the last iptraf I found, last updated in 2005)
It runs without complains if you "mkdir -p /var/run/iptraf /var/local/iptraf"

svn path=/nixpkgs/trunk/; revision=17752
2009-10-12 10:52:47 +00:00
Michael Raskin
7469c3da48 move to fetchgit as github tarballs are unpredictable
svn path=/nixpkgs/trunk/; revision=17662
2009-10-06 05:58:56 +00:00
Michael Raskin
9c1972dc20 With our dependency tree WebKit can only work on Linux..
svn path=/nixpkgs/trunk/; revision=17535
2009-09-30 07:52:18 +00:00
Michael Raskin
58f543a167 Add myself as midori maintainer
svn path=/nixpkgs/trunk/; revision=17527
2009-09-30 06:31:13 +00:00
Michael Raskin
6e5fc2e7d3 Updating uzbl-experimental
svn path=/nixpkgs/trunk/; revision=17490
2009-09-29 06:55:00 +00:00
Michael Raskin
2750e04339 Adding uzbl experimental snapshot
svn path=/nixpkgs/trunk/; revision=17344
2009-09-22 03:51:04 +00:00
Marc Weber
c28aeffc87 finally fixing netsurf
svn path=/nixpkgs/trunk/; revision=17328
2009-09-21 10:09:20 +00:00
Marc Weber
34be37b51e adding twinkle, a voice over IP phone software
svn path=/nixpkgs/trunk/; revision=17303
2009-09-20 17:01:19 +00:00
Marc Weber
b6580e4b14 adding kphone
svn path=/nixpkgs/trunk/; revision=17265
2009-09-18 21:16:32 +00:00
Eelco Dolstra
00343dac28 * Firefox 3.5.3.
svn path=/nixpkgs/trunk/; revision=17098
2009-09-13 18:17:44 +00:00
Eelco Dolstra
538fd39f44 * Thunderbird 2.0.0.23 doesn't compile, but 2.0.0.22 does.
svn path=/nixpkgs/trunk/; revision=17097
2009-09-13 18:07:10 +00:00
Eelco Dolstra
a54fc7e7f7 svn path=/nixpkgs/trunk/; revision=17083 2009-09-13 10:54:47 +00:00
Marc Weber
5478df996a adding netsurf browser. No JavaScript yet
svn path=/nixpkgs/trunk/; revision=17077
2009-09-13 08:54:47 +00:00
Ludovic Courtès
5d459c6465 GNU IceCat 3.5.3.
svn path=/nixpkgs/trunk/; revision=17073
2009-09-12 21:19:01 +00:00
Michael Raskin
7c38144378 Temporarily (?) reverting Thunderbird update because updated version failed to build for ununderstandable reasons
svn path=/nixpkgs/trunk/; revision=17061
2009-09-12 05:36:07 +00:00
Michael Raskin
37cbc33a6e Try harder to forcefeed sqlite3 into the build process
svn path=/nixpkgs/trunk/; revision=17060
2009-09-11 20:10:55 +00:00
Michael Raskin
a497fc4d6f Fix typo
svn path=/nixpkgs/trunk/; revision=17059
2009-09-11 19:34:03 +00:00