fix: rust nigtly

This commit is contained in:
Elijah McMorris 2025-02-03 11:54:33 -08:00
parent 49174e4437
commit 531af211bf
Signed by: NexVeridian
SSH key fingerprint: SHA256:bsA1SKZxuEcEVHAy3gY1HUeM5ykRJl0U0kQHQn0hMg8

103
flake.nix
View file

@ -3,31 +3,53 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
crane.url = "github:ipetkov/crane"; crane.url = "github:ipetkov/crane";
fenix = { fenix = {
url = "github:nix-community/fenix"; url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.rust-analyzer-src.follows = "";
}; };
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
advisory-db = { advisory-db = {
url = "github:rustsec/advisory-db"; url = "github:rustsec/advisory-db";
flake = false; flake = false;
}; };
}; };
outputs = { self, nixpkgs, crane, fenix, flake-utils, advisory-db, ... }: outputs =
flake-utils.lib.eachDefaultSystem (system: {
self,
nixpkgs,
crane,
fenix,
flake-utils,
advisory-db,
...
}:
flake-utils.lib.eachDefaultSystem (
system:
let let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
inherit (pkgs) lib; inherit (pkgs) lib;
craneLib = crane.mkLib pkgs; craneLib = (crane.mkLib pkgs).overrideToolchain (
p:
(
let
fp = fenix.packages.${system};
fpc = fp.complete;
in
(fp.combine [
fpc.cargo
fpc.rustc
fpc.clippy
fpc.rust-src
fpc.rustc
fpc.rustfmt
fpc.rustc-codegen-cranelift-preview
])
)
);
src = craneLib.cleanCargoSource ./.; src = craneLib.cleanCargoSource ./.;
# Common arguments can be set here to avoid repeating them later # Common arguments can be set here to avoid repeating them later
@ -35,23 +57,26 @@
inherit src; inherit src;
strictDeps = true; strictDeps = true;
buildInputs = [ buildInputs =
# Add additional build inputs here [
] ++ lib.optionals pkgs.stdenv.isDarwin [ # Add additional build inputs here
# Additional darwin specific inputs can be set here ]
pkgs.libiconv ++ lib.optionals pkgs.stdenv.isDarwin [
]; # Additional darwin specific inputs can be set here
pkgs.libiconv
];
# Additional environment variables can be set directly # Additional environment variables can be set directly
# MY_CUSTOM_VAR = "some value"; # MY_CUSTOM_VAR = "some value";
}; };
craneLibLLvmTools = craneLib.overrideToolchain craneLibLLvmTools = craneLib.overrideToolchain (
(fenix.packages.${system}.complete.withComponents [ fenix.packages.${system}.complete.withComponents [
"cargo" "cargo"
"llvm-tools" "llvm-tools"
"rustc" "rustc"
]); ]
);
# Build *just* the cargo dependencies, so we can reuse # Build *just* the cargo dependencies, so we can reuse
# all of that work (e.g. via cachix) when running in CI # all of that work (e.g. via cachix) when running in CI
@ -59,10 +84,13 @@
# Build the actual crate itself, reusing the dependency # Build the actual crate itself, reusing the dependency
# artifacts from above. # artifacts from above.
my-crate = craneLib.buildPackage (commonArgs // { my-crate = craneLib.buildPackage (
doCheck = false; commonArgs
inherit cargoArtifacts; // {
}); doCheck = false;
inherit cargoArtifacts;
}
);
# Define the Docker image build # Define the Docker image build
dockerImage = pkgs.dockerTools.buildImage { dockerImage = pkgs.dockerTools.buildImage {
@ -87,10 +115,13 @@
# Note that this is done as a separate derivation so that # Note that this is done as a separate derivation so that
# we can block the CI if there are issues here, but not # we can block the CI if there are issues here, but not
# prevent downstream consumers from building our crate by itself. # prevent downstream consumers from building our crate by itself.
my-crate-clippy = craneLib.cargoClippy (commonArgs // { my-crate-clippy = craneLib.cargoClippy (
inherit cargoArtifacts; commonArgs
cargoClippyExtraArgs = "--all-targets -- --deny warnings"; // {
}); inherit cargoArtifacts;
cargoClippyExtraArgs = "--all-targets -- --deny warnings";
}
);
# my-crate-doc = craneLib.cargoDoc (commonArgs // { # my-crate-doc = craneLib.cargoDoc (commonArgs // {
# inherit cargoArtifacts; # inherit cargoArtifacts;
@ -114,17 +145,22 @@
# Run tests with cargo-nextest # Run tests with cargo-nextest
# Consider setting `doCheck = false` on `my-crate` if you do not want # Consider setting `doCheck = false` on `my-crate` if you do not want
# the tests to run twice # the tests to run twice
my-crate-nextest = craneLib.cargoNextest (commonArgs // { my-crate-nextest = craneLib.cargoNextest (
inherit cargoArtifacts; commonArgs
partitions = 1; // {
partitionType = "count"; inherit cargoArtifacts;
}); partitions = 1;
partitionType = "count";
}
);
}; };
packages = { packages = {
default = my-crate; default = my-crate;
inherit my-crate inherit
dockerImage; my-crate
dockerImage
;
}; };
apps.default = flake-utils.lib.mkApp { apps.default = flake-utils.lib.mkApp {
@ -143,5 +179,6 @@
# pkgs.ripgrep # pkgs.ripgrep
]; ];
}; };
}); }
);
} }