diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-07-21 21:22:34 +0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-21 21:22:34 +0700 |
commit | 1308c47b1f1319a390b24a44f750c740c80cc9f5 (patch) | |
tree | bc56fdfba0b60802c5713d46409e68f1b8a8606a | |
parent | aec9d49d3315caa9504fc63914da7d3ad5182365 (diff) | |
parent | c60a0b044747037b87e7ec24b60d221e261b8a6b (diff) | |
download | nixpkgs-1308c47b1f1319a390b24a44f750c740c80cc9f5.tar nixpkgs-1308c47b1f1319a390b24a44f750c740c80cc9f5.tar.gz nixpkgs-1308c47b1f1319a390b24a44f750c740c80cc9f5.tar.bz2 nixpkgs-1308c47b1f1319a390b24a44f750c740c80cc9f5.tar.lz nixpkgs-1308c47b1f1319a390b24a44f750c740c80cc9f5.tar.xz nixpkgs-1308c47b1f1319a390b24a44f750c740c80cc9f5.tar.zst nixpkgs-1308c47b1f1319a390b24a44f750c740c80cc9f5.zip |
Merge pull request #130864 from pstn/mingw-64
mingw-64: 6.0.0 -> 9.0.0
-rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 6 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2111.section.md | 2 | ||||
-rw-r--r-- | pkgs/os-specific/windows/mingw-w64/default.nix | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 68eeb85cddd..ae9f97c139b 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -544,6 +544,12 @@ 2020 to 2021 </para> </listitem> + <listitem> + <para> + the <literal>mingw-64</literal> package has been upgraded from + 6.0.0 to 9.0.0 + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-notable-changes"> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 54ea22e3bfc..172fe9bbcad 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -138,6 +138,8 @@ pt-services.clipcat.enable). - The `isabelle` package has been upgraded from 2020 to 2021 +- the `mingw-64` package has been upgraded from 6.0.0 to 9.0.0 + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 0a342997530..38293e65f70 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, windows, fetchurl }: let - version = "6.0.0"; + version = "9.0.0"; in stdenv.mkDerivation { pname = "mingw-w64"; inherit version; src = fetchurl { url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2"; - sha256 = "1w28mynv500y03h92nh87rgw3fnp82qwnjbxrrzqkmr63q812pl0"; + sha256 = "10a15bi4lyfi0k0haj0klqambicwma6yi7vssgbz8prg815vja8r"; }; outputs = [ "out" "dev" ]; |