public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging from trunk.

Browse Source 
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
This commit is contained in:
Lluís Batlle i Rossell
2010-01-14 14:49:31 +00:00
parent c161cd1773 c63858a169
commit 9183f21f7e
167 changed files with 3562 additions and 1240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/misc/emulators/wine/default.nix
View File

@@ -45,5 +45,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.winehq.org/";
license = "LGPL";
description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
maintainers = [ stdenv.lib.maintainers.raskin ];
platforms = [ "i686-linux" ];
};
}

8
pkgs/misc/emulators/wine/src-for-default.nix
View File

@@ -1,9 +1,9 @@
rec {
version="1.1.34";
name="wine-1.1.34";
hash="1llsm6h0s765n0s5nvr852iyml2ckdd7vq96dhqjlck5vr4nxsns";
version="1.1.36";
name="wine-1.1.36";
hash="0b22w68w7z4in21xy286yddix6sf4jna919z2lw2p9hxsgzvhlwk";
url="http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2";
advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.1.34.tar.bz2";
advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.1.36.tar.bz2";
}