ambroisie/nix-config
ambroisie/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

pkgs: diff-flake: use 'makeWrapper'

Browse source 
This makes it easier to test the script, as I just run it normally
without building it.
This commit is contained in:
Bruno BELANYI 2021-04-27 17:14:49 +00:00
parent 12475ff3a8
commit 2a1dda12d4
2 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pkgs/diff-flake/diff-flake
View file

@ -3,7 +3,7 @@
set -eu
NEW_REV=
PREVIOUS_REV="$(@git@ rev-parse @~)"
PREVIOUS_REV="$(git rev-parse @~)"
OUTPUT_FILE=/dev/stdout
FLAKE_OUTPUTS=()
NIX_BUILD_ARGS=()
@ -14,9 +14,9 @@ print_err() {
sanitize_output() {
if [ "$OUTPUT_FILE" != "/dev/stdout" ]; then
@sed@ 's/\x1b\[[0-9;]*m//g'
sed 's/\x1b\[[0-9;]*m//g'
else
@cat@
cat
fi
}
@ -61,11 +61,11 @@ parse_args() {
shift
;;
-n|--new-rev)
NEW_REV="$(@git@ rev-parse "$1")"
NEW_REV="$(git rev-parse "$1")"
shift
;;
-p|--previous-rev)
PREVIOUS_REV="$(@git@ rev-parse "$1")"
PREVIOUS_REV="$(git rev-parse "$1")"
shift
;;
--)
@ -98,8 +98,8 @@ fill_default_outputs() {
diff_output() {
local PREV NEW;
PREV="$(@mktemp@ --dry-run)"
NEW="$(@mktemp@ --dry-run)"
PREV="$(mktemp --dry-run)"
NEW="$(mktemp --dry-run)"
nix build "${NIX_BUILD_ARGS[@]}" ".?rev=${PREVIOUS_REV}#$1" -o "$PREV"
nix build "${NIX_BUILD_ARGS[@]}" ".${NEW_REV:+?rev=$NEW_REV}#$1" -o "$NEW"