pyrox.dev / nixpkgs
lol
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #37743 from ikervagyok/wine

wine: Unstable 3.3 -> 3.4 & reenable wineStaging

authored by

Jörg Thalheim and committed by
GitHub 90cfaf1a 458ff5a7

+7 -12
+4 -7
pkgs/misc/emulators/wine/default.nix
··· 56 56 }); 57 57 58 58 in if wineRelease == "staging" then 59 - let wineUnstable = wine-build wineBuild "unstable"; in 60 - # wine staging is not yet at 3.0, using unstable 61 - # FIXME update winestaging sources 62 - wineUnstable 63 - # callPackage ./staging.nix { 64 - # inherit libtxc_dxtn_Name wineUnstable; 65 - # } 59 + callPackage ./staging.nix { 60 + inherit libtxc_dxtn_Name; 61 + wineUnstable = wine-build wineBuild "unstable"; 62 + } 66 63 else 67 64 wine-build wineBuild wineRelease
+3 -5
pkgs/misc/emulators/wine/sources.nix
··· 39 39 40 40 unstable = fetchurl rec { 41 41 # NOTE: Don't forget to change the SHA256 for staging as well. 42 - version = "3.3"; 42 + version = "3.4"; 43 43 url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz"; 44 - sha256 = "0cx31jsll7mxd9r7v0vpahajqwb6da6cpwybv06l5ydkgfrbv505"; 44 + sha256 = "14wf7536rkmhav9ibbvhqqkfqmbk1dckhd2679i5scizr5x290x4"; 45 45 inherit (stable) mono gecko32 gecko64; 46 46 }; 47 47 48 48 staging = fetchFromGitHub rec { 49 49 # https://github.com/wine-compholio/wine-staging/releases 50 50 inherit (unstable) version; 51 - # FIXME update winestaging sources, when 3.3 is released 52 - # FIXME then revert the staging derivation in ./default.nix 53 - sha256 = "0000000000000000000000000000000000000000000000000000000000000000"; 51 + sha256 = "11cdymdd0qf8khhrakzj7qz12gx19h2a30r8bimbx6rriqryhlc2"; 54 52 owner = "wine-staging"; 55 53 repo = "wine-staging"; 56 54 rev = "v${version}";