Unverified Commit fff0554c authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

wine: 10.0->11.0 and wine-staging: 10.20->11.1 (#484145)

parents 1a79c9a3 2f293e1f

nixos/doc/manual/release-notes/rl-2605.section.md

+4 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ 


<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->



- `opentrack`, `slushload`, `synthesia`, `vtfedit`, `winbox`, `wineasio`, and `yabridge` use wineWow64Packages instead of wineWowPackages as wine versions >= 11.0 have deprecated wineWowPackages. As such, the prefixes for these packages are NOT backwards compatible and need to be regenerated with potential for data loss.



- `services.crabfit` was removed because its upstream packages are unmaintained and insecure.



- `services.tandoor-recipes` now uses a sub-directory for media files by default starting with `26.05`. Existing setups should move media files out of the data directory and adjust `services.tandoor-recipes.extraConfig.MEDIA_ROOT` accordingly. See [Migrating media files for pre 26.05 installations](#module-services-tandoor-recipes-migrating-media).
@@ -153,6 +155,8 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>. 


<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->



- Wine has been updated to the 11.0 branch. Please check the [upstream announcement](https://gitlab.winehq.org/wine/wine/-/releases/wine-11.0) for more details.



- Cinnamon has been updated to 6.6, please check the [upstream announcement](https://www.linuxmint.com/rel_zena_whatsnew.php) for more details.



- Budgie has been updated to 10.10, please check the [upstream announcement](https://buddiesofbudgie.org/blog/budgie-10-10-released) for more details.

nixos/tests/wine.nix

+1 −10
Original line number Diff line number Diff line
@@ -67,15 +67,6 @@ in 
listToAttrs (

  map (makeWineTest "winePackages" [ hello32 ]) variants

  ++ optionals pkgs.stdenv.hostPlatform.is64bit (

    map

      (makeWineTest "wineWowPackages" [

        hello32

        hello64

      ])

      # This wayland combination times out after spending many hours.

      # https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.wine.wineWowPackages-wayland.x86_64-linux

      (pkgs.lib.remove "wayland" variants)

    ++

    map

      (makeWineTest "wineWow64Packages" [

        hello32

pkgs/applications/emulators/wine/packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ in 
      "x86_64-linux"

      "x86_64-darwin"

    ];

    mainProgram = "wine64";

    mainProgram = "wine";

  };

  wineWow = callPackage ./base.nix {

    pname = "wine-wow";
@@ -112,7 +112,7 @@ in 
      ];

    };

    platforms = [ "x86_64-linux" ];

    mainProgram = "wine64";

    mainProgram = "wine";

  };

  wineWow64 = callPackage ./base.nix {

    pname = "wine-wow64";

pkgs/applications/emulators/wine/sources.nix

+10 −12
Original line number Diff line number Diff line
@@ -97,9 +97,9 @@ in 
rec {



  stable = fetchurl rec {

    version = "10.0";

    url = "https://dl.winehq.org/wine/source/10.0/wine-${version}.tar.xz";

    hash = "sha256-xeCz9ffvr7MOnNTZxiS4XFgxcdM1SdkzzTQC80GsNgE=";

    version = "11.0";

    url = "https://dl.winehq.org/wine/source/11.0/wine-${version}.tar.xz";

    hash = "sha256-wHpoV5M8H8YN/1RI1585ySSBwenbWqYo250DWERuBwE=";



    ## see http://wiki.winehq.org/Gecko

    gecko32 = fetchurl rec {
@@ -115,17 +115,15 @@ rec { 


    ## see http://wiki.winehq.org/Mono

    mono = fetchurl rec {

      version = "8.1.0";

      version = "10.0.0";

      url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";

      hash = "sha256-DtPsUzrvebLzEhVZMc97EIAAmsDFtMK8/rZ4rJSOCBA=";

      hash = "sha256-26ynPl0J96OnwVetBCia+cpHw87XAS1GVEpgcEaQK4c=";

    };



    patches = [

      # Also look for root certificates at $NIX_SSL_CERT_FILE

      ./cert-path.patch

    ]

    ++ patches-binutils-2_44-fix-wine-older-than-10_2

    ++ patches-add-truncf-to-the-import-library;

    ];



    updateScript = writeShellScript "update-wine-stable" ''

      ${updateScriptPreamble}
@@ -144,9 +142,9 @@ rec { 


  unstable = fetchurl rec {

    # NOTE: Don't forget to change the hash for staging as well.

    version = "10.20";

    url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz";

    hash = "sha256-gbShU5WPYkf+UEHV32Xq3Lvuoba6jNok6349fOLR/jw=";

    version = "11.1";

    url = "https://dl.winehq.org/wine/source/11.x/wine-${version}.tar.xz";

    hash = "sha256-v0x8j7XYwfZW8wor6pOHDIXxP/gxGrL2Hd75AOsoy48=";



    patches = [

      # Also look for root certificates at $NIX_SSL_CERT_FILE
@@ -156,7 +154,7 @@ rec { 
    # see https://gitlab.winehq.org/wine/wine-staging

    staging = fetchFromGitLab {

      inherit version;

      hash = "sha256-Ys0VNYj568qMHq56ZCprnsbpb/iqtiDlU3w0er8Ol5g=";

      hash = "sha256-KBiESkLVEEWyUPzv1I7j8U9zjqfYdF+FL6wRCcIE290=";

      domain = "gitlab.winehq.org";

      owner = "wine";

      repo = "wine-staging";

pkgs/by-name/ai/airwave/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  lib,

  multiStdenv,

  fetchFromGitHub,

  wineWowPackages,

  wineWow64Packages,

  cmake,

  makeWrapper,

  file,
@@ -12,7 +12,7 @@ 
}:



let

  wine-wow64 = wineWowPackages.stableFull;

  wine-wow64 = wineWow64Packages.stableFull;

in

multiStdenv.mkDerivation (finalAttrs: {

  pname = "airwave";
@@ -65,7 +65,7 @@ multiStdenv.mkDerivation (finalAttrs: { 
    mkdir $out/bin

    mv $out/libexec/airwave-manager $out/bin

    wrapProgram $out/libexec/airwave-host-32.exe --set WINELOADER ${lib.getExe' wine-wow64 "wine"}

    wrapProgram $out/libexec/airwave-host-64.exe --set WINELOADER ${lib.getExe' wine-wow64 "wine64"}

    wrapProgram $out/libexec/airwave-host-64.exe --set WINELOADER ${lib.getExe' wine-wow64 "wine"}

  '';



  meta = {