From 0ee39eb06a675210431c8d5bbed24b1671e5cdbe Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 23 Jul 2017 19:22:40 +0200 Subject: [PATCH] activation-checks: fix changelog diff --- CHANGELOG | 3 +++ modules/system/activation-checks.nix | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 772600b3..5cb16c3b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2017-07-24 +- test + 2017-07-23 - darwin entry in default the nix.nixPath was removed diff --git a/modules/system/activation-checks.nix b/modules/system/activation-checks.nix index 792eda8a..eefe2aa9 100644 --- a/modules/system/activation-checks.nix +++ b/modules/system/activation-checks.nix @@ -5,7 +5,7 @@ with lib; let darwinChanges = '' if test -e /run/current-system/darwin-changes; then - darwinChanges=$(grep -v -f /run/current-system/darwin-changes $systemConfig/darwin-changes 2> /dev/null) || true + darwinChanges=$(diff --changed-group-format='%>' --unchanged-group-format= /run/current-system/darwin-changes $systemConfig/darwin-changes 2> /dev/null) || true if test -n "$darwinChanges"; then echo >&2 echo "CHANGELOG" >&2