Update wine (use new updater script in the process)

svn path=/nixpkgs/trunk/; revision=16817

3 files changed, 16 insertions, 4 deletions

diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 1978d8ab2e84..f754951b4d41 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -6,14 +6,17 @@
 assert stdenv.isLinux;
 assert stdenv.gcc.gcc != null;
 
-let lib = import ../../../lib/default.nix; in
+let 
+  lib = import ../../../lib/default.nix; 
+  s = import ./src-for-default.nix;
+in
 
 stdenv.mkDerivation rec {
-  name = "wine-1.1.23";
+  name = "wine-${s.version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/wine/${name}.tar.bz2";
-    sha256 = "0fg8s3y8975bwjyfw705q0sjch56vsndw3pc8n0j8dshhcbbrv5p";
+    url = s.url;
+    sha256 = s.hash;
   };
 
   buildInputs = [
diff --git a/pkgs/misc/emulators/wine/src-for-default.nix b/pkgs/misc/emulators/wine/src-for-default.nix
new file mode 100644
index 000000000000..d2dd2f8746e5
--- /dev/null
+++ b/pkgs/misc/emulators/wine/src-for-default.nix
@@ -0,0 +1,6 @@
+rec {
+  advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.1.28.tar.bz2";
+  version = "1.1.28";
+  url="http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2";
+  hash = "009h97799r0fbn6pxaqlfmvzyiy4znn87vvnr8ppmjhgbwd80wmy";
+}
diff --git a/pkgs/misc/emulators/wine/src-info-for-default.nix b/pkgs/misc/emulators/wine/src-info-for-default.nix
new file mode 100644
index 000000000000..891273316758
--- /dev/null
+++ b/pkgs/misc/emulators/wine/src-info-for-default.nix
@@ -0,0 +1,3 @@
+{
+  downloadPage = "http://www.winehq.org/";
+}