From 1d73af31217c73d801ab146786ad70d21978e520 Mon Sep 17 00:00:00 2001 From: Cathal Mullan Date: Fri, 29 Nov 2024 14:18:48 +0000 Subject: [PATCH] Upgrade to Rust 1.83. --- Cargo.lock | 26 +- Cargo.toml | 2 +- README.md | 2 +- flake.lock | 46 +-- flake.nix | 472 +++++++++++++--------------- nix/pkgs/cargo-codspeed/default.nix | 4 +- nix/pkgs/cargo-insta/default.nix | 4 +- nix/pkgs/cargo-llvm-cov/default.nix | 7 +- nix/vm.nix | 86 ----- 9 files changed, 259 insertions(+), 390 deletions(-) delete mode 100644 nix/vm.nix diff --git a/Cargo.lock b/Cargo.lock index 435fbc26..c1cb0182 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -132,9 +132,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytes" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "bytestring" @@ -153,9 +153,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" +checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc" dependencies = [ "jobserver", "libc", @@ -426,12 +426,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -736,9 +736,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.166" +version = "0.2.167" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ccc108bbc0b1331bd061864e7cd823c0cab660bbe6970e66e2c0614decde36" +checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" [[package]] name = "libfuzzer-sys" @@ -1222,9 +1222,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1339,9 +1339,9 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", diff --git a/Cargo.toml b/Cargo.toml index 68481d86..5af65c30 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ members = [".", "examples/*", "fuzz"] version = "0.7.0" authors = ["Cathal Mullan "] edition = "2021" -rust-version = "1.81" +rust-version = "1.83" repository = "https://github.com/DuskSystems/wayfind" license = "MIT OR Apache-2.0" keywords = ["router"] diff --git a/README.md b/README.md index 5a8bc4ca..432b2240 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![crates.io](https://img.shields.io/crates/v/wayfind)](https://crates.io/crates/wayfind) [![documentation](https://docs.rs/wayfind/badge.svg)](https://docs.rs/wayfind) -![rust: 1.81+](https://img.shields.io/badge/rust-1.81+-orange.svg) +![rust: 1.83+](https://img.shields.io/badge/rust-1.83+-orange.svg) ![`unsafe`: forbidden](https://img.shields.io/badge/unsafe-forbidden-success.svg) ![`no_std`: compatible](https://img.shields.io/badge/no__std-compatible-success.svg) ![`wasm`: compatible](https://img.shields.io/badge/wasm-compatible-success.svg) diff --git a/flake.lock b/flake.lock index 75a4377f..1f2f6f75 100644 --- a/flake.lock +++ b/flake.lock @@ -15,31 +15,13 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1732238832, - "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", + "lastModified": 1732617236, + "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", + "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e", "type": "github" }, "original": { @@ -52,7 +34,6 @@ "root": { "inputs": { "crane": "crane", - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay" } @@ -64,11 +45,11 @@ ] }, "locked": { - "lastModified": 1732588352, - "narHash": "sha256-J2/hxOO1VtBA/u+a+9E+3iJpWT3xsBdghgYAVfoGCJo=", + "lastModified": 1732847586, + "narHash": "sha256-SnHHSBNZ+aj8mRzYxb6yXBl9ei3K3j5agC/D8Vjw/no=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "414e748aae5c9e6ca63c5aafffda03e5dad57ceb", + "rev": "97210ddff72fe139815f4c1ac5da74b5b0dde2d7", "type": "github" }, "original": { @@ -76,21 +57,6 @@ "repo": "rust-overlay", "type": "github" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 903c7e2a..0f93b86d 100644 --- a/flake.nix +++ b/flake.nix @@ -6,10 +6,6 @@ url = "github:NixOS/nixpkgs/nixpkgs-unstable"; }; - flake-utils = { - url = "github:numtide/flake-utils"; - }; - crane = { url = "github:ipetkov/crane"; }; @@ -25,271 +21,257 @@ # nix flake show outputs = - inputs@{ - self, + { nixpkgs, - flake-utils, crane, rust-overlay, + ... }: - flake-utils.lib.eachDefaultSystem ( - system: - let - pkgs = import nixpkgs { + + let + perSystem = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed; + + systemPkgs = perSystem ( + system: + + import nixpkgs { inherit system; overlays = [ (import rust-overlay) - (self: super: { - cargo-codspeed = pkgs.callPackage ./nix/pkgs/cargo-codspeed { inherit craneLib; }; - cargo-insta = pkgs.callPackage ./nix/pkgs/cargo-insta { inherit craneLib; }; - cargo-llvm-cov = pkgs.callPackage ./nix/pkgs/cargo-llvm-cov { inherit craneLib; }; - oci-distribution-spec-conformance = pkgs.callPackage ./nix/pkgs/oci-distribution-spec-conformance { }; + (final: prev: { + rustToolchain = prev.rust-bin.stable."1.83.0".minimal.override { + targets = [ + "thumbv7m-none-eabi" + "wasm32-unknown-unknown" + ]; + extensions = [ + "clippy" + "rust-analyzer" + "rust-docs" + "rust-src" + "rustfmt" + "llvm-tools" + ]; + }; + craneLib = (crane.mkLib prev).overrideToolchain final.rustToolchain; + + cargo-codspeed = prev.callPackage ./nix/pkgs/cargo-codspeed { craneLib = final.craneLib; }; + cargo-insta = prev.callPackage ./nix/pkgs/cargo-insta { craneLib = final.craneLib; }; + cargo-llvm-cov = prev.callPackage ./nix/pkgs/cargo-llvm-cov { craneLib = final.craneLib; }; + oci-distribution-spec-conformance = prev.callPackage ./nix/pkgs/oci-distribution-spec-conformance { }; }) ]; + } + ); + + perSystemPkgs = f: perSystem (system: f (systemPkgs.${system})); + in + { + devShells = perSystemPkgs (pkgs: { + # nix develop + default = pkgs.mkShell { + name = "wayfind-shell"; + + NIX_PATH = "nixpkgs=${nixpkgs.outPath}"; + + RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache"; + RUSTFLAGS = "-C target-cpu=native"; + CARGO_INCREMENTAL = "0"; + + OCI_ROOT_URL = "http://127.0.0.1:8000"; + OCI_NAMESPACE = "myorg/myrepo"; + OCI_TEST_PULL = 1; + + buildInputs = with pkgs; [ + # Rust + rustToolchain + sccache + cargo-insta + cargo-outdated + cargo-watch + + # Benchmarking + cargo-codspeed + gnuplot + samply + + # Coverage + cargo-llvm-cov + + # Release + cargo-semver-checks + + # OCI + oci-distribution-spec-conformance + + # TOML + taplo + + # Nix + nixfmt-rfc-style + nixd + nil + ]; + }; + + # nix develop .#benchmarks + benchmarks = pkgs.mkShell { + name = "wayfind-benchmarks-shell"; + + RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache"; + RUSTFLAGS = "-C target-cpu=native"; + CARGO_INCREMENTAL = "0"; + + buildInputs = with pkgs; [ + (rust-bin.stable."1.83.0".minimal) + sccache + cargo-codspeed + ]; }; - rustToolchain = pkgs.rust-bin.stable."1.82.0".minimal.override { - targets = [ - "thumbv7m-none-eabi" - "wasm32-unknown-unknown" + # nix develop .#checks + checks = pkgs.mkShell { + name = "wayfind-checks-shell"; + + RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache"; + RUSTFLAGS = "-C target-cpu=native"; + CARGO_INCREMENTAL = "0"; + + buildInputs = with pkgs; [ + (rust-bin.stable."1.83.0".minimal.override { + extensions = [ + "clippy" + "rustfmt" + ]; + }) + sccache ]; - extensions = [ - "clippy" - "rust-analyzer" - "rust-docs" - "rust-src" - "rustfmt" - "llvm-tools" + }; + + # nix develop .#coverage + coverage = pkgs.mkShell { + name = "wayfind-coverage-shell"; + + RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache"; + RUSTFLAGS = "-C target-cpu=native"; + CARGO_INCREMENTAL = "0"; + + buildInputs = with pkgs; [ + (rust-bin.nightly."2024-11-28".minimal.override { extensions = [ "llvm-tools" ]; }) + sccache + cargo-llvm-cov ]; }; - craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain; - in - { - devShells = { - # nix develop - default = pkgs.mkShell { - name = "wayfind-shell"; - - NIX_PATH = "nixpkgs=${nixpkgs.outPath}"; - - RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache"; - RUSTFLAGS = "-C target-cpu=native"; - CARGO_INCREMENTAL = "0"; - - OCI_ROOT_URL = "http://127.0.0.1:8000"; - OCI_NAMESPACE = "myorg/myrepo"; - OCI_TEST_PULL = 1; - - buildInputs = with pkgs; [ - # Rust - rustToolchain - sccache - cargo-insta - cargo-outdated - cargo-watch - - # Benchmarking - cargo-codspeed - gnuplot - samply - - # Coverage - cargo-llvm-cov - - # Release - cargo-semver-checks - - # OCI - oci-distribution-spec-conformance - - # TOML - taplo - - # Nix - nixfmt-rfc-style - nixd - nil - ]; - }; - - # nix develop .#benchmarks - benchmarks = pkgs.mkShell { - name = "wayfind-benchmarks-shell"; - - RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache"; - RUSTFLAGS = "-C target-cpu=native"; - CARGO_INCREMENTAL = "0"; - - buildInputs = with pkgs; [ - (rust-bin.stable."1.82.0".minimal) - sccache - cargo-codspeed - ]; - }; - - # nix develop .#checks - checks = pkgs.mkShell { - name = "wayfind-checks-shell"; - - RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache"; - RUSTFLAGS = "-C target-cpu=native"; - CARGO_INCREMENTAL = "0"; - - buildInputs = with pkgs; [ - (rust-bin.stable."1.82.0".minimal.override { - extensions = [ - "clippy" - "rustfmt" - ]; - }) - sccache - ]; - }; - - # nix develop .#coverage - coverage = pkgs.mkShell { - name = "wayfind-coverage-shell"; - - RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache"; - RUSTFLAGS = "-C target-cpu=native"; - CARGO_INCREMENTAL = "0"; - - buildInputs = with pkgs; [ - (rust-bin.nightly."2024-10-18".minimal.override { extensions = [ "llvm-tools" ]; }) - sccache - cargo-llvm-cov - ]; - }; - - # nix develop .#docs - docs = pkgs.mkShell { - name = "wayfind-docs-shell"; - - RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache"; - RUSTFLAGS = "-C target-cpu=native"; - CARGO_INCREMENTAL = "0"; - - buildInputs = with pkgs; [ - (rust-bin.stable."1.82.0".minimal) - sccache - ]; - }; - - # nix develop .#fuzz - fuzz = pkgs.mkShell { - name = "wayfind-fuzz-shell"; - - RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache"; - RUSTFLAGS = "-C target-cpu=native"; - CARGO_INCREMENTAL = "0"; - - buildInputs = with pkgs; [ - (rust-bin.nightly."2024-07-25".minimal) - sccache - cargo-fuzz - ]; - }; - - # nix develop .#msrv - msrv = pkgs.mkShell { - name = "wayfind-msrv-shell"; - - RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache"; - RUSTFLAGS = "-C target-cpu=native"; - CARGO_INCREMENTAL = "0"; - - buildInputs = with pkgs; [ - (rust-bin.stable."1.81.0".minimal) - sccache - ]; - }; - - # nix develop .#no-std - no-std = pkgs.mkShell { - name = "wayfind-no-std-shell"; - - RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache"; - CARGO_INCREMENTAL = "0"; - CARGO_BUILD_TARGET = "thumbv7m-none-eabi"; - - buildInputs = with pkgs; [ - (rust-bin.stable."1.81.0".minimal.override { - targets = [ "thumbv7m-none-eabi" ]; - }) - sccache - ]; - }; - - # nix develop .#wasm - wasm = pkgs.mkShell { - name = "wayfind-wasm-shell"; - - RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache"; - CARGO_INCREMENTAL = "0"; - CARGO_BUILD_TARGET = "wasm32-unknown-unknown"; - - buildInputs = with pkgs; [ - (rust-bin.stable."1.81.0".minimal.override { - targets = [ "wasm32-unknown-unknown" ]; - }) - sccache - ]; - }; - - # nix develop .#oci - oci = pkgs.mkShell { - name = "wayfind-oci-shell"; - - RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache"; - RUSTFLAGS = "-C target-cpu=native"; - CARGO_INCREMENTAL = "0"; - - OCI_ROOT_URL = "http://127.0.0.1:8000"; - OCI_NAMESPACE = "myorg/myrepo"; - OCI_TEST_PULL = 1; - - buildInputs = with pkgs; [ - (rust-bin.stable."1.82.0".minimal) - sccache - oci-distribution-spec-conformance - ]; - }; + # nix develop .#docs + docs = pkgs.mkShell { + name = "wayfind-docs-shell"; + + RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache"; + RUSTFLAGS = "-C target-cpu=native"; + CARGO_INCREMENTAL = "0"; + + buildInputs = with pkgs; [ + (rust-bin.stable."1.83.0".minimal) + sccache + ]; + }; + + # nix develop .#fuzz + fuzz = pkgs.mkShell { + name = "wayfind-fuzz-shell"; + + RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache"; + RUSTFLAGS = "-C target-cpu=native"; + CARGO_INCREMENTAL = "0"; + + buildInputs = with pkgs; [ + (rust-bin.nightly."2024-11-28".minimal) + sccache + cargo-fuzz + ]; }; - packages = { - # nix build .#cargo-codspeed - cargo-codspeed = pkgs.cargo-codspeed; - # nix build .#cargo-insta - cargo-insta = pkgs.cargo-insta; - # nix build .#cargo-llvm-cov - cargo-llvm-cov = pkgs.cargo-llvm-cov; - # nix build .#oci-distribution-spec-conformance - oci-distribution-spec-conformance = pkgs.oci-distribution-spec-conformance; + # nix develop .#msrv + msrv = pkgs.mkShell { + name = "wayfind-msrv-shell"; + + RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache"; + RUSTFLAGS = "-C target-cpu=native"; + CARGO_INCREMENTAL = "0"; + + buildInputs = with pkgs; [ + (rust-bin.stable."1.83.0".minimal) + sccache + ]; + }; + + # nix develop .#no-std + no-std = pkgs.mkShell { + name = "wayfind-no-std-shell"; + + RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache"; + CARGO_INCREMENTAL = "0"; + CARGO_BUILD_TARGET = "thumbv7m-none-eabi"; + + buildInputs = with pkgs; [ + (rust-bin.stable."1.83.0".minimal.override { + targets = [ "thumbv7m-none-eabi" ]; + }) + sccache + ]; }; - nixosConfigurations = { - benchmarks = nixpkgs.lib.nixosSystem { - system = "${pkgs.stdenv.hostPlatform.uname.processor}-linux"; + # nix develop .#wasm + wasm = pkgs.mkShell { + name = "wayfind-wasm-shell"; - specialArgs = { - inherit inputs; - hostPkgs = pkgs; - }; + RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache"; + CARGO_INCREMENTAL = "0"; + CARGO_BUILD_TARGET = "wasm32-unknown-unknown"; - modules = [ ./nix/vm.nix ]; - }; + buildInputs = with pkgs; [ + (rust-bin.stable."1.83.0".minimal.override { + targets = [ "wasm32-unknown-unknown" ]; + }) + sccache + ]; }; - apps = { - # nix run .#benchmarks - benchmarks = { - type = "app"; - program = "${self.nixosConfigurations.${system}.benchmarks.config.system.build.vm}/bin/run-nixos-vm"; - }; + # nix develop .#oci + oci = pkgs.mkShell { + name = "wayfind-oci-shell"; + + RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache"; + RUSTFLAGS = "-C target-cpu=native"; + CARGO_INCREMENTAL = "0"; + + OCI_ROOT_URL = "http://127.0.0.1:8000"; + OCI_NAMESPACE = "myorg/myrepo"; + OCI_TEST_PULL = 1; + + buildInputs = with pkgs; [ + (rust-bin.stable."1.83.0".minimal) + sccache + oci-distribution-spec-conformance + ]; }; - } - ); + }); + + packages = perSystemPkgs (pkgs: { + # nix build .#cargo-codspeed + cargo-codspeed = pkgs.cargo-codspeed; + + # nix build .#cargo-insta + cargo-insta = pkgs.cargo-insta; + + # nix build .#cargo-llvm-cov + cargo-llvm-cov = pkgs.cargo-llvm-cov; + + # nix build .#oci-distribution-spec-conformance + oci-distribution-spec-conformance = pkgs.oci-distribution-spec-conformance; + }); + }; } diff --git a/nix/pkgs/cargo-codspeed/default.nix b/nix/pkgs/cargo-codspeed/default.nix index 428171a4..1533b25f 100644 --- a/nix/pkgs/cargo-codspeed/default.nix +++ b/nix/pkgs/cargo-codspeed/default.nix @@ -18,7 +18,9 @@ craneLib.buildPackage rec { hash = "sha256-BtuY3reG5BMMlas1PYtaxPygbK2dptVRnYG/JRRev3c="; }; - cargoHash = "sha256-vioMkv0496s0zVdvi9/aQxtIsk6awXWxLyjTUBJSYhg="; + env = { + CARGO_PROFILE_RELEASE_STRIP = "none"; + }; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/nix/pkgs/cargo-insta/default.nix b/nix/pkgs/cargo-insta/default.nix index ce4f3b6a..fe9b9751 100644 --- a/nix/pkgs/cargo-insta/default.nix +++ b/nix/pkgs/cargo-insta/default.nix @@ -14,7 +14,9 @@ craneLib.buildPackage rec { hash = "sha256-BeY3O28+tgFyCONItA8m/Ghf+OaqbbtYgbUeQwP/4NY="; }; - cargoHash = "sha256-7bz37Ya1DFLgIBWUOb73ni5T5pPxJX4IoLzSqIB0pLY="; + env = { + CARGO_PROFILE_RELEASE_STRIP = "none"; + }; doCheck = false; diff --git a/nix/pkgs/cargo-llvm-cov/default.nix b/nix/pkgs/cargo-llvm-cov/default.nix index 17798ee8..b86222d3 100644 --- a/nix/pkgs/cargo-llvm-cov/default.nix +++ b/nix/pkgs/cargo-llvm-cov/default.nix @@ -15,8 +15,11 @@ craneLib.buildPackage rec { cargoHash = "sha256-boyMQTSQqP43I38MhWv5KHa0ZASeSYdJoK+e7O20/Bw="; - LLVM_COV = "${llvmPackages_19.llvm}/bin/llvm-cov"; - LLVM_PROFDATA = "${llvmPackages_19.llvm}/bin/llvm-profdata"; + env = { + CARGO_PROFILE_RELEASE_STRIP = "none"; + LLVM_COV = "${llvmPackages_19.llvm}/bin/llvm-cov"; + LLVM_PROFDATA = "${llvmPackages_19.llvm}/bin/llvm-profdata"; + }; doCheck = false; diff --git a/nix/vm.nix b/nix/vm.nix deleted file mode 100644 index f17fc477..00000000 --- a/nix/vm.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ - inputs, - hostPkgs, - pkgs, - lib, - modulesPath, - ... -}: - -{ - imports = [ - (modulesPath + "/virtualisation/qemu-vm.nix") - ]; - - nix = { - settings = { - experimental-features = [ - "nix-command" - "flakes" - ]; - }; - }; - - nixpkgs = { - overlays = [ - (import inputs.rust-overlay) - ]; - }; - - system = { - stateVersion = lib.trivial.release; - }; - - virtualisation = { - cores = 2; - memorySize = 4096; - diskSize = 20480; - graphics = false; - - host = { - pkgs = hostPkgs; - }; - - mountHostNixStore = true; - writableStoreUseTmpfs = false; - - sharedDirectories = { - wayfind = { - source = toString ../.; - target = "/wayfind"; - }; - }; - }; - - services = { - getty = { - autologinUser = "root"; - }; - }; - - environment = { - defaultPackages = with pkgs; [ - gcc - (rust-bin.stable."1.82.0".minimal) - sccache - gnuplot - ]; - - variables = { - RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache"; - RUSTFLAGS = "-C target-cpu=native"; - CARGO_INCREMENTAL = "0"; - CARGO_TARGET_DIR = "/tmp"; - }; - - loginShellInit = '' - cd /wayfind - cargo bench - shutdown -h now - ''; - }; - - documentation = { - enable = false; - }; -}