Unverified Commit 42565a80 authored by Kira Bruneau's avatar Kira Bruneau Committed by GitHub
Browse files

wine64Packages.{unstable,staging}: 10.0 -> 10.2 (#384537)

parents e8678650 2df9bf35

nixos/tests/wine.nix

+9 −0
Original line number Diff line number Diff line
@@ -75,5 +75,14 @@ listToAttrs ( 
      # 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

          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)

  )

)

pkgs/applications/emulators/wine/sources.nix

+4 −4
Original line number Diff line number Diff line
@@ -69,9 +69,9 @@ in rec { 


  unstable = fetchurl rec {

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

    version = "10.0";

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

    hash = "sha256-xeCz9ffvr7MOnNTZxiS4XFgxcdM1SdkzzTQC80GsNgE=";

    version = "10.2";

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

    hash = "sha256-nZDfts8QuBCntHifAGdxK0cw0+oqiLkfG+Jzsq0EJD8=";

    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-0mzKoaNaJ6ZDYQtJFU383W5nNe/FKtpBjeWDpiqkmp4=";

    hash = "sha256-qWje1nJ5LIVFj5PmB6RRITYOWGovXzCLEVFTazmp30o=";

    domain = "gitlab.winehq.org";

    owner = "wine";

    repo = "wine-staging";