From 2e462069a87be8ca4dec083905539b88e9bdf97d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 4 Jul 2015 22:31:38 +0300 Subject: [PATCH] Wine: unstable, staging: update 1.7.43 -> 1.7.46; remove updater scripts because with the new layout they don't work anyway --- pkgs/misc/emulators/wine/stable.upstream | 8 -------- pkgs/misc/emulators/wine/unstable.upstream | 9 --------- pkgs/misc/emulators/wine/versions.nix | 8 ++++---- 3 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 pkgs/misc/emulators/wine/stable.upstream delete mode 100644 pkgs/misc/emulators/wine/unstable.upstream diff --git a/pkgs/misc/emulators/wine/stable.upstream b/pkgs/misc/emulators/wine/stable.upstream deleted file mode 100644 index b5913798a88..00000000000 --- a/pkgs/misc/emulators/wine/stable.upstream +++ /dev/null @@ -1,8 +0,0 @@ -url http://sourceforge.net/projects/wine/files/Source/ -version_link '[-][0-9]+[.][0-9]*[24680][.]([0-9]+[.])*tar[.][^./]+/download$' -SF_redirect -do_overwrite () { - ensure_hash - set_var_value version "$CURRENT_VERSION" - set_var_value sha256 "$CURRENT_HASH" -} diff --git a/pkgs/misc/emulators/wine/unstable.upstream b/pkgs/misc/emulators/wine/unstable.upstream deleted file mode 100644 index fa78360c76a..00000000000 --- a/pkgs/misc/emulators/wine/unstable.upstream +++ /dev/null @@ -1,9 +0,0 @@ -url http://sourceforge.net/projects/wine/files/Source/ -attribute_name wineUnstable -version_link '[.]tar[.][^./]+/download$' -SF_redirect -do_overwrite () { - ensure_hash - set_var_value version "$CURRENT_VERSION" - set_var_value sha256 "$CURRENT_HASH" -} diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix index 84a3ff8f86d..cdb62d4ada7 100644 --- a/pkgs/misc/emulators/wine/versions.nix +++ b/pkgs/misc/emulators/wine/versions.nix @@ -1,7 +1,7 @@ { unstable = { - wineVersion = "1.7.43"; - wineSha256 = "08kqj02m8xc1ppzhs5y83zzykjnz0qliq495rx1n90ybzyd9pm2k"; + wineVersion = "1.7.46"; + wineSha256 = "02rmhz64ianls3z9r6nxf97k49bvfmyhwmpjz5a31pknqrn09d4s"; geckoVersion = "2.36"; geckoSha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g"; gecko64Version = "2.36"; @@ -23,8 +23,8 @@ #monoSha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x"; }; staging = { - version = "1.7.43"; - sha256 = "01b7npa8hc2nrv4hm16r9ikic4wd34nbz1lvfhy0ali2jbcsaqqb"; + version = "1.7.46"; + sha256 = "0nkqqrzx9hprwjzg7ffzirnldxpqa6wn9c1rcyd34k77ym1v44pa"; }; winetricks = { version = "20150416";