Skip to content

chore: pin current Rust security tools #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AnthonyRonning wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore: pin current Rust security tools #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
uses: Swatinem/rust-cache@42dc69e1aa15d09112580998cf2ef0119e2e91ae # v2

- name: Run clippy
run: cargo clippy --all-targets --all-features -- -D warnings
run: cargo clippy --locked --all-targets --all-features -- -D warnings

test:
name: Test Suite
Expand All @@ -86,4 +86,4 @@ jobs:
uses: Swatinem/rust-cache@42dc69e1aa15d09112580998cf2ef0119e2e91ae # v2

- name: Run tests
run: cargo test --all-features
run: cargo test --locked --all-features
19 changes: 18 additions & 1 deletion flake.lock
View file
Open in desktop

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

11 changes: 10 additions & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,20 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nixpkgs.url = "nixpkgs/nixos-unstable";
# Keep dev security tools current without moving the application or Nitro build pin.
security-tools-nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nitro-util = {
url = "github:monzo/aws-nitro-util/7d755578b0b0b9850c0d7c4738a6c8daf3ff55c0";
inputs.nixpkgs.follows = "nixpkgs";
};
};

outputs = { self, nixpkgs, flake-utils, rust-overlay, nitro-util }:
outputs = { self, nixpkgs, security-tools-nixpkgs, flake-utils, rust-overlay, nitro-util }:
flake-utils.lib.eachDefaultSystem (system:
let
overlays = [ rust-overlay.overlays.default ];
pkgs = import nixpkgs { inherit system overlays; };
securityToolsPkgs = import security-tools-nixpkgs { inherit system; };
rust = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
nitro = nitro-util.lib.${system};

Expand Down Expand Up @@ -56,7 +59,13 @@
pkgs.libiconv
pkgs.apple-sdk
];
securityToolInputs = [
securityToolsPkgs.cargo-audit
securityToolsPkgs.cargo-deny
securityToolsPkgs.cargo-machete
];
inputs = commonInputs
++ securityToolInputs
++ pkgs.lib.optionals pkgs.stdenv.isLinux linuxOnlyInputs
++ pkgs.lib.optionals pkgs.stdenv.isDarwin darwinOnlyInputs;

Expand Down
Loading