mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(deploy-whitby): use nvd instead of nix-diff

Browse source 
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 <tazjin@tvl.su>
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
This commit is contained in:
Vincent Ambo 2022-01-12 17:57:26 +03:00 committed by clbot
parent d99132f45a
commit 9c025d62a0
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ops/deploy-whitby/default.nix
View file

@ -16,7 +16,7 @@ pkgs.stdenv.mkDerivation {
ansi2html ansi2html
git git
jq jq
nix-diff nvd
]} ]}
''; '';

2
ops/deploy-whitby/deploy-whitby.sh
View file

@ -35,7 +35,7 @@ current=$(nix show-derivation /run/current-system | jq -r 'keys | .[0]')
new=$(nix-instantiate -A ops.nixos.whitbySystem "$worktree_dir") new=$(nix-instantiate -A ops.nixos.whitbySystem "$worktree_dir")
diff_filename="$(drv_hash "$current")..$(drv_hash "$new").html" diff_filename="$(drv_hash "$current")..$(drv_hash "$new").html"
nix-diff "$current" "$new" --color always \ nvd --color always diff "$current" "$new" \
| ansi2html \ | ansi2html \
>| "$HTML_ROOT/diff/$diff_filename" >| "$HTML_ROOT/diff/$diff_filename"
chmod a+r "$HTML_ROOT/diff/$diff_filename" chmod a+r "$HTML_ROOT/diff/$diff_filename"