diff --git a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix deleted file mode 100644 index 0e68a1108319..000000000000 --- a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - lib, - fetchFromGitHub, - stdenv, - lld, -}: - -let - arch = stdenv.hostPlatform.qemuArch; - - target = ./. + "/${arch}-unknown-none.json"; - -in - -let - cross = import ../../../.. { - system = stdenv.hostPlatform.system; - crossSystem = lib.systems.examples."${arch}-embedded" // { - rust.rustcTarget = "${arch}-unknown-none"; - rust.platform = - assert lib.assertMsg (builtins.pathExists target) "Target spec not found"; - lib.importJSON target; - }; - }; - - inherit (cross) rustPlatform; - -in - -rustPlatform.buildRustPackage rec { - pname = "rust-hypervisor-firmware"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "cloud-hypervisor"; - repo = "rust-hypervisor-firmware"; - tag = version; - sha256 = "sha256-iLYmPBJH7I6EJ8VTUbR0+lZaebvbZlRv2KglbjKX76Q="; - }; - - cargoHash = "sha256-iqsU4t8Zz9UTtAu+a6kqwnPZ6qdGAriQ7hcU58KDQ8M="; - - # lld: error: unknown argument '-Wl,--undefined=AUDITABLE_VERSION_INFO' - # https://github.com/cloud-hypervisor/rust-hypervisor-firmware/issues/249 - auditable = false; - - env = { - RUSTC_BOOTSTRAP = 1; - RUSTFLAGS = "-C linker=lld -C linker-flavor=ld.lld"; - }; - - nativeBuildInputs = [ - lld - ]; - - # Tests don't work for `no_std`. See https://os.phil-opp.com/testing/ - doCheck = false; - - meta = { - homepage = "https://github.com/cloud-hypervisor/rust-hypervisor-firmware"; - description = "Simple firmware that is designed to be launched from anything that supports loading ELF binaries and running them with the PVH booting standard"; - license = with lib.licenses; [ asl20 ]; - maintainers = with lib.maintainers; [ astro ]; - platforms = [ "x86_64-none" ]; - mainProgram = "hypervisor-fw"; - }; -} diff --git a/pkgs/applications/virtualization/rust-hypervisor-firmware/x86_64-unknown-none.json b/pkgs/applications/virtualization/rust-hypervisor-firmware/x86_64-unknown-none.json deleted file mode 100644 index dab5ec84bf1a..000000000000 --- a/pkgs/applications/virtualization/rust-hypervisor-firmware/x86_64-unknown-none.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "llvm-target": "x86_64-unknown-none", - "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-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": "rust-lld", - "linker-flavor": "ld.lld", - "panic-strategy": "abort", - "disable-redzone": true, - "features": "-mmx,-sse,+soft-float", - "code-model": "small", - "relocation-model": "pic", - "pre-link-args": { - "ld.lld": ["--script=x86_64-unknown-none.ld"] - } -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1e258da9620f..546ecaff6c97 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1714,6 +1714,7 @@ mapAliases { rucksack = throw "rucksack was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 runCommandNoCC = warnAlias "'runCommandNoCC' has been renamed to/replaced by 'runCommand'" runCommand; # Converted to warning 2025-10-28 runCommandNoCCLocal = warnAlias "'runCommandNoCCLocal' has been renamed to/replaced by 'runCommandLocal'" runCommandLocal; # Converted to warning 2025-10-28 + rust-hypervisor-firmware = throw "rust-hypevisor-firmware was removed, as it is no longer needed by Cloud Hypervisor and was broken"; # Added 2026-02-19 rust-synapse-state-compress = throw "'rust-synapse-state-compress' has been renamed to/replaced by 'rust-synapse-compress-state'"; # Converted to throw 2025-10-27 rustc-wasm32 = throw "'rustc-wasm32' has been renamed to/replaced by 'rustc'"; # Converted to throw 2025-10-27 rustic-rs = throw "'rustic-rs' has been renamed to/replaced by 'rustic'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c425e76621f7..ed292aa4350a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8477,8 +8477,6 @@ with pkgs; qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { }; - rust-hypervisor-firmware = callPackage ../applications/virtualization/rust-hypervisor-firmware { }; - OVMF = callPackage ../applications/virtualization/OVMF { inherit (python3Packages) pexpect; };