From 38ed4fcde61528bda274fe36a65b49a6b3800621 Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Mon, 19 Oct 2020 02:20:28 -0700 Subject: [PATCH 1/2] relibc: fix for nix 3.0 --- pkgs/development/libraries/relibc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/relibc/default.nix b/pkgs/development/libraries/relibc/default.nix index 43e02fc87586..0d419a0207a8 100644 --- a/pkgs/development/libraries/relibc/default.nix +++ b/pkgs/development/libraries/relibc/default.nix @@ -7,10 +7,10 @@ let ]; bootstrapCrossRust = stdenvNoCC.mkDerivation { name = "binary-redox-rust"; - + src = fetchTarball { - name = "redox-rust-toolchain-bin.tar.gz"; - url = "https://www.dropbox.com/s/33r92en0t47l1ei/redox-rust-toolchain-bin.tar.gz?dl=1"; + name = "redox-rust-toolchain.tar.gz"; + url = "https://www.dropbox.com/s/qt7as0j7cwnin8z/redox-rust-toolchain.tar.gz?dl=1"; sha256 = "1g17qp2q6b88p04yclkw6amm374pqlakrmw9kd86vw8z4g70jkxm"; }; From 99176c09555cf94c66184c0953e9e85b9317feba Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Mon, 19 Oct 2020 17:17:22 -0700 Subject: [PATCH 2/2] use fetchzip --- pkgs/development/libraries/relibc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/relibc/default.nix b/pkgs/development/libraries/relibc/default.nix index 0d419a0207a8..f4c9e1e7117a 100644 --- a/pkgs/development/libraries/relibc/default.nix +++ b/pkgs/development/libraries/relibc/default.nix @@ -8,7 +8,7 @@ let bootstrapCrossRust = stdenvNoCC.mkDerivation { name = "binary-redox-rust"; - src = fetchTarball { + src = buildPackages.fetchzip { name = "redox-rust-toolchain.tar.gz"; url = "https://www.dropbox.com/s/qt7as0j7cwnin8z/redox-rust-toolchain.tar.gz?dl=1"; sha256 = "1g17qp2q6b88p04yclkw6amm374pqlakrmw9kd86vw8z4g70jkxm";