Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

winePackages.{stable,unstable,staging}: * -> 9.0; winetricks: 20230212 -> 20240105 #281905

Merged
merged 5 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkgs/applications/emulators/wine/base.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
bison, flex, fontforge, makeWrapper, pkg-config,
nixosTests,
supportFlags,
wineRelease,
patches,
moltenvk,
buildScript ? null, configureFlags ? [], mainProgram ? "wine"
Expand Down Expand Up @@ -46,7 +47,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
}) // rec {
inherit version src;

pname = prevName + lib.optionalString supportFlags.waylandSupport "-wayland";
pname = prevName + lib.optionalString (wineRelease == "wayland") "-wayland";

# Fixes "Compiler cannot create executables" building wineWow with mingwSupport
strictDeps = true;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/emulators/wine/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
sdlSupport ? false,
usbSupport ? false,
mingwSupport ? wineRelease != "stable",
waylandSupport ? wineRelease == "wayland",
waylandSupport ? stdenv.isLinux,
x11Support ? stdenv.isLinux,
embedInstallers ? false, # The Mono and Gecko MSI installers
moltenvk ? darwin.moltenvk # Allow users to override MoltenVK easily
Expand Down
9 changes: 5 additions & 4 deletions pkgs/applications/emulators/wine/packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let
in with src; {
wine32 = pkgsi686Linux.callPackage ./base.nix {
pname = "wine";
inherit src version supportFlags patches moltenvk;
inherit src version supportFlags patches moltenvk wineRelease;
pkgArches = [ pkgsi686Linux ];
geckos = [ gecko32 ];
mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ];
Expand All @@ -17,7 +17,7 @@ in with src; {
};
wine64 = callPackage ./base.nix {
pname = "wine64";
inherit src version supportFlags patches moltenvk;
inherit src version supportFlags patches moltenvk wineRelease;
pkgArches = [ pkgs ];
mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ];
geckos = [ gecko64 ];
Expand All @@ -28,7 +28,7 @@ in with src; {
};
wineWow = callPackage ./base.nix {
pname = "wine-wow";
inherit src version supportFlags patches moltenvk;
inherit src version supportFlags patches moltenvk wineRelease;
stdenv = stdenv_32bit;
pkgArches = [ pkgs pkgsi686Linux ];
geckos = [ gecko32 gecko64 ];
Expand All @@ -44,7 +44,8 @@ in with src; {
};
wineWow64 = callPackage ./base.nix {
pname = "wine-wow64";
inherit src version supportFlags patches moltenvk;
inherit src version patches moltenvk wineRelease;
supportFlags = supportFlags // { mingwSupport = true; }; # Required because we request "--enable-archs=x86_64"
pkgArches = [ pkgs ];
mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc mingwW64.buildPackages.gcc ];
geckos = [ gecko64 ];
Expand Down
28 changes: 14 additions & 14 deletions pkgs/applications/emulators/wine/sources.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,27 @@ let fetchurl = args@{url, hash, ...}:
in rec {

stable = fetchurl rec {
version = "8.0.2";
url = "https://dl.winehq.org/wine/source/8.0/wine-${version}.tar.xz";
hash = "sha256-bsj7byxy1XbLEfUrL41Zr2RASAIVRlHRIrmEZtkdyEc=";
version = "9.0";
url = "https://dl.winehq.org/wine/source/9.0/wine-${version}.tar.xz";
hash = "sha256-fP0JClOV9bdtlbtd76yKMSyN5MBwwRY7i1jaODMMpu4=";

## see http://wiki.winehq.org/Gecko
gecko32 = fetchurl rec {
version = "2.47.3";
version = "2.47.4";
url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86.msi";
hash = "sha256-5bmwbTzjVWRqjS5y4ETjfh4MjRhGTrGYWtzRh6f0jgE=";
hash = "sha256-Js7MR3BrCRkI9/gUvdsHTGG+uAYzGOnvxaf3iYV3k9Y=";
};
gecko64 = fetchurl rec {
version = "2.47.3";
version = "2.47.4";
url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86_64.msi";
hash = "sha256-pT7pVDkrbR/j1oVF9uTiqXr7yNyLA6i0QzSVRc4TlnU=";
hash = "sha256-5ZC32YijLWqkzx2Ko6o9M3Zv3Uz0yJwtzCCV7LKNBm8=";
};

## see http://wiki.winehq.org/Mono
mono = fetchurl rec {
version = "7.4.0";
version = "8.1.0";
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
hash = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw=";
hash = "sha256-DtPsUzrvebLzEhVZMc97EIAAmsDFtMK8/rZ4rJSOCBA=";
};

patches = [
Expand All @@ -69,9 +69,9 @@ in rec {

unstable = fetchurl rec {
# NOTE: Don't forget to change the hash for staging as well.
version = "9.0-rc1";
version = "9.0";
url = "https://dl.winehq.org/wine/source/9.0/wine-${version}.tar.xz";
hash = "sha256-GDd3V74ffxeGzopWqET2ZXKIH/z3RcC0yjTwmmDi8zA=";
hash = "sha256-fP0JClOV9bdtlbtd76yKMSyN5MBwwRY7i1jaODMMpu4=";
inherit (stable) patches;

## see http://wiki.winehq.org/Gecko
Expand Down Expand Up @@ -117,7 +117,7 @@ in rec {
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
hash = "sha256-jjy4r9VEJsU7FJ7RmE8+cgHTAkZVGruNUD5hzmGSB8c=";
hash = "sha256-lE/95OZigifreaRRCPkvA+Z0FqsBmm018jD6leSysXU=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";
Expand Down Expand Up @@ -157,8 +157,8 @@ in rec {

winetricks = fetchFromGitHub rec {
# https://github.com/Winetricks/winetricks/releases
version = "20230212";
hash = "sha256-pd37QTcqY5ZaVBssGecuqziOIq1p0JH0ZDB+oLmp9JU=";
version = "20240105";
hash = "sha256-YTEgb19aoM54KK8/IjrspoChzVnWAEItDlTxpfpS52w=";
owner = "Winetricks";
repo = "winetricks";
rev = version;
Expand Down