Author: ludo
Date: Mon Jan 30 09:53:39 2012
New Revision: 31926
URL: https://nixos.org/websvn/nix/?rev=31926&sc=1
Log:
MinGW 3.20, and w32api 3.17-2.
Modified:
nixpkgs/trunk/pkgs/os-specific/windows/mingwrt/default.nix
nixpkgs/trunk/pkgs/os-specific/windows/w32api/default.nix
Modified: nixpkgs/trunk/pkgs/os-specific/windows/mingwrt/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/windows/mingwrt/default.nix Sun Jan 29
22:44:49 2012 (r31925)
+++ nixpkgs/trunk/pkgs/os-specific/windows/mingwrt/default.nix Mon Jan 30
09:53:39 2012 (r31926)
@@ -1,14 +1,14 @@
{stdenv, fetchurl, binutilsCross ? null, gccCross ? null, onlyHeaders ? false}:
let
- name = "mingwrt-3.18";
+ name = "mingwrt-3.20";
in
stdenv.mkDerivation (rec {
inherit name;
src = fetchurl {
- url = "mirror://sourceforge/mingw/${name}-mingw32-src.tar.gz";
- sha256 = "0hmxgkxnf6an70g07gmyik46sw1qm204izh6sp923szddvypjjfy";
+ url =
"mirror://sourceforge/mingw/MinGW/Base/mingw-rt/${name}-mingw32-src.tar.gz";
+ sha256 = "02pydg1m8y35nxb4k34nlb5c341y2waq76z42mgdzlcf661r91pi";
};
} //
Modified: nixpkgs/trunk/pkgs/os-specific/windows/w32api/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/windows/w32api/default.nix Sun Jan 29
22:44:49 2012 (r31925)
+++ nixpkgs/trunk/pkgs/os-specific/windows/w32api/default.nix Mon Jan 30
09:53:39 2012 (r31926)
@@ -1,16 +1,19 @@
-{stdenv, fetchurl, binutilsCross ? null, gccCross ? null, onlyHeaders ? false}:
+{ stdenv, fetchurl, xz, binutilsCross ? null
+, gccCross ? null, onlyHeaders ? false }:
let
- name = "w32api-3.14";
+ name = "w32api-3.17-2";
in
stdenv.mkDerivation ({
inherit name;
-
+
src = fetchurl {
- url = "mirror://sourceforge/mingw/${name}-mingw32-src.tar.gz";
- sha256 = "128ax8a4dlspxsi5fi7bi1aslppqx3kczr1ibzj1z1az48bvwp21";
+ url =
"mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-3.17/${name}-mingw32-src.tar.lzma";
+ sha256 = "09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb";
};
+ buildNativeInputs = [ xz ];
+
} //
(if onlyHeaders then {
name = name + "-headers";
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
