diff options
| author | John Ericson <git@JohnEricson.me> | 2024-01-29 08:15:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-29 08:15:02 -0500 |
| commit | b5a8242f936ba406eb2900cff4732987b1c12b18 (patch) | |
| tree | d19894b72966c7b7929f871e03f7f32d7ddc45db /pkgs/os-specific/windows | |
| parent | eb96e4488cdb3789e676593ee82257786bb4cf9b (diff) | |
| parent | fda4c4e2993a5c0f92fc516f6054f1bf85bd8dbc (diff) | |
Merge pull request #279039 from wegank/mingw-w64-bump
windows.mingw_w64: 10.0.0 -> 11.0.1
Diffstat (limited to 'pkgs/os-specific/windows')
| -rw-r--r-- | pkgs/os-specific/windows/mingw-w64/default.nix | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 3bfc7a58e7279..706186c8e2f15 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -2,35 +2,20 @@ , stdenv , windows , fetchurl -, fetchpatch , autoreconfHook }: let - version = "10.0.0"; + version = "11.0.1"; in stdenv.mkDerivation { pname = "mingw-w64"; inherit version; src = fetchurl { url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2"; - hash = "sha256-umtDCu1yxjo3aFMfaj/8Kw/eLFejslFFDc9ImolPCJQ="; + hash = "sha256-P2a84Gnui+10OaGhPafLkaXmfqYXDyExesf1eUYl7hA="; }; - patches = [ - # Upstream patches to fix build parallelism - (fetchpatch { - name = "crt-suff-make-4.4.patch"; - url = "https://github.com/mirror/mingw-w64/commit/953bcd32ae470c4647e94de8548dda5a8f07d82d.patch"; - hash = "sha256-lrS4ZDa/Uwsj5DXajOUv+knZXan0JVU70KHHdIjJ07Y="; - }) - (fetchpatch { - name = "dll-dep-make-4.4.patch"; - url = "https://github.com/mirror/mingw-w64/commit/e1b0c1420bbd52ef505c71737c57393ac1397b0a.patch"; - hash = "sha256-/56Cmmy0UYTaDKIWG7CgXsThvCHK6lSbekbBOoOJSIQ="; - }) - ]; - outputs = [ "out" "dev" ]; configureFlags = [ |