From 64dc49864b895ebdd2b28e84e5120638b2e3e5ee Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Thu, 5 Aug 2021 21:22:13 +0300 Subject: [PATCH] Move few assertions under tier 1 --- flake.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 04397a76d48..1fc4207d86b 100644 --- a/flake.nix +++ b/flake.nix @@ -93,12 +93,8 @@ assertions = { url-no-arch = assertUrl stable."1.48.0".rust-src "https://static.rust-lang.org/dist/2020-11-19/rust-src-1.48.0.tar.xz"; - url-kind-2 = assertUrl stable."1.48.0".cargo "https://static.rust-lang.org/dist/2020-11-19/cargo-1.48.0-${rustTarget}.tar.xz"; - url-kind-0 = assertUrl stable."1.47.0".cargo "https://static.rust-lang.org/dist/2020-10-08/cargo-0.48.0-${rustTarget}.tar.xz"; - url-kind-1 = assertUrl stable."1.34.2".llvm-tools-preview "https://static.rust-lang.org/dist/2019-05-14/llvm-tools-1.34.2%20(6c2484dc3%202019-05-13)-${rustTarget}.tar.xz"; url-kind-nightly = assertUrl nightly."2021-01-01".rustc "https://static.rust-lang.org/dist/2021-01-01/rustc-nightly-${rustTarget}.tar.xz"; url-kind-beta = assertUrl beta."2021-01-01".rustc "https://static.rust-lang.org/dist/2021-01-01/rustc-beta-${rustTarget}.tar.xz"; - url-fix = assertUrl nightly."2019-01-10".rustc "https://static.rust-lang.org/dist/2019-01-10/rustc-nightly-${rustTarget}.tar.xz"; # Check only tier 1 targets. } // lib.optionalAttrs (lib.elem system [ "aarch64-linux" "x86_64-linux" ]) { @@ -109,6 +105,11 @@ name-stable-profile-default = assertEq stable."1.51.0".default.name "rust-default-1.51.0"; name-stable-profile-minimal = assertEq stable."1.51.0".minimal.name "rust-minimal-1.51.0"; + url-kind-2 = assertUrl stable."1.48.0".cargo "https://static.rust-lang.org/dist/2020-11-19/cargo-1.48.0-${rustTarget}.tar.xz"; + url-kind-0 = assertUrl stable."1.47.0".cargo "https://static.rust-lang.org/dist/2020-10-08/cargo-0.48.0-${rustTarget}.tar.xz"; + url-kind-1 = assertUrl stable."1.34.2".llvm-tools-preview "https://static.rust-lang.org/dist/2019-05-14/llvm-tools-1.34.2%20(6c2484dc3%202019-05-13)-${rustTarget}.tar.xz"; + url-fix = assertUrl nightly."2019-01-10".rustc "https://static.rust-lang.org/dist/2019-01-10/rustc-nightly-${rustTarget}.tar.xz"; + rename-available = assertEq stable."1.48.0".rustfmt stable."1.48.0".rustfmt-preview; rename-unavailable = { assertion = !(stable."1.30.0" ? rustfmt);