Merge pull request #33596 from yegortimoshenko/20180108.033429/wine

wine: wineStaging -> wine-staging, add wine-development, use full scheme for wine-stable

authored by Yegor Timoshenko and committed by GitHub a731dfce 095d578f

+3 -2
+1
pkgs/top-level/aliases.nix
··· 228 228 vimprobable2Wrapper = vimprobable2; # added 2015-01 229 229 virtviewer = virt-viewer; # added 2015-12-24 230 230 vorbisTools = vorbis-tools; # added 2016-01-26 231 + wineStaging = wine-staging; # added 2018-01-08 231 232 winusb = woeusb; # added 2017-12-22 232 233 x11 = xlibsWrapper; # added 2015-09 233 234 xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
+2 -2
pkgs/top-level/all-packages.nix
··· 21043 21043 staging = base.override { wineRelease = "staging"; }; 21044 21044 }; 21045 21045 21046 - wine = winePackages.base; 21046 + wine = winePackages.full; 21047 21047 21048 - wineStaging = lowPrio (winePackages.full.override { 21048 + wine-staging = lowPrio (winePackages.full.override { 21049 21049 wineRelease = "staging"; 21050 21050 }); 21051 21051