From a3f8d2b84b5f8496c703bebfa2037438bdcedda5 Mon Sep 17 00:00:00 2001 From: sterni Date: Sat, 9 Oct 2021 17:22:44 +0200 Subject: [PATCH] refactor(tools/rust-crates-advisory): move advisory-db to 3p Change-Id: Iaaed35de078292c0c99a7c83de9ca5fdf27b8135 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3711 Tested-by: BuildkiteCI Reviewed-by: tazjin --- third_party/rustsec-advisory-db/default.nix | 9 +++++++++ tools/rust-crates-advisory/default.nix | 8 +------- 2 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 third_party/rustsec-advisory-db/default.nix diff --git a/third_party/rustsec-advisory-db/default.nix b/third_party/rustsec-advisory-db/default.nix new file mode 100644 index 000000000..2e280345a --- /dev/null +++ b/third_party/rustsec-advisory-db/default.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: + +pkgs.fetchFromGitHub { + owner = "RustSec"; + repo = "advisory-db"; + # TODO(Profpatsch): this will have to be updated regularly, how? + rev = "113188c62380753f01ff0df5edb7d67a300b143a"; + sha256 = "0v086ybwr71zgs5nv8yr4w2w2d4daxx6in2s1sjb4m41q1r9p0wj"; +} diff --git a/tools/rust-crates-advisory/default.nix b/tools/rust-crates-advisory/default.nix index 1a26a523b..9490e3f47 100644 --- a/tools/rust-crates-advisory/default.nix +++ b/tools/rust-crates-advisory/default.nix @@ -7,13 +7,7 @@ let // depot.nix.getBins pkgs.lr [ "lr" ] ; - crate-advisories = "${pkgs.fetchFromGitHub { - owner = "RustSec"; - repo = "advisory-db"; - # TODO(Profpatsch): this will have to be updated regularly, how? - rev = "113188c62380753f01ff0df5edb7d67a300b143a"; - sha256 = "0v086ybwr71zgs5nv8yr4w2w2d4daxx6in2s1sjb4m41q1r9p0wj"; - }}/crates"; + crate-advisories = "${depot.third_party.rustsec-advisory-db}/crates"; our-crates = lib.filter (v: v ? outPath) (builtins.attrValues depot.third_party.rust-crates);