git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #98999 from SFrijters/wine-5.18

wineStable: 5.0.0 -> 5.0.2, wine{Unstable,Staging}: 5.16 -> 5.18, wine.vkd3d: 1.1 -> 1.2

commit76b08542650efaa12c8ad9ee53a5aaab8c182ebe authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateSun 4 Oct 2020, 11:28 (6 years ago) parent1d122a86ce4359
2 files changed+7−7
pkgs/misc/emulators/wine/sources.nix+5−5 pkgs/misc/emulators/wine/vkd3d.nix+2−2
pkgs/misc/emulators/wine/sources.nix+5−5
@@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}:
1313in rec {
1414
1515 stable = fetchurl rec {
16− version = "5.0";
16+ version = "5.0.2";
1717 url = "https://dl.winehq.org/wine/source/5.0/wine-${version}.tar.xz";
18− sha256 = "1d0kcy338radq07hrnzcpc9lc9j2fvzjh37q673002x8d6x5058q";
18+ sha256 = "1g7c5djbi262h6zivmxbk26rsflwq8mrghr7hci3ajw7f3s89hn2";
1919
2020 ## see http://wiki.winehq.org/Gecko
2121 gecko32 = fetchurl rec {
@@ -39,16 +39,16 @@ in rec {
3939
4040 unstable = fetchurl rec {
4141 # NOTE: Don't forget to change the SHA256 for staging as well.
42− version = "5.16";
42+ version = "5.18";
4343 url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz";
44− sha256 = "0j9268s1dy4cjvhcf4igbg54gaws4a1l3pda449qy2p2i4psdncq";
44+ sha256 = "0hpkcpi6j162bkgcgzzj8y471777q06j7pydl61yp6qscn4g80ch";
4545 inherit (stable) mono gecko32 gecko64;
4646 };
4747
4848 staging = fetchFromGitHub rec {
4949 # https://github.com/wine-staging/wine-staging/releases
5050 inherit (unstable) version;
51− sha256 = "1rrw15mrygv9zcbqz0c3s7q7971wqj89ys2bvvm4b0d2h4j0k6wq";
51+ sha256 = "0bwcvkf1g1dsq1qmric3jfl85rfjzhq6x4h839hfqc536lkfbrpy";
5252 owner = "wine-staging";
5353 repo = "wine-staging";
5454 rev = "v${version}";
pkgs/misc/emulators/wine/vkd3d.nix+2−2
@@ -5,11 +5,11 @@
55
66stdenv.mkDerivation rec {
77 pname = "vkd3d";
8− version = "1.1";
8+ version = "1.2";
99
1010 src = fetchurl {
1111 url = "https://dl.winehq.org/vkd3d/source/vkd3d-${version}.tar.xz";
12− sha256 = "1dkayp95g1691w7n2yn1q9y7klq5xa921dgmn9a5vil0rihxqnj9";
12+ sha256 = "0szr1lw3xbgi9qjm13d1q4gyzzwv8i5wfxiwjg6dmwphrc7h6jxh";
1313 };
1414
1515 buildInputs = [ vulkan-headers spirv-headers vulkan-loader ];