Updating from trunk. I resolved simple conflicts.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
This commit is contained in:
Lluís Batlle i Rossell
2010-12-11 12:47:00 +00:00
106 changed files with 2507 additions and 484 deletions
+4 -4
View File
@@ -1,9 +1,9 @@
rec {
version="1.3.4";
name="wine-1.3.4";
hash="1p2zh9c3k0b2ryy8cdldcz6x7mdg0c2gkvj0hxa3bi9cczsqg4s4";
version="1.3.8";
name="wine-1.3.8";
hash="1nxz2xm9xndrsiaiw18g0098dkw7p2k32qsnm0l47giw2h6gdsvf";
url="http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2";
advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.4.tar.bz2";
advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.8.tar.bz2";
}