JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33596 from yegortimoshenko/20180108.033429/wine

Browse Source 
wine: wineStaging -> wine-staging, add wine-development, use full scheme for wine-stable
This commit is contained in:
Yegor Timoshenko 2018-04-20 13:04:29 +03:00 committed by GitHub
commit a731dfce68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/top-level/aliases.nix
View File

@ -228,6 +228,7 @@ mapAliases (rec {
vimprobable2Wrapper = vimprobable2; # added 2015-01 vimprobable2Wrapper = vimprobable2; # added 2015-01
virtviewer = virt-viewer; # added 2015-12-24 virtviewer = virt-viewer; # added 2015-12-24
vorbisTools = vorbis-tools; # added 2016-01-26 vorbisTools = vorbis-tools; # added 2016-01-26
wineStaging = wine-staging; # added 2018-01-08
winusb = woeusb; # added 2017-12-22 winusb = woeusb; # added 2017-12-22
x11 = xlibsWrapper; # added 2015-09 x11 = xlibsWrapper; # added 2015-09
xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09

4
pkgs/top-level/all-packages.nix
View File

@ -21043,9 +21043,9 @@ with pkgs;
staging = base.override { wineRelease = "staging"; }; staging = base.override { wineRelease = "staging"; };
}; };
wine = winePackages.base; wine = winePackages.full;
wineStaging = lowPrio (winePackages.full.override { wine-staging = lowPrio (winePackages.full.override {
wineRelease = "staging"; wineRelease = "staging";
}); });