From c4a06db832106d195bfccf1c937a72ff41be80b5 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 5 May 2023 23:23:20 +0300 Subject: [PATCH] tests.rustCustomSysroot: remove unmaintained and broken by upstream test --- pkgs/test/default.nix | 1 - pkgs/test/rust-sysroot/default.nix | 60 ------------------------------ 2 files changed, 61 deletions(-) delete mode 100644 pkgs/test/rust-sysroot/default.nix diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index bc810790a3dd..9f684dcea72f 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -53,7 +53,6 @@ with pkgs; pkg-config = recurseIntoAttrs (callPackage ../top-level/pkg-config/tests.nix { }); - rustCustomSysroot = callPackage ./rust-sysroot {}; buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { }; importCargoLock = callPackage ../build-support/rust/test/import-cargo-lock { }; diff --git a/pkgs/test/rust-sysroot/default.nix b/pkgs/test/rust-sysroot/default.nix deleted file mode 100644 index a5a1596504f9..000000000000 --- a/pkgs/test/rust-sysroot/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, rust, rustPlatform, fetchFromGitHub }: - -let - mkBlogOsTest = target: rustPlatform.buildRustPackage rec { - name = "blog_os-sysroot-test"; - - src = fetchFromGitHub { - owner = "phil-opp"; - repo = "blog_os"; - rev = "4e38e7ddf8dd021c3cd7e4609dfa01afb827797b"; - sha256 = "0k9ipm9ddm1bad7bs7368wzzp6xwrhyfzfpckdax54l4ffqwljcg"; - }; - - cargoSha256 = "1x8iwgy1irgfkv2yjkxm6479nwbrk82b0c80jm7y4kw0s32r01lg"; - - inherit target; - - RUSTFLAGS = "-C link-arg=-nostartfiles"; - - # Tests don't work for `no_std`. See https://os.phil-opp.com/testing/ - doCheck = false; - - meta = with lib; { - description = "Test for using custom sysroots with buildRustPackage"; - maintainers = with maintainers; [ aaronjanse ]; - platforms = lib.platforms.x86_64; - }; - }; - - # The book uses rust-lld for linking, but rust-lld is not currently packaged for NixOS. - # The justification in the book for using rust-lld suggests that gcc can still be used for testing: - # > Instead of using the platform's default linker (which might not support Linux targets), - # > we use the cross platform LLD linker that is shipped with Rust for linking our kernel. - # https://github.com/phil-opp/blog_os/blame/7212ffaa8383122b1eb07fe1854814f99d2e1af4/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md#L157 - targetContents = { - "llvm-target" = "x86_64-unknown-none"; - "data-layout" = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"; - "arch" = "x86_64"; - "target-endian" = "little"; - "target-pointer-width" = "64"; - "target-c-int-width" = "32"; - "os" = "none"; - "executables" = true; - "linker-flavor" = "gcc"; - "panic-strategy" = "abort"; - "disable-redzone" = true; - "features" = "-mmx,-sse,+soft-float"; - }; - -in { - blogOS-targetByFile = mkBlogOsTest (builtins.toFile "x86_64-blog_os.json" (builtins.toJSON targetContents)); - blogOS-targetByNix = let - plat = lib.systems.elaborate { config = "x86_64-none"; } // { - rustc = { - config = "x86_64-blog_os"; - platform = targetContents; - }; - }; - in mkBlogOsTest (rust.toRustTargetSpec plat); -}