From 9c025d62a067756d1f32c07ff4dc485942368c6f Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 12 Jan 2022 17:57:26 +0300 Subject: refactor(deploy-whitby): use nvd instead of nix-diff nvd only shows us changed versions of packages, as well as added/removed packages, which means that for the majority of depot packages nothing will be displayed however, the current output of nix-diff is not usable anyways, so having something that can be looked at is better than nothing Change-Id: Iefbd8139c7ccf5c88ed1209897abdb2ae9302e91 Reviewed-on: https://cl.tvl.fyi/c/depot/+/4868 Autosubmit: tazjin Tested-by: BuildkiteCI Reviewed-by: grfn --- ops/deploy-whitby/default.nix | 2 +- ops/deploy-whitby/deploy-whitby.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ops/deploy-whitby') diff --git a/ops/deploy-whitby/default.nix b/ops/deploy-whitby/default.nix index f4bd257c4f51..aafe798cbfa7 100644 --- a/ops/deploy-whitby/default.nix +++ b/ops/deploy-whitby/default.nix @@ -16,7 +16,7 @@ pkgs.stdenv.mkDerivation { ansi2html git jq - nix-diff + nvd ]} ''; diff --git a/ops/deploy-whitby/deploy-whitby.sh b/ops/deploy-whitby/deploy-whitby.sh index e41ec681f170..756aa7ae0801 100755 --- a/ops/deploy-whitby/deploy-whitby.sh +++ b/ops/deploy-whitby/deploy-whitby.sh @@ -35,7 +35,7 @@ current=$(nix show-derivation /run/current-system | jq -r 'keys | .[0]') new=$(nix-instantiate -A ops.nixos.whitbySystem "$worktree_dir") diff_filename="$(drv_hash "$current")..$(drv_hash "$new").html" -nix-diff "$current" "$new" --color always \ +nvd --color always diff "$current" "$new" \ | ansi2html \ >| "$HTML_ROOT/diff/$diff_filename" chmod a+r "$HTML_ROOT/diff/$diff_filename" -- cgit 1.4.1