c8h4/nixos-config
1
0
Fork 0
Code Issues Actions Activity

make: Convert missed instances of morph calls to nix-run function

Browse source 
Fixes: 58333ae ("make: Run native commands directly or using `nix-shell` instead of `nix run`")
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
This commit is contained in:
Christoph Heiss 2023-04-23 13:29:45 +02:00
parent d6c5c48f1e
commit 9eff08b951
Signed by: c8h4
GPG key ID: 6817E9C75C0785D7
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -24,25 +24,25 @@ lint:
build:
@if [ -z "$(M)" ]; then echo 'no machine specified using M=' 2>&1; exit 1; fi
$(MORPH) build --on "$(M)" ./default.nix
$(call nix-run,morph,build --on "$(M)" ./default.nix)
build-all:
$(MAKE) build M="{name,srht,trek}"
deploy:
@if [ -z "$(M)" ]; then echo 'no machine specified using M=' 2>&1; exit 1; fi
$(MORPH) deploy --passwd --on "$(M)" ./default.nix switch
$(call nix-run,morph,deploy --passwd --on "$(M)" ./default.nix switch)
deploy-full:
@if [ -z "$(M)" ]; then echo 'no machine specified using M=' 2>&1; exit 1; fi
$(MORPH) deploy --passwd --upload-secrets --on "$(M)" ./default.nix switch
$(call nix-run,morph,deploy --passwd --upload-secrets --on "$(M)" ./default.nix switch)
upload-secrets:
@if [ -z "$(M)" ]; then echo 'no machine specified using M=' 2>&1; exit 1; fi
$(MORPH) upload-secrets --passwd --on "$(M)" ./default.nix
$(call nix-run,morph,upload-secrets --passwd --on "$(M)" ./default.nix)
upload-secrets-all:
$(MORPH) upload-secrets --passwd ./default.nix
$(call nix-run,morph,upload-secrets --passwd ./default.nix)
setup-git-hooks:
echo -e '#!/usr/bin/env sh\nexec make lint' >.git/hooks/pre-commit