From acbe43e894e8726f79dea46e0e5d0658fec51d68 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 4 Jul 2020 21:22:56 +0300 Subject: [PATCH 1/4] wineStaging: use gitMinimal to apply patchset Motivation: it works faster, and don't issue suspicious errors like `sed: couldn't flush stdout: Broken pipe` during applying patches. --- pkgs/misc/emulators/wine/staging.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index 48ea93a97a8..0ef93ccfecd 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -8,7 +8,7 @@ let patch = (callPackage ./sources.nix {}).staging; in assert stdenv.lib.getVersion wineUnstable == patch.version; (stdenv.lib.overrideDerivation wineUnstable (self: { - buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs; + buildInputs = build-inputs [ "perl" "utillinux" "autoconf" "gitMinimal" ] self.buildInputs; name = "${self.name}-staging"; From f3266b6562102cb70f1799b3ce9ac4d982070b08 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 4 Jul 2020 21:25:00 +0300 Subject: [PATCH 2/4] faudio: 20.06 -> 20.07 --- pkgs/development/libraries/faudio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 7bc0790f049..d139aca92b1 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -3,14 +3,14 @@ #TODO: tests stdenv.mkDerivation rec { - pname = "faudio"; - version = "20.06"; + pname = "faudio"; + version = "20.07"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "1dyx9l7ldhlbb77ca3wk0l218589blvh78mdfyzpk9k1izk2yih1"; + sha256 = "14fi0jwax9qzn2k89qazdkhxvklk5zcwhbi6pxi1l5i9zk4ly2h7"; }; nativeBuildInputs = [cmake]; From e79e7e17e9a06e0e9a3fc6f8729a7e81c55a1f23 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 4 Jul 2020 21:27:05 +0300 Subject: [PATCH 3/4] wineUnstable: 5.11 -> 5.12 --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index ffad1e3c990..5b40aef4c2d 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "5.11"; + version = "5.12"; url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz"; - sha256 = "1q0sh89xnn6cq3kpqrrq9h316qyzpslj2w6m6vq7pq4y4p727nxk"; + sha256 = "0bl4ii4h1w4z8kb6dpdc1pgwk0wrhm61c2q2nzpcckkrqra75wc7"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "050npck8mdck8m2rs9xn6mszzj2fv9ql80g08j2ahinf792svrid"; + sha256 = "1f6ay0khdcxxnsvp4rywg80qpcysbplyrq7qjmqjvdysi7k2wm1w"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From ec7b6af024092a6485bde6d866e8c60d8ef453fd Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 4 Jul 2020 23:25:41 +0300 Subject: [PATCH 4/4] wineStaging: allow to blacklist patchsets from staging Due repeatable issues with xactengine-initial patchset. Later, `disablePatchsets` can be extended to be overridable argument of wineStaging. --- pkgs/misc/emulators/wine/sources.nix | 3 +++ pkgs/misc/emulators/wine/staging.nix | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 5b40aef4c2d..d30d4bcdc1c 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -52,6 +52,9 @@ in rec { owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; + + # Just keep list empty, if current release haven't broken patchsets + disabledPatchsets = [ "xactengine-initial" ]; }; winetricks = fetchFromGitHub rec { diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index 0ef93ccfecd..f3b9fa30420 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -18,7 +18,7 @@ in assert stdenv.lib.getVersion wineUnstable == patch.version; chmod +w patches cd patches patchShebangs gitapply.sh - ./patchinstall.sh DESTDIR="$PWD/.." --all + ./patchinstall.sh DESTDIR="$PWD/.." --all ${stdenv.lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets} cd .. ''; })) // {