From e855d140bd2d613d864bab4f3138cf931eb4f79f Mon Sep 17 00:00:00 2001
From: sterni <sternenseemann@systemli.org>
Date: Fri, 24 Dec 2021 12:24:04 +0100
Subject: chore(3p/rustsec-advisory-db): track using niv

This will make sure that the db is updated regularly (on every channel
bump). This is fine, because an advisory no longer implies a build
failure.

Change-Id: I1dc0b335e0881b5c58015da63c3c47f1ab1e645f
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4554
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
---
 third_party/rustsec-advisory-db/default.nix | 24 ++++++++----------------
 third_party/rustsec-advisory-db/pin.json    | 11 -----------
 2 files changed, 8 insertions(+), 27 deletions(-)
 delete mode 100644 third_party/rustsec-advisory-db/pin.json

(limited to 'third_party/rustsec-advisory-db')

diff --git a/third_party/rustsec-advisory-db/default.nix b/third_party/rustsec-advisory-db/default.nix
index 1441ff07a7..e0ea2b080a 100644
--- a/third_party/rustsec-advisory-db/default.nix
+++ b/third_party/rustsec-advisory-db/default.nix
@@ -1,27 +1,19 @@
 # RustSec's advisory db for crates
-#
-# Update using:
-#
-#   nix-prefetch-git --quiet --url https://github.com/RustSec/advisory-db.git > third_party/rustsec-advisory-db/pin.json
-#
-# TODO(Profpatsch): automatically update in regular intervals
-{ pkgs, ... }:
+{ pkgs, depot, ... }:
 
 let
-  pin = builtins.fromJSON (builtins.readFile ./pin.json);
-
-  date = builtins.head (builtins.split "T" pin.date);
+  inherit (depot.third_party.sources) rustsec-advisory-db;
 in
 
 pkgs.fetchFromGitHub {
-  name = "advisory-db-${date}";
-  owner = "RustSec";
-  repo = "advisory-db";
-  inherit (pin)
-    rev
+  inherit (rustsec-advisory-db)
+    owner
+    repo
     sha256
+    rev
     ;
+
   passthru = {
-    inherit (pin) rev;
+    inherit (rustsec-advisory-db) rev;
   };
 }
diff --git a/third_party/rustsec-advisory-db/pin.json b/third_party/rustsec-advisory-db/pin.json
deleted file mode 100644
index 1155625cff..0000000000
--- a/third_party/rustsec-advisory-db/pin.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "url": "https://github.com/RustSec/advisory-db.git",
-  "rev": "d29205a680bb8b3a22eaba6e9b2a5a6580274af0",
-  "date": "2021-10-08T18:17:22+02:00",
-  "path": "/nix/store/nm8nwgdyrs6mi9dydf6vylc833i3alnn-advisory-db",
-  "sha256": "0h08kfn2878k5l0qdsxikakrjbqbn6fb8f95zxpqfh5hqzn7mb6b",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
-- 
cgit 1.4.1