diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index c3606b9ef831..4dca84788169 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -24,9 +24,9 @@ let fetchurl = args@{url, hash, ...}: in rec { stable = fetchurl rec { - version = "9.0"; - url = "https://dl.winehq.org/wine/source/9.0/wine-${version}.tar.xz"; - hash = "sha256-fP0JClOV9bdtlbtd76yKMSyN5MBwwRY7i1jaODMMpu4="; + version = "10.0"; + url = "https://dl.winehq.org/wine/source/10.0/wine-${version}.tar.xz"; + hash = "sha256-xeCz9ffvr7MOnNTZxiS4XFgxcdM1SdkzzTQC80GsNgE="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "10.0-rc5"; + version = "10.0"; url = "https://dl.winehq.org/wine/source/10.0/wine-${version}.tar.xz"; - hash = "sha256-7IlPe1wH0tTCHVNNf0OUZnuO8ngH4w4hKJhpp02XbtI="; + hash = "sha256-xeCz9ffvr7MOnNTZxiS4XFgxcdM1SdkzzTQC80GsNgE="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-no+yYF/xhy0kRfBqPer0UbpJNEh9LtKCmyVvhQB58K4="; + hash = "sha256-0mzKoaNaJ6ZDYQtJFU383W5nNe/FKtpBjeWDpiqkmp4="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; @@ -126,35 +126,7 @@ in rec { disabledPatchsets = [ ]; }; - wayland = fetchFromGitLab { - # https://gitlab.collabora.com/alf/wine/-/tree/wayland - version = "8.2"; - hash = "sha256-Eb2SFBIeQQ3cVZkUQcwNT5mcYe0ShFxBdMc3BlqkwTo="; - domain = "gitlab.collabora.com"; - owner = "alf"; - repo = "wine"; - rev = "b2547ddf9e08cafce98cf7734d5c4ec926ef3536"; - - inherit (unstable) gecko32 gecko64; - - inherit (unstable) mono; - - updateScript = writeShellScript "update-wine-wayland" '' - ${updateScriptPreamble} - wayland_rev=$(get_source_attr wayland.rev) - - latest_wayland_rev=$(curl -s 'https://gitlab.collabora.com/api/v4/projects/2847/repository/branches/wayland' | jq -r .commit.id) - - if [[ "$wayland_rev" != "$latest_wayland_rev" ]]; then - latest_wayland=$(curl -s 'https://gitlab.collabora.com/alf/wine/-/raw/wayland/VERSION' | cut -f3 -d' ') - wayland_url=$(get_source_attr wayland.url) - set_version_and_hash wayland "$latest_wayland" "$(nix-prefetch-url --unpack "''${wayland_url/$wayland_rev/$latest_wayland_rev}")" - set_source_attr wayland rev "\"$latest_wayland_rev\"" - fi - - do_update - ''; - }; + wayland = pkgs.lib.warnOnInstantiate "building wine with `wineRelease = \"wayland\"` is deprecated. Wine now builds with the wayland driver by default." stable; # added 2025-01-23 winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93bb6797bdbb..045bd2c268f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18070,7 +18070,7 @@ with pkgs; }); wine-wayland = lowPrio (winePackages.full.override { - wineRelease = "wayland"; + x11Support = false; }); inherit (callPackage ../servers/web-apps/wordpress {}) diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index 8d5191f26a25..064c190af214 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -58,11 +58,9 @@ rec { stagingFull = full.override { wineRelease = "staging"; }; wayland = base.override { - wineRelease = "wayland"; - waylandSupport = true; + x11Support = false; }; waylandFull = full.override { - wineRelease = "wayland"; - waylandSupport = true; + x11Support = false; }; }