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

Merge remote-tracking branch 'eelco/master' into stdenv-updates

Browse Source 
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
This commit is contained in:
Lluís Batlle i Rossell
2012-12-28 23:28:16 +01:00
parent 88b11196c1 fde74242bf
commit b58780c43d
135 changed files with 1945 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/emulators/wine/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/wine/${name}.tar.bz2";
sha256 = "08qhjqia2g6pm5rnawcvfz64pm2pmjaxafmwdyn950rdwrd7kbai";
sha256 = "0c14paj2j3sswl6mpjjmy9bxnpijk095ks58x9dsycx9c8x0gqvm";
};
gecko = fetchurl {
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
version = "1.5.19";
version = "1.5.20";
homepage = "http://www.winehq.org/";
license = "LGPL";
description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";