From da97f617fb8ba8450d06da9536bf2f1c1bcf5033 Mon Sep 17 00:00:00 2001 From: Elec3137 Date: Fri, 13 Feb 2026 10:25:08 -0800 Subject: [PATCH] remove nixos-rebuild-diff Revert "add nixos-rebuild-diff to show diffs after rebuild" (commit 02d1b2191629a585d23d9933482a3b52af5aa2d7) Implemented within nixos-rebuild-ng itself instead, see https://github.com/NixOS/nixpkgs/pull/489208 --- cli/shell.nix | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/cli/shell.nix b/cli/shell.nix index 03add7f..abe2c57 100644 --- a/cli/shell.nix +++ b/cli/shell.nix @@ -12,23 +12,6 @@ let # use a more verbose output style for nix than default # only lix supports log-format = multiline-with-logs logFormat = if config.nixowos.system.lix.enable then "multiline-with-logs" else "bar-with-logs"; - - nixos-rebuild-diff = pkgs.writeShellApplication { - name = "nixos-rebuild-diff"; - - runtimeInputs = [ config.nix.package ]; - - text = '' - if [[ $* =~ build|boot|test|switch ]]; then - priorSystem=$(readlink /run/current-system) - newSystem=$(command nixos-rebuild --ask-sudo-password --log-format ${logFormat} "$@" | tail -n 1) - - nix store diff-closures "$priorSystem" "$newSystem" - else - command nixos-rebuild --ask-sudo-password --log-format ${logFormat} "$@" - fi - ''; - }; in { options.nixowos.cli.${name} = { @@ -47,7 +30,7 @@ in # make nix-shell preserve the user's $SHELL nix-shell = /* sh */ ''nix-shell --command "export SHELL=$SHELL; $SHELL"''; - nixos-rebuild = /* sh */ "${nixos-rebuild-diff}/bin/nixos-rebuild-diff"; + nixos-rebuild = /* sh */ "nixos-rebuild --ask-sudo-password --log-format ${logFormat}"; nix = /* sh */ "nix --log-format ${logFormat}"; };