Merge pull request #30125 from avnik/wine-update

Wine update

Changed files
+4 -4
pkgs
misc
emulators
+1 -1
pkgs/misc/emulators/wine/base.nix
···
++ lib.optional cairoSupport pkgs.cairo
++ lib.optional tiffSupport pkgs.libtiff
++ lib.optional odbcSupport pkgs.unixODBC
-
++ lib.optional netapiSupport pkgs.samba3_light
+
++ lib.optional netapiSupport pkgs.samba4
++ lib.optional cursesSupport pkgs.ncurses
++ lib.optional vaSupport pkgs.libva-full
++ lib.optional pcapSupport pkgs.libpcap
+3 -3
pkgs/misc/emulators/wine/sources.nix
···
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
-
version = "2.17";
+
version = "2.18";
url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
-
sha256 = "0sgazjn30ki2y3bjrd0xbpf870ii22wkyrmgaxcwbk23j1rrbp3y";
+
sha256 = "0l2gmk6g4c5ds29iqcvpmh5g8jdz6g6id7xkgiqps5bqk09322cz";
inherit (stable) mono gecko32 gecko64;
};
staging = fetchFromGitHub rec {
inherit (unstable) version;
-
sha256 = "11jm39g1kc77fvn02j9g8syyc095b6w2jashyr28v4gi7g0fqv6h";
+
sha256 = "02rh2lvx7sd8d6nhgpfq9crjh495k4k7i3wmgigs4m5rlip363s8";
owner = "wine-compholio";
repo = "wine-staging";
rev = "v${version}";