Skip to content

Commit

Permalink
flake.nix: use nightly for cargo fuzz.
Browse files Browse the repository at this point in the history
  • Loading branch information
kivikakk committed Jan 24, 2024
1 parent ba5b1e1 commit 663d7d8
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 31 deletions.
15 changes: 8 additions & 7 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 19 additions & 21 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
description = "comrak";

inputs = {
nixpkgs.url = github:NixOS/nixpkgs/nixos-23.05;
nixpkgs.url = github:NixOS/nixpkgs/nixos-23.11;

crane = {
url = "github:ipetkov/crane";
inputs.nixpkgs.follows = "nixpkgs";
};

fenix = {
url = "github:nix-community/fenix";
url = "github:nix-community/fenix/monthly";
inputs.nixpkgs.follows = "nixpkgs";
inputs.rust-analyzer-src.follows = "";
};
Expand All @@ -33,9 +33,7 @@
...
}:
flake-utils.lib.eachDefaultSystem (system: let
pkgs = import nixpkgs {
inherit system;
};
pkgs = import nixpkgs {inherit system;};

inherit (pkgs) lib;

Expand All @@ -45,21 +43,18 @@
commonArgs = {
inherit src;

buildInputs =
[
]
++ lib.optionals pkgs.stdenv.isDarwin [
pkgs.libiconv
];
buildInputs = lib.optionals pkgs.stdenv.isDarwin [
pkgs.libiconv
];
};

craneLibLLvmTools =
craneLib.overrideToolchain
(fenix.packages.${system}.complete.withComponents [
"cargo"
"llvm-tools"
"rustc"
]);
toolchain = fenix.packages.${system}.complete;

craneLibLLvmTools = craneLib.overrideToolchain (toolchain.withComponents [
"cargo"
"llvm-tools"
"rustc"
]);

cargoArtifacts = craneLib.buildDepsOnly commonArgs;

Expand Down Expand Up @@ -126,9 +121,12 @@
devShells.default = pkgs.mkShell {
inputsFrom = builtins.attrValues self.checks.${system};

nativeBuildInputs = with pkgs; [
cargo
rustc
nativeBuildInputs = [
(toolchain.withComponents [
"cargo"
"rustc"
])
pkgs.cargo-fuzz
];
};
});
Expand Down
6 changes: 3 additions & 3 deletions fuzz/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 663d7d8

Please sign in to comment.